Changed the architecture of the project. See the UML-diagram in google
drive for further information.