e3: Organization and Naming

shape layout 1