Modification of the architecture of the project. TO FIX: Test