Adds more structure to the project
Some cleaning up