refactoring folders project