refactoring for structure
Merge branch 'feature/update-structure'