Restructure object types

Merged Jan Möbius requested to merge restructure_ObjectTypes into master

Merge request reports