Fix directory structure
Refactoring