Refactoring in new folders