new format of data based on automated files pushed to developer
Merge branch 'newos'