Added new layout pages. Clean up of file structure.