HIEM Re-architecture

Clean up of schema files
Removed deprecated definitions