New Version

Improved the structure of the project