refactoring path configuration
Merge branch 'feature/refactoring'