Removed, moved and renamed some files
Removed
Updated the layout classes
Lots of stuff