Refactoring of the project architecture (needed for the binary)
Corrections of import