New project structure

New classes to structure better the project