Updated project structure to 6.1 specs