Changed the whole structure of the project to something that was recommended