redevelop project structure
Merge pull request #21 from Alex-Diez/project-structure

redevelop project structure