refactored project structure
Merge branch 'dev'