refactoring and modified dir infrastructure
Merge branch 'develop'