Project structure rework