change 3dsr to use Series C
remove slash and US 6 'icons'
s/_enums//
move object-building functions to separate file
Merge branch 'feature/library' into dev
Merge branch 'dev'