structure the project better