Project structure adjusted
Merge pull request #2 from filipealva/project-structure

Project structure adjusted