Improving project structure
Merge branch 'structure'