Restructured the project and starting getting the layout setup.