Refactoring project folder