Master

Simplify the structure of the project