Updated project structure and naming conventions