Updated project structure for 13.1