Changed the structure of the project

Still needs cleaning (lots of classes are never used).