Changed project structure
Finalized module architecture infrastructure