Restucture repository using folders