Intermediate commit - working on manifest files with new structure