refactoring on the project structure