reworked project structure