Reorganized the layout of the project to follow typical layouts.