Fixed project structure. Now in a clean folder structure.