project folders refactored