project folder refactor