reorganized layouts stuff a bit

- obsolete code
+ naming convention