Completely changed the project to the new structure