directory structure change
- create both folder and merge model & module directory