project structure reworked