Updated project structure (folder)