Moved all datastreams to a single folder.
Cleaned out old Descriptive Object and Bag models.
Merge branch 'feature/OldObjectCleanup' into develop