Made a lot of changes to the object-structure of the project