move layouts to seperate folder, to fix build
move layouts to seperate folder, to fix build