improved directory hierarchy
Merge branch 'feature/improved_structure' into develop