Restructure the project's layout
Last of the restructure
Reformat