flatten directory structure
Done with flat structure
Merge branch 'feature/new-branch-structure' into develop
Merge branch 'release/0.0.2'