Re-structure the project