First step of the layout. Removed unused code/files