Refactoring

Refactoring to have a more organized project.