refactoring structure of project