Updated project structure...