Added some structure to the project