[Updated project structure]