Re-arrange the project folders