diff --git a/.prettierignore b/.prettierignore
index c2a1ee5..27e428d 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1,2 @@
-static/redfish
+redfish-core/schema/dmtf
+redfish-core/schema/oem
diff --git a/redfish-core/include/schemas.hpp b/redfish-core/include/schemas.hpp
index 99f6703..cf553cb 100644
--- a/redfish-core/include/schemas.hpp
+++ b/redfish-core/include/schemas.hpp
@@ -15,7 +15,7 @@
 
 namespace redfish
 {
-    constexpr std::array<std::string_view,116> schemas {
+    constexpr std::array<std::string_view,112> schemas {
         "AccountService",
         "ActionInfo",
         "AggregationService",
@@ -75,8 +75,10 @@
         "MetricReportCollection",
         "MetricReportDefinition",
         "MetricReportDefinitionCollection",
-        "odata",
-        "odata-v4",
+        "OemComputerSystem",
+        "OemManager",
+        "OemVirtualMedia",
+        "OpenBMCAccountService",
         "OperatingConfig",
         "OperatingConfigCollection",
         "PCIeDevice",
@@ -95,10 +97,8 @@
         "Processor",
         "ProcessorCollection",
         "Protocol",
-        "redfish-error",
-        "redfish-payload-annotations",
-        "redfish-schema",
-        "redfish-schema-v1",
+        "RedfishError",
+        "RedfishExtensions",
         "Redundancy",
         "Resource",
         "Role",
@@ -128,9 +128,5 @@
         "UpdateService",
         "VirtualMedia",
         "VirtualMediaCollection",
-        "OemManager",
-        "OemComputerSystem",
-        "OemVirtualMedia",
-        "OpenBMCAccountService",
     };
 }
diff --git a/static/redfish/v1/schema/AccountService_v1.xml b/redfish-core/schema/dmtf/csdl/AccountService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AccountService_v1.xml
rename to redfish-core/schema/dmtf/csdl/AccountService_v1.xml
diff --git a/static/redfish/v1/schema/ActionInfo_v1.xml b/redfish-core/schema/dmtf/csdl/ActionInfo_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ActionInfo_v1.xml
rename to redfish-core/schema/dmtf/csdl/ActionInfo_v1.xml
diff --git a/static/redfish/v1/schema/AggregationService_v1.xml b/redfish-core/schema/dmtf/csdl/AggregationService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AggregationService_v1.xml
rename to redfish-core/schema/dmtf/csdl/AggregationService_v1.xml
diff --git a/static/redfish/v1/schema/AggregationSourceCollection_v1.xml b/redfish-core/schema/dmtf/csdl/AggregationSourceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AggregationSourceCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/AggregationSourceCollection_v1.xml
diff --git a/static/redfish/v1/schema/AggregationSource_v1.xml b/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AggregationSource_v1.xml
rename to redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
diff --git a/static/redfish/v1/schema/Assembly_v1.xml b/redfish-core/schema/dmtf/csdl/Assembly_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Assembly_v1.xml
rename to redfish-core/schema/dmtf/csdl/Assembly_v1.xml
diff --git a/static/redfish/v1/schema/AttributeRegistry_v1.xml b/redfish-core/schema/dmtf/csdl/AttributeRegistry_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AttributeRegistry_v1.xml
rename to redfish-core/schema/dmtf/csdl/AttributeRegistry_v1.xml
diff --git a/static/redfish/v1/schema/Bios_v1.xml b/redfish-core/schema/dmtf/csdl/Bios_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Bios_v1.xml
rename to redfish-core/schema/dmtf/csdl/Bios_v1.xml
diff --git a/static/redfish/v1/schema/CableCollection_v1.xml b/redfish-core/schema/dmtf/csdl/CableCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CableCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/CableCollection_v1.xml
diff --git a/static/redfish/v1/schema/Cable_v1.xml b/redfish-core/schema/dmtf/csdl/Cable_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Cable_v1.xml
rename to redfish-core/schema/dmtf/csdl/Cable_v1.xml
diff --git a/static/redfish/v1/schema/CertificateCollection_v1.xml b/redfish-core/schema/dmtf/csdl/CertificateCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CertificateCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/CertificateCollection_v1.xml
diff --git a/static/redfish/v1/schema/CertificateLocations_v1.xml b/redfish-core/schema/dmtf/csdl/CertificateLocations_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CertificateLocations_v1.xml
rename to redfish-core/schema/dmtf/csdl/CertificateLocations_v1.xml
diff --git a/static/redfish/v1/schema/CertificateService_v1.xml b/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CertificateService_v1.xml
rename to redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
diff --git a/static/redfish/v1/schema/Certificate_v1.xml b/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Certificate_v1.xml
rename to redfish-core/schema/dmtf/csdl/Certificate_v1.xml
diff --git a/static/redfish/v1/schema/ChassisCollection_v1.xml b/redfish-core/schema/dmtf/csdl/ChassisCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ChassisCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/ChassisCollection_v1.xml
diff --git a/static/redfish/v1/schema/Chassis_v1.xml b/redfish-core/schema/dmtf/csdl/Chassis_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Chassis_v1.xml
rename to redfish-core/schema/dmtf/csdl/Chassis_v1.xml
diff --git a/static/redfish/v1/schema/ComponentIntegrityCollection_v1.xml b/redfish-core/schema/dmtf/csdl/ComponentIntegrityCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComponentIntegrityCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/ComponentIntegrityCollection_v1.xml
diff --git a/static/redfish/v1/schema/ComponentIntegrity_v1.xml b/redfish-core/schema/dmtf/csdl/ComponentIntegrity_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComponentIntegrity_v1.xml
rename to redfish-core/schema/dmtf/csdl/ComponentIntegrity_v1.xml
diff --git a/static/redfish/v1/schema/ComputerSystemCollection_v1.xml b/redfish-core/schema/dmtf/csdl/ComputerSystemCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComputerSystemCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/ComputerSystemCollection_v1.xml
diff --git a/static/redfish/v1/schema/ComputerSystem_v1.xml b/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComputerSystem_v1.xml
rename to redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
diff --git a/static/redfish/v1/schema/DriveCollection_v1.xml b/redfish-core/schema/dmtf/csdl/DriveCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/DriveCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/DriveCollection_v1.xml
diff --git a/static/redfish/v1/schema/Drive_v1.xml b/redfish-core/schema/dmtf/csdl/Drive_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Drive_v1.xml
rename to redfish-core/schema/dmtf/csdl/Drive_v1.xml
diff --git a/static/redfish/v1/schema/EnvironmentMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/EnvironmentMetrics_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EnvironmentMetrics_v1.xml
rename to redfish-core/schema/dmtf/csdl/EnvironmentMetrics_v1.xml
diff --git a/static/redfish/v1/schema/EthernetInterfaceCollection_v1.xml b/redfish-core/schema/dmtf/csdl/EthernetInterfaceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EthernetInterfaceCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/EthernetInterfaceCollection_v1.xml
diff --git a/static/redfish/v1/schema/EthernetInterface_v1.xml b/redfish-core/schema/dmtf/csdl/EthernetInterface_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EthernetInterface_v1.xml
rename to redfish-core/schema/dmtf/csdl/EthernetInterface_v1.xml
diff --git a/static/redfish/v1/schema/EventDestinationCollection_v1.xml b/redfish-core/schema/dmtf/csdl/EventDestinationCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EventDestinationCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/EventDestinationCollection_v1.xml
diff --git a/static/redfish/v1/schema/EventDestination_v1.xml b/redfish-core/schema/dmtf/csdl/EventDestination_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EventDestination_v1.xml
rename to redfish-core/schema/dmtf/csdl/EventDestination_v1.xml
diff --git a/static/redfish/v1/schema/EventService_v1.xml b/redfish-core/schema/dmtf/csdl/EventService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EventService_v1.xml
rename to redfish-core/schema/dmtf/csdl/EventService_v1.xml
diff --git a/static/redfish/v1/schema/Event_v1.xml b/redfish-core/schema/dmtf/csdl/Event_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Event_v1.xml
rename to redfish-core/schema/dmtf/csdl/Event_v1.xml
diff --git a/static/redfish/v1/schema/FabricAdapterCollection_v1.xml b/redfish-core/schema/dmtf/csdl/FabricAdapterCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/FabricAdapterCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/FabricAdapterCollection_v1.xml
diff --git a/static/redfish/v1/schema/FabricAdapter_v1.xml b/redfish-core/schema/dmtf/csdl/FabricAdapter_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/FabricAdapter_v1.xml
rename to redfish-core/schema/dmtf/csdl/FabricAdapter_v1.xml
diff --git a/static/redfish/v1/schema/FanCollection_v1.xml b/redfish-core/schema/dmtf/csdl/FanCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/FanCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/FanCollection_v1.xml
diff --git a/static/redfish/v1/schema/Fan_v1.xml b/redfish-core/schema/dmtf/csdl/Fan_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Fan_v1.xml
rename to redfish-core/schema/dmtf/csdl/Fan_v1.xml
diff --git a/static/redfish/v1/schema/IPAddresses_v1.xml b/redfish-core/schema/dmtf/csdl/IPAddresses_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/IPAddresses_v1.xml
rename to redfish-core/schema/dmtf/csdl/IPAddresses_v1.xml
diff --git a/static/redfish/v1/schema/JsonSchemaFileCollection_v1.xml b/redfish-core/schema/dmtf/csdl/JsonSchemaFileCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/JsonSchemaFileCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/JsonSchemaFileCollection_v1.xml
diff --git a/static/redfish/v1/schema/JsonSchemaFile_v1.xml b/redfish-core/schema/dmtf/csdl/JsonSchemaFile_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/JsonSchemaFile_v1.xml
rename to redfish-core/schema/dmtf/csdl/JsonSchemaFile_v1.xml
diff --git a/static/redfish/v1/schema/LogEntryCollection_v1.xml b/redfish-core/schema/dmtf/csdl/LogEntryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogEntryCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/LogEntryCollection_v1.xml
diff --git a/static/redfish/v1/schema/LogEntry_v1.xml b/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogEntry_v1.xml
rename to redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
diff --git a/static/redfish/v1/schema/LogServiceCollection_v1.xml b/redfish-core/schema/dmtf/csdl/LogServiceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogServiceCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/LogServiceCollection_v1.xml
diff --git a/static/redfish/v1/schema/LogService_v1.xml b/redfish-core/schema/dmtf/csdl/LogService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogService_v1.xml
rename to redfish-core/schema/dmtf/csdl/LogService_v1.xml
diff --git a/static/redfish/v1/schema/ManagerAccountCollection_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerAccountCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerAccountCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/ManagerAccountCollection_v1.xml
diff --git a/static/redfish/v1/schema/ManagerAccount_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerAccount_v1.xml
rename to redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
diff --git a/static/redfish/v1/schema/ManagerCollection_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/ManagerCollection_v1.xml
diff --git a/static/redfish/v1/schema/ManagerDiagnosticData_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerDiagnosticData_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerDiagnosticData_v1.xml
rename to redfish-core/schema/dmtf/csdl/ManagerDiagnosticData_v1.xml
diff --git a/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerNetworkProtocol_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
rename to redfish-core/schema/dmtf/csdl/ManagerNetworkProtocol_v1.xml
diff --git a/static/redfish/v1/schema/Manager_v1.xml b/redfish-core/schema/dmtf/csdl/Manager_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Manager_v1.xml
rename to redfish-core/schema/dmtf/csdl/Manager_v1.xml
diff --git a/static/redfish/v1/schema/MemoryCollection_v1.xml b/redfish-core/schema/dmtf/csdl/MemoryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MemoryCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/MemoryCollection_v1.xml
diff --git a/static/redfish/v1/schema/Memory_v1.xml b/redfish-core/schema/dmtf/csdl/Memory_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Memory_v1.xml
rename to redfish-core/schema/dmtf/csdl/Memory_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistryCollection_v1.xml b/redfish-core/schema/dmtf/csdl/MessageRegistryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistryCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/MessageRegistryCollection_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistryFileCollection_v1.xml b/redfish-core/schema/dmtf/csdl/MessageRegistryFileCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistryFileCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/MessageRegistryFileCollection_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistryFile_v1.xml b/redfish-core/schema/dmtf/csdl/MessageRegistryFile_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistryFile_v1.xml
rename to redfish-core/schema/dmtf/csdl/MessageRegistryFile_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistry_v1.xml b/redfish-core/schema/dmtf/csdl/MessageRegistry_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistry_v1.xml
rename to redfish-core/schema/dmtf/csdl/MessageRegistry_v1.xml
diff --git a/static/redfish/v1/schema/Message_v1.xml b/redfish-core/schema/dmtf/csdl/Message_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Message_v1.xml
rename to redfish-core/schema/dmtf/csdl/Message_v1.xml
diff --git a/static/redfish/v1/schema/MetricDefinitionCollection_v1.xml b/redfish-core/schema/dmtf/csdl/MetricDefinitionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricDefinitionCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/MetricDefinitionCollection_v1.xml
diff --git a/static/redfish/v1/schema/MetricDefinition_v1.xml b/redfish-core/schema/dmtf/csdl/MetricDefinition_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricDefinition_v1.xml
rename to redfish-core/schema/dmtf/csdl/MetricDefinition_v1.xml
diff --git a/static/redfish/v1/schema/MetricReportCollection_v1.xml b/redfish-core/schema/dmtf/csdl/MetricReportCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReportCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/MetricReportCollection_v1.xml
diff --git a/static/redfish/v1/schema/MetricReportDefinitionCollection_v1.xml b/redfish-core/schema/dmtf/csdl/MetricReportDefinitionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReportDefinitionCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/MetricReportDefinitionCollection_v1.xml
diff --git a/static/redfish/v1/schema/MetricReportDefinition_v1.xml b/redfish-core/schema/dmtf/csdl/MetricReportDefinition_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReportDefinition_v1.xml
rename to redfish-core/schema/dmtf/csdl/MetricReportDefinition_v1.xml
diff --git a/static/redfish/v1/schema/MetricReport_v1.xml b/redfish-core/schema/dmtf/csdl/MetricReport_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReport_v1.xml
rename to redfish-core/schema/dmtf/csdl/MetricReport_v1.xml
diff --git a/static/redfish/v1/schema/OperatingConfigCollection_v1.xml b/redfish-core/schema/dmtf/csdl/OperatingConfigCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OperatingConfigCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/OperatingConfigCollection_v1.xml
diff --git a/static/redfish/v1/schema/OperatingConfig_v1.xml b/redfish-core/schema/dmtf/csdl/OperatingConfig_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OperatingConfig_v1.xml
rename to redfish-core/schema/dmtf/csdl/OperatingConfig_v1.xml
diff --git a/static/redfish/v1/schema/PCIeDeviceCollection_v1.xml b/redfish-core/schema/dmtf/csdl/PCIeDeviceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeDeviceCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/PCIeDeviceCollection_v1.xml
diff --git a/static/redfish/v1/schema/PCIeDevice_v1.xml b/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeDevice_v1.xml
rename to redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
diff --git a/static/redfish/v1/schema/PCIeFunctionCollection_v1.xml b/redfish-core/schema/dmtf/csdl/PCIeFunctionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeFunctionCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/PCIeFunctionCollection_v1.xml
diff --git a/static/redfish/v1/schema/PCIeFunction_v1.xml b/redfish-core/schema/dmtf/csdl/PCIeFunction_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeFunction_v1.xml
rename to redfish-core/schema/dmtf/csdl/PCIeFunction_v1.xml
diff --git a/static/redfish/v1/schema/PCIeSlots_v1.xml b/redfish-core/schema/dmtf/csdl/PCIeSlots_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeSlots_v1.xml
rename to redfish-core/schema/dmtf/csdl/PCIeSlots_v1.xml
diff --git a/static/redfish/v1/schema/PhysicalContext_v1.xml b/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PhysicalContext_v1.xml
rename to redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
diff --git a/static/redfish/v1/schema/PortCollection_v1.xml b/redfish-core/schema/dmtf/csdl/PortCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PortCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/PortCollection_v1.xml
diff --git a/static/redfish/v1/schema/Port_v1.xml b/redfish-core/schema/dmtf/csdl/Port_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Port_v1.xml
rename to redfish-core/schema/dmtf/csdl/Port_v1.xml
diff --git a/static/redfish/v1/schema/PowerSubsystem_v1.xml b/redfish-core/schema/dmtf/csdl/PowerSubsystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PowerSubsystem_v1.xml
rename to redfish-core/schema/dmtf/csdl/PowerSubsystem_v1.xml
diff --git a/static/redfish/v1/schema/PowerSupplyCollection_v1.xml b/redfish-core/schema/dmtf/csdl/PowerSupplyCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PowerSupplyCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/PowerSupplyCollection_v1.xml
diff --git a/static/redfish/v1/schema/PowerSupply_v1.xml b/redfish-core/schema/dmtf/csdl/PowerSupply_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PowerSupply_v1.xml
rename to redfish-core/schema/dmtf/csdl/PowerSupply_v1.xml
diff --git a/static/redfish/v1/schema/Power_v1.xml b/redfish-core/schema/dmtf/csdl/Power_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Power_v1.xml
rename to redfish-core/schema/dmtf/csdl/Power_v1.xml
diff --git a/static/redfish/v1/schema/Privileges_v1.xml b/redfish-core/schema/dmtf/csdl/Privileges_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Privileges_v1.xml
rename to redfish-core/schema/dmtf/csdl/Privileges_v1.xml
diff --git a/static/redfish/v1/schema/ProcessorCollection_v1.xml b/redfish-core/schema/dmtf/csdl/ProcessorCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ProcessorCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/ProcessorCollection_v1.xml
diff --git a/static/redfish/v1/schema/Processor_v1.xml b/redfish-core/schema/dmtf/csdl/Processor_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Processor_v1.xml
rename to redfish-core/schema/dmtf/csdl/Processor_v1.xml
diff --git a/static/redfish/v1/schema/Protocol_v1.xml b/redfish-core/schema/dmtf/csdl/Protocol_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Protocol_v1.xml
rename to redfish-core/schema/dmtf/csdl/Protocol_v1.xml
diff --git a/static/redfish/v1/schema/RedfishError_v1.xml b/redfish-core/schema/dmtf/csdl/RedfishError_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/RedfishError_v1.xml
rename to redfish-core/schema/dmtf/csdl/RedfishError_v1.xml
diff --git a/static/redfish/v1/schema/RedfishExtensions_v1.xml b/redfish-core/schema/dmtf/csdl/RedfishExtensions_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/RedfishExtensions_v1.xml
rename to redfish-core/schema/dmtf/csdl/RedfishExtensions_v1.xml
diff --git a/static/redfish/v1/schema/Redundancy_v1.xml b/redfish-core/schema/dmtf/csdl/Redundancy_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Redundancy_v1.xml
rename to redfish-core/schema/dmtf/csdl/Redundancy_v1.xml
diff --git a/static/redfish/v1/schema/Resource_v1.xml b/redfish-core/schema/dmtf/csdl/Resource_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Resource_v1.xml
rename to redfish-core/schema/dmtf/csdl/Resource_v1.xml
diff --git a/static/redfish/v1/schema/RoleCollection_v1.xml b/redfish-core/schema/dmtf/csdl/RoleCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/RoleCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/RoleCollection_v1.xml
diff --git a/static/redfish/v1/schema/Role_v1.xml b/redfish-core/schema/dmtf/csdl/Role_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Role_v1.xml
rename to redfish-core/schema/dmtf/csdl/Role_v1.xml
diff --git a/static/redfish/v1/schema/SensorCollection_v1.xml b/redfish-core/schema/dmtf/csdl/SensorCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SensorCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/SensorCollection_v1.xml
diff --git a/static/redfish/v1/schema/Sensor_v1.xml b/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Sensor_v1.xml
rename to redfish-core/schema/dmtf/csdl/Sensor_v1.xml
diff --git a/static/redfish/v1/schema/ServiceRoot_v1.xml b/redfish-core/schema/dmtf/csdl/ServiceRoot_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ServiceRoot_v1.xml
rename to redfish-core/schema/dmtf/csdl/ServiceRoot_v1.xml
diff --git a/static/redfish/v1/schema/SessionCollection_v1.xml b/redfish-core/schema/dmtf/csdl/SessionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SessionCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/SessionCollection_v1.xml
diff --git a/static/redfish/v1/schema/SessionService_v1.xml b/redfish-core/schema/dmtf/csdl/SessionService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SessionService_v1.xml
rename to redfish-core/schema/dmtf/csdl/SessionService_v1.xml
diff --git a/static/redfish/v1/schema/Session_v1.xml b/redfish-core/schema/dmtf/csdl/Session_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Session_v1.xml
rename to redfish-core/schema/dmtf/csdl/Session_v1.xml
diff --git a/static/redfish/v1/schema/Settings_v1.xml b/redfish-core/schema/dmtf/csdl/Settings_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Settings_v1.xml
rename to redfish-core/schema/dmtf/csdl/Settings_v1.xml
diff --git a/static/redfish/v1/schema/SoftwareInventoryCollection_v1.xml b/redfish-core/schema/dmtf/csdl/SoftwareInventoryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SoftwareInventoryCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/SoftwareInventoryCollection_v1.xml
diff --git a/static/redfish/v1/schema/SoftwareInventory_v1.xml b/redfish-core/schema/dmtf/csdl/SoftwareInventory_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SoftwareInventory_v1.xml
rename to redfish-core/schema/dmtf/csdl/SoftwareInventory_v1.xml
diff --git a/static/redfish/v1/schema/StorageCollection_v1.xml b/redfish-core/schema/dmtf/csdl/StorageCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/StorageCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/StorageCollection_v1.xml
diff --git a/static/redfish/v1/schema/StorageControllerCollection_v1.xml b/redfish-core/schema/dmtf/csdl/StorageControllerCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/StorageControllerCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/StorageControllerCollection_v1.xml
diff --git a/static/redfish/v1/schema/StorageController_v1.xml b/redfish-core/schema/dmtf/csdl/StorageController_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/StorageController_v1.xml
rename to redfish-core/schema/dmtf/csdl/StorageController_v1.xml
diff --git a/static/redfish/v1/schema/Storage_v1.xml b/redfish-core/schema/dmtf/csdl/Storage_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Storage_v1.xml
rename to redfish-core/schema/dmtf/csdl/Storage_v1.xml
diff --git a/static/redfish/v1/schema/TaskCollection_v1.xml b/redfish-core/schema/dmtf/csdl/TaskCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TaskCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/TaskCollection_v1.xml
diff --git a/static/redfish/v1/schema/TaskService_v1.xml b/redfish-core/schema/dmtf/csdl/TaskService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TaskService_v1.xml
rename to redfish-core/schema/dmtf/csdl/TaskService_v1.xml
diff --git a/static/redfish/v1/schema/Task_v1.xml b/redfish-core/schema/dmtf/csdl/Task_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Task_v1.xml
rename to redfish-core/schema/dmtf/csdl/Task_v1.xml
diff --git a/static/redfish/v1/schema/TelemetryService_v1.xml b/redfish-core/schema/dmtf/csdl/TelemetryService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TelemetryService_v1.xml
rename to redfish-core/schema/dmtf/csdl/TelemetryService_v1.xml
diff --git a/static/redfish/v1/schema/ThermalMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/ThermalMetrics_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ThermalMetrics_v1.xml
rename to redfish-core/schema/dmtf/csdl/ThermalMetrics_v1.xml
diff --git a/static/redfish/v1/schema/ThermalSubsystem_v1.xml b/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ThermalSubsystem_v1.xml
rename to redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
diff --git a/static/redfish/v1/schema/Thermal_v1.xml b/redfish-core/schema/dmtf/csdl/Thermal_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Thermal_v1.xml
rename to redfish-core/schema/dmtf/csdl/Thermal_v1.xml
diff --git a/static/redfish/v1/schema/TriggersCollection_v1.xml b/redfish-core/schema/dmtf/csdl/TriggersCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TriggersCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/TriggersCollection_v1.xml
diff --git a/static/redfish/v1/schema/Triggers_v1.xml b/redfish-core/schema/dmtf/csdl/Triggers_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Triggers_v1.xml
rename to redfish-core/schema/dmtf/csdl/Triggers_v1.xml
diff --git a/static/redfish/v1/schema/UpdateService_v1.xml b/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/UpdateService_v1.xml
rename to redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
diff --git a/static/redfish/v1/schema/VirtualMediaCollection_v1.xml b/redfish-core/schema/dmtf/csdl/VirtualMediaCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/VirtualMediaCollection_v1.xml
rename to redfish-core/schema/dmtf/csdl/VirtualMediaCollection_v1.xml
diff --git a/static/redfish/v1/schema/VirtualMedia_v1.xml b/redfish-core/schema/dmtf/csdl/VirtualMedia_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/VirtualMedia_v1.xml
rename to redfish-core/schema/dmtf/csdl/VirtualMedia_v1.xml
diff --git a/static/redfish/v1/JsonSchemas/AccountService/AccountService.json b/redfish-core/schema/dmtf/json-schema/AccountService.v1_15_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/AccountService/AccountService.json
rename to redfish-core/schema/dmtf/json-schema/AccountService.v1_15_0.json
diff --git a/static/redfish/v1/JsonSchemas/ActionInfo/ActionInfo.json b/redfish-core/schema/dmtf/json-schema/ActionInfo.v1_4_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ActionInfo/ActionInfo.json
rename to redfish-core/schema/dmtf/json-schema/ActionInfo.v1_4_1.json
diff --git a/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json b/redfish-core/schema/dmtf/json-schema/AggregationService.v1_0_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json
rename to redfish-core/schema/dmtf/json-schema/AggregationService.v1_0_2.json
diff --git a/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json b/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json
rename to redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_0.json
diff --git a/static/redfish/v1/JsonSchemas/AggregationSourceCollection/AggregationSourceCollection.json b/redfish-core/schema/dmtf/json-schema/AggregationSourceCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/AggregationSourceCollection/AggregationSourceCollection.json
rename to redfish-core/schema/dmtf/json-schema/AggregationSourceCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Assembly/Assembly.json b/redfish-core/schema/dmtf/json-schema/Assembly.v1_5_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Assembly/Assembly.json
rename to redfish-core/schema/dmtf/json-schema/Assembly.v1_5_0.json
diff --git a/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json b/redfish-core/schema/dmtf/json-schema/AttributeRegistry.v1_3_8.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json
rename to redfish-core/schema/dmtf/json-schema/AttributeRegistry.v1_3_8.json
diff --git a/static/redfish/v1/JsonSchemas/Bios/Bios.json b/redfish-core/schema/dmtf/json-schema/Bios.v1_2_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Bios/Bios.json
rename to redfish-core/schema/dmtf/json-schema/Bios.v1_2_2.json
diff --git a/static/redfish/v1/JsonSchemas/Cable/Cable.json b/redfish-core/schema/dmtf/json-schema/Cable.v1_2_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Cable/Cable.json
rename to redfish-core/schema/dmtf/json-schema/Cable.v1_2_2.json
diff --git a/static/redfish/v1/JsonSchemas/CableCollection/CableCollection.json b/redfish-core/schema/dmtf/json-schema/CableCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/CableCollection/CableCollection.json
rename to redfish-core/schema/dmtf/json-schema/CableCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Certificate/Certificate.json b/redfish-core/schema/dmtf/json-schema/Certificate.v1_8_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Certificate/Certificate.json
rename to redfish-core/schema/dmtf/json-schema/Certificate.v1_8_1.json
diff --git a/static/redfish/v1/JsonSchemas/CertificateCollection/CertificateCollection.json b/redfish-core/schema/dmtf/json-schema/CertificateCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/CertificateCollection/CertificateCollection.json
rename to redfish-core/schema/dmtf/json-schema/CertificateCollection.json
diff --git a/static/redfish/v1/JsonSchemas/CertificateLocations/CertificateLocations.json b/redfish-core/schema/dmtf/json-schema/CertificateLocations.v1_0_3.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/CertificateLocations/CertificateLocations.json
rename to redfish-core/schema/dmtf/json-schema/CertificateLocations.v1_0_3.json
diff --git a/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json b/redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_4.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json
rename to redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_4.json
diff --git a/static/redfish/v1/JsonSchemas/Chassis/Chassis.json b/redfish-core/schema/dmtf/json-schema/Chassis.v1_25_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Chassis/Chassis.json
rename to redfish-core/schema/dmtf/json-schema/Chassis.v1_25_0.json
diff --git a/static/redfish/v1/JsonSchemas/ChassisCollection/ChassisCollection.json b/redfish-core/schema/dmtf/json-schema/ChassisCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ChassisCollection/ChassisCollection.json
rename to redfish-core/schema/dmtf/json-schema/ChassisCollection.json
diff --git a/static/redfish/v1/JsonSchemas/ComponentIntegrity/ComponentIntegrity.json b/redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_2_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ComponentIntegrity/ComponentIntegrity.json
rename to redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_2_2.json
diff --git a/static/redfish/v1/JsonSchemas/ComponentIntegrityCollection/ComponentIntegrityCollection.json b/redfish-core/schema/dmtf/json-schema/ComponentIntegrityCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ComponentIntegrityCollection/ComponentIntegrityCollection.json
rename to redfish-core/schema/dmtf/json-schema/ComponentIntegrityCollection.json
diff --git a/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json
rename to redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_0.json
diff --git a/static/redfish/v1/JsonSchemas/ComputerSystemCollection/ComputerSystemCollection.json b/redfish-core/schema/dmtf/json-schema/ComputerSystemCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ComputerSystemCollection/ComputerSystemCollection.json
rename to redfish-core/schema/dmtf/json-schema/ComputerSystemCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Drive/Drive.json b/redfish-core/schema/dmtf/json-schema/Drive.v1_18_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Drive/Drive.json
rename to redfish-core/schema/dmtf/json-schema/Drive.v1_18_0.json
diff --git a/static/redfish/v1/JsonSchemas/DriveCollection/DriveCollection.json b/redfish-core/schema/dmtf/json-schema/DriveCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/DriveCollection/DriveCollection.json
rename to redfish-core/schema/dmtf/json-schema/DriveCollection.json
diff --git a/static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json b/redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_3_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json
rename to redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_3_1.json
diff --git a/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json b/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json
rename to redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_0.json
diff --git a/static/redfish/v1/JsonSchemas/EthernetInterfaceCollection/EthernetInterfaceCollection.json b/redfish-core/schema/dmtf/json-schema/EthernetInterfaceCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/EthernetInterfaceCollection/EthernetInterfaceCollection.json
rename to redfish-core/schema/dmtf/json-schema/EthernetInterfaceCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Event/Event.json b/redfish-core/schema/dmtf/json-schema/Event.v1_10_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Event/Event.json
rename to redfish-core/schema/dmtf/json-schema/Event.v1_10_0.json
diff --git a/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json b/redfish-core/schema/dmtf/json-schema/EventDestination.v1_14_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json
rename to redfish-core/schema/dmtf/json-schema/EventDestination.v1_14_0.json
diff --git a/static/redfish/v1/JsonSchemas/EventDestinationCollection/EventDestinationCollection.json b/redfish-core/schema/dmtf/json-schema/EventDestinationCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/EventDestinationCollection/EventDestinationCollection.json
rename to redfish-core/schema/dmtf/json-schema/EventDestinationCollection.json
diff --git a/static/redfish/v1/JsonSchemas/EventService/EventService.json b/redfish-core/schema/dmtf/json-schema/EventService.v1_10_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/EventService/EventService.json
rename to redfish-core/schema/dmtf/json-schema/EventService.v1_10_1.json
diff --git a/static/redfish/v1/JsonSchemas/FabricAdapter/FabricAdapter.json b/redfish-core/schema/dmtf/json-schema/FabricAdapter.v1_5_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/FabricAdapter/FabricAdapter.json
rename to redfish-core/schema/dmtf/json-schema/FabricAdapter.v1_5_2.json
diff --git a/static/redfish/v1/JsonSchemas/FabricAdapterCollection/FabricAdapterCollection.json b/redfish-core/schema/dmtf/json-schema/FabricAdapterCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/FabricAdapterCollection/FabricAdapterCollection.json
rename to redfish-core/schema/dmtf/json-schema/FabricAdapterCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Fan/Fan.json b/redfish-core/schema/dmtf/json-schema/Fan.v1_5_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Fan/Fan.json
rename to redfish-core/schema/dmtf/json-schema/Fan.v1_5_1.json
diff --git a/static/redfish/v1/JsonSchemas/FanCollection/FanCollection.json b/redfish-core/schema/dmtf/json-schema/FanCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/FanCollection/FanCollection.json
rename to redfish-core/schema/dmtf/json-schema/FanCollection.json
diff --git a/static/redfish/v1/JsonSchemas/IPAddresses/IPAddresses.json b/redfish-core/schema/dmtf/json-schema/IPAddresses.v1_1_4.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/IPAddresses/IPAddresses.json
rename to redfish-core/schema/dmtf/json-schema/IPAddresses.v1_1_4.json
diff --git a/static/redfish/v1/JsonSchemas/JsonSchemaFile/JsonSchemaFile.json b/redfish-core/schema/dmtf/json-schema/JsonSchemaFile.v1_1_4.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/JsonSchemaFile/JsonSchemaFile.json
rename to redfish-core/schema/dmtf/json-schema/JsonSchemaFile.v1_1_4.json
diff --git a/static/redfish/v1/JsonSchemas/JsonSchemaFileCollection/JsonSchemaFileCollection.json b/redfish-core/schema/dmtf/json-schema/JsonSchemaFileCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/JsonSchemaFileCollection/JsonSchemaFileCollection.json
rename to redfish-core/schema/dmtf/json-schema/JsonSchemaFileCollection.json
diff --git a/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json b/redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json
rename to redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_0.json
diff --git a/static/redfish/v1/JsonSchemas/LogEntryCollection/LogEntryCollection.json b/redfish-core/schema/dmtf/json-schema/LogEntryCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/LogEntryCollection/LogEntryCollection.json
rename to redfish-core/schema/dmtf/json-schema/LogEntryCollection.json
diff --git a/static/redfish/v1/JsonSchemas/LogService/LogService.json b/redfish-core/schema/dmtf/json-schema/LogService.v1_6_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/LogService/LogService.json
rename to redfish-core/schema/dmtf/json-schema/LogService.v1_6_0.json
diff --git a/static/redfish/v1/JsonSchemas/LogServiceCollection/LogServiceCollection.json b/redfish-core/schema/dmtf/json-schema/LogServiceCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/LogServiceCollection/LogServiceCollection.json
rename to redfish-core/schema/dmtf/json-schema/LogServiceCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Manager/Manager.json b/redfish-core/schema/dmtf/json-schema/Manager.v1_19_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Manager/Manager.json
rename to redfish-core/schema/dmtf/json-schema/Manager.v1_19_0.json
diff --git a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json b/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_12_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
rename to redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_12_0.json
diff --git a/static/redfish/v1/JsonSchemas/ManagerAccountCollection/ManagerAccountCollection.json b/redfish-core/schema/dmtf/json-schema/ManagerAccountCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ManagerAccountCollection/ManagerAccountCollection.json
rename to redfish-core/schema/dmtf/json-schema/ManagerAccountCollection.json
diff --git a/static/redfish/v1/JsonSchemas/ManagerCollection/ManagerCollection.json b/redfish-core/schema/dmtf/json-schema/ManagerCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ManagerCollection/ManagerCollection.json
rename to redfish-core/schema/dmtf/json-schema/ManagerCollection.json
diff --git a/static/redfish/v1/JsonSchemas/ManagerDiagnosticData/ManagerDiagnosticData.json b/redfish-core/schema/dmtf/json-schema/ManagerDiagnosticData.v1_2_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ManagerDiagnosticData/ManagerDiagnosticData.json
rename to redfish-core/schema/dmtf/json-schema/ManagerDiagnosticData.v1_2_2.json
diff --git a/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json b/redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_10_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
rename to redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_10_0.json
diff --git a/static/redfish/v1/JsonSchemas/Memory/Memory.json b/redfish-core/schema/dmtf/json-schema/Memory.v1_19_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Memory/Memory.json
rename to redfish-core/schema/dmtf/json-schema/Memory.v1_19_0.json
diff --git a/static/redfish/v1/JsonSchemas/MemoryCollection/MemoryCollection.json b/redfish-core/schema/dmtf/json-schema/MemoryCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MemoryCollection/MemoryCollection.json
rename to redfish-core/schema/dmtf/json-schema/MemoryCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Message/Message.json b/redfish-core/schema/dmtf/json-schema/Message.v1_2_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Message/Message.json
rename to redfish-core/schema/dmtf/json-schema/Message.v1_2_0.json
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json b/redfish-core/schema/dmtf/json-schema/MessageRegistry.v1_6_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
rename to redfish-core/schema/dmtf/json-schema/MessageRegistry.v1_6_2.json
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistryCollection/MessageRegistryCollection.json b/redfish-core/schema/dmtf/json-schema/MessageRegistryCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MessageRegistryCollection/MessageRegistryCollection.json
rename to redfish-core/schema/dmtf/json-schema/MessageRegistryCollection.json
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistryFile/MessageRegistryFile.json b/redfish-core/schema/dmtf/json-schema/MessageRegistryFile.v1_1_4.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MessageRegistryFile/MessageRegistryFile.json
rename to redfish-core/schema/dmtf/json-schema/MessageRegistryFile.v1_1_4.json
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistryFileCollection/MessageRegistryFileCollection.json b/redfish-core/schema/dmtf/json-schema/MessageRegistryFileCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MessageRegistryFileCollection/MessageRegistryFileCollection.json
rename to redfish-core/schema/dmtf/json-schema/MessageRegistryFileCollection.json
diff --git a/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json b/redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_3.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
rename to redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_3.json
diff --git a/static/redfish/v1/JsonSchemas/MetricDefinitionCollection/MetricDefinitionCollection.json b/redfish-core/schema/dmtf/json-schema/MetricDefinitionCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MetricDefinitionCollection/MetricDefinitionCollection.json
rename to redfish-core/schema/dmtf/json-schema/MetricDefinitionCollection.json
diff --git a/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json b/redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json
rename to redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_0.json
diff --git a/static/redfish/v1/JsonSchemas/MetricReportCollection/MetricReportCollection.json b/redfish-core/schema/dmtf/json-schema/MetricReportCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MetricReportCollection/MetricReportCollection.json
rename to redfish-core/schema/dmtf/json-schema/MetricReportCollection.json
diff --git a/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json b/redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_5.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json
rename to redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_5.json
diff --git a/static/redfish/v1/JsonSchemas/MetricReportDefinitionCollection/MetricReportDefinitionCollection.json b/redfish-core/schema/dmtf/json-schema/MetricReportDefinitionCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/MetricReportDefinitionCollection/MetricReportDefinitionCollection.json
rename to redfish-core/schema/dmtf/json-schema/MetricReportDefinitionCollection.json
diff --git a/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json b/redfish-core/schema/dmtf/json-schema/OperatingConfig.v1_0_3.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json
rename to redfish-core/schema/dmtf/json-schema/OperatingConfig.v1_0_3.json
diff --git a/static/redfish/v1/JsonSchemas/OperatingConfigCollection/OperatingConfigCollection.json b/redfish-core/schema/dmtf/json-schema/OperatingConfigCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OperatingConfigCollection/OperatingConfigCollection.json
rename to redfish-core/schema/dmtf/json-schema/OperatingConfigCollection.json
diff --git a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_13_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
rename to redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_13_0.json
diff --git a/static/redfish/v1/JsonSchemas/PCIeDeviceCollection/PCIeDeviceCollection.json b/redfish-core/schema/dmtf/json-schema/PCIeDeviceCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PCIeDeviceCollection/PCIeDeviceCollection.json
rename to redfish-core/schema/dmtf/json-schema/PCIeDeviceCollection.json
diff --git a/static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json b/redfish-core/schema/dmtf/json-schema/PCIeFunction.v1_5_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json
rename to redfish-core/schema/dmtf/json-schema/PCIeFunction.v1_5_1.json
diff --git a/static/redfish/v1/JsonSchemas/PCIeFunctionCollection/PCIeFunctionCollection.json b/redfish-core/schema/dmtf/json-schema/PCIeFunctionCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PCIeFunctionCollection/PCIeFunctionCollection.json
rename to redfish-core/schema/dmtf/json-schema/PCIeFunctionCollection.json
diff --git a/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json b/redfish-core/schema/dmtf/json-schema/PCIeSlots.v1_6_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json
rename to redfish-core/schema/dmtf/json-schema/PCIeSlots.v1_6_0.json
diff --git a/static/redfish/v1/JsonSchemas/PhysicalContext/PhysicalContext.json b/redfish-core/schema/dmtf/json-schema/PhysicalContext.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PhysicalContext/PhysicalContext.json
rename to redfish-core/schema/dmtf/json-schema/PhysicalContext.json
diff --git a/static/redfish/v1/JsonSchemas/Port/Port.json b/redfish-core/schema/dmtf/json-schema/Port.v1_11_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Port/Port.json
rename to redfish-core/schema/dmtf/json-schema/Port.v1_11_0.json
diff --git a/static/redfish/v1/JsonSchemas/PortCollection/PortCollection.json b/redfish-core/schema/dmtf/json-schema/PortCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PortCollection/PortCollection.json
rename to redfish-core/schema/dmtf/json-schema/PortCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Power/Power.json b/redfish-core/schema/dmtf/json-schema/Power.v1_7_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Power/Power.json
rename to redfish-core/schema/dmtf/json-schema/Power.v1_7_2.json
diff --git a/static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json b/redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json
rename to redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_1.json
diff --git a/static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json b/redfish-core/schema/dmtf/json-schema/PowerSupply.v1_5_3.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json
rename to redfish-core/schema/dmtf/json-schema/PowerSupply.v1_5_3.json
diff --git a/static/redfish/v1/JsonSchemas/PowerSupplyCollection/PowerSupplyCollection.json b/redfish-core/schema/dmtf/json-schema/PowerSupplyCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/PowerSupplyCollection/PowerSupplyCollection.json
rename to redfish-core/schema/dmtf/json-schema/PowerSupplyCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Privileges/Privileges.json b/redfish-core/schema/dmtf/json-schema/Privileges.v1_0_5.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Privileges/Privileges.json
rename to redfish-core/schema/dmtf/json-schema/Privileges.v1_0_5.json
diff --git a/static/redfish/v1/JsonSchemas/Processor/Processor.json b/redfish-core/schema/dmtf/json-schema/Processor.v1_19_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Processor/Processor.json
rename to redfish-core/schema/dmtf/json-schema/Processor.v1_19_0.json
diff --git a/static/redfish/v1/JsonSchemas/ProcessorCollection/ProcessorCollection.json b/redfish-core/schema/dmtf/json-schema/ProcessorCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ProcessorCollection/ProcessorCollection.json
rename to redfish-core/schema/dmtf/json-schema/ProcessorCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Protocol/Protocol.json b/redfish-core/schema/dmtf/json-schema/Protocol.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Protocol/Protocol.json
rename to redfish-core/schema/dmtf/json-schema/Protocol.json
diff --git a/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json b/redfish-core/schema/dmtf/json-schema/Redundancy.v1_4_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json
rename to redfish-core/schema/dmtf/json-schema/Redundancy.v1_4_1.json
diff --git a/static/redfish/v1/JsonSchemas/Resource/Resource.json b/redfish-core/schema/dmtf/json-schema/Resource.v1_18_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Resource/Resource.json
rename to redfish-core/schema/dmtf/json-schema/Resource.v1_18_0.json
diff --git a/static/redfish/v1/JsonSchemas/Role/Role.json b/redfish-core/schema/dmtf/json-schema/Role.v1_3_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Role/Role.json
rename to redfish-core/schema/dmtf/json-schema/Role.v1_3_1.json
diff --git a/static/redfish/v1/JsonSchemas/RoleCollection/RoleCollection.json b/redfish-core/schema/dmtf/json-schema/RoleCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/RoleCollection/RoleCollection.json
rename to redfish-core/schema/dmtf/json-schema/RoleCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json b/redfish-core/schema/dmtf/json-schema/Sensor.v1_8_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Sensor/Sensor.json
rename to redfish-core/schema/dmtf/json-schema/Sensor.v1_8_1.json
diff --git a/static/redfish/v1/JsonSchemas/SensorCollection/SensorCollection.json b/redfish-core/schema/dmtf/json-schema/SensorCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/SensorCollection/SensorCollection.json
rename to redfish-core/schema/dmtf/json-schema/SensorCollection.json
diff --git a/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json b/redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_16_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
rename to redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_16_1.json
diff --git a/static/redfish/v1/JsonSchemas/Session/Session.json b/redfish-core/schema/dmtf/json-schema/Session.v1_7_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Session/Session.json
rename to redfish-core/schema/dmtf/json-schema/Session.v1_7_1.json
diff --git a/static/redfish/v1/JsonSchemas/SessionCollection/SessionCollection.json b/redfish-core/schema/dmtf/json-schema/SessionCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/SessionCollection/SessionCollection.json
rename to redfish-core/schema/dmtf/json-schema/SessionCollection.json
diff --git a/static/redfish/v1/JsonSchemas/SessionService/SessionService.json b/redfish-core/schema/dmtf/json-schema/SessionService.v1_1_8.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/SessionService/SessionService.json
rename to redfish-core/schema/dmtf/json-schema/SessionService.v1_1_8.json
diff --git a/static/redfish/v1/JsonSchemas/Settings/Settings.json b/redfish-core/schema/dmtf/json-schema/Settings.v1_3_5.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Settings/Settings.json
rename to redfish-core/schema/dmtf/json-schema/Settings.v1_3_5.json
diff --git a/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json b/redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_10_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json
rename to redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_10_1.json
diff --git a/static/redfish/v1/JsonSchemas/SoftwareInventoryCollection/SoftwareInventoryCollection.json b/redfish-core/schema/dmtf/json-schema/SoftwareInventoryCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/SoftwareInventoryCollection/SoftwareInventoryCollection.json
rename to redfish-core/schema/dmtf/json-schema/SoftwareInventoryCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Storage/Storage.json b/redfish-core/schema/dmtf/json-schema/Storage.v1_15_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Storage/Storage.json
rename to redfish-core/schema/dmtf/json-schema/Storage.v1_15_1.json
diff --git a/static/redfish/v1/JsonSchemas/StorageCollection/StorageCollection.json b/redfish-core/schema/dmtf/json-schema/StorageCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/StorageCollection/StorageCollection.json
rename to redfish-core/schema/dmtf/json-schema/StorageCollection.json
diff --git a/static/redfish/v1/JsonSchemas/StorageController/StorageController.json b/redfish-core/schema/dmtf/json-schema/StorageController.v1_7_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/StorageController/StorageController.json
rename to redfish-core/schema/dmtf/json-schema/StorageController.v1_7_2.json
diff --git a/static/redfish/v1/JsonSchemas/StorageControllerCollection/StorageControllerCollection.json b/redfish-core/schema/dmtf/json-schema/StorageControllerCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/StorageControllerCollection/StorageControllerCollection.json
rename to redfish-core/schema/dmtf/json-schema/StorageControllerCollection.json
diff --git a/static/redfish/v1/JsonSchemas/Task/Task.json b/redfish-core/schema/dmtf/json-schema/Task.v1_7_3.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Task/Task.json
rename to redfish-core/schema/dmtf/json-schema/Task.v1_7_3.json
diff --git a/static/redfish/v1/JsonSchemas/TaskCollection/TaskCollection.json b/redfish-core/schema/dmtf/json-schema/TaskCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/TaskCollection/TaskCollection.json
rename to redfish-core/schema/dmtf/json-schema/TaskCollection.json
diff --git a/static/redfish/v1/JsonSchemas/TaskService/TaskService.json b/redfish-core/schema/dmtf/json-schema/TaskService.v1_2_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/TaskService/TaskService.json
rename to redfish-core/schema/dmtf/json-schema/TaskService.v1_2_0.json
diff --git a/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json b/redfish-core/schema/dmtf/json-schema/TelemetryService.v1_3_3.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json
rename to redfish-core/schema/dmtf/json-schema/TelemetryService.v1_3_3.json
diff --git a/static/redfish/v1/JsonSchemas/Thermal/Thermal.json b/redfish-core/schema/dmtf/json-schema/Thermal.v1_7_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Thermal/Thermal.json
rename to redfish-core/schema/dmtf/json-schema/Thermal.v1_7_2.json
diff --git a/static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json b/redfish-core/schema/dmtf/json-schema/ThermalMetrics.v1_3_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json
rename to redfish-core/schema/dmtf/json-schema/ThermalMetrics.v1_3_1.json
diff --git a/static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json b/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json
rename to redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_1.json
diff --git a/static/redfish/v1/JsonSchemas/Triggers/Triggers.json b/redfish-core/schema/dmtf/json-schema/Triggers.v1_3_2.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/Triggers/Triggers.json
rename to redfish-core/schema/dmtf/json-schema/Triggers.v1_3_2.json
diff --git a/static/redfish/v1/JsonSchemas/TriggersCollection/TriggersCollection.json b/redfish-core/schema/dmtf/json-schema/TriggersCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/TriggersCollection/TriggersCollection.json
rename to redfish-core/schema/dmtf/json-schema/TriggersCollection.json
diff --git a/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json b/redfish-core/schema/dmtf/json-schema/UpdateService.v1_13_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
rename to redfish-core/schema/dmtf/json-schema/UpdateService.v1_13_0.json
diff --git a/static/redfish/v1/JsonSchemas/VirtualMedia/VirtualMedia.json b/redfish-core/schema/dmtf/json-schema/VirtualMedia.v1_6_3.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/VirtualMedia/VirtualMedia.json
rename to redfish-core/schema/dmtf/json-schema/VirtualMedia.v1_6_3.json
diff --git a/static/redfish/v1/JsonSchemas/VirtualMediaCollection/VirtualMediaCollection.json b/redfish-core/schema/dmtf/json-schema/VirtualMediaCollection.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/VirtualMediaCollection/VirtualMediaCollection.json
rename to redfish-core/schema/dmtf/json-schema/VirtualMediaCollection.json
diff --git a/static/redfish/v1/JsonSchemas/odata-v4/odata-v4.json b/redfish-core/schema/dmtf/json-schema/odata-v4.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/odata-v4/odata-v4.json
rename to redfish-core/schema/dmtf/json-schema/odata-v4.json
diff --git a/static/redfish/v1/JsonSchemas/odata/odata.json b/redfish-core/schema/dmtf/json-schema/odata.v4_0_5.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/odata/odata.json
rename to redfish-core/schema/dmtf/json-schema/odata.v4_0_5.json
diff --git a/static/redfish/v1/JsonSchemas/redfish-error/redfish-error.json b/redfish-core/schema/dmtf/json-schema/redfish-error.v1_0_1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/redfish-error/redfish-error.json
rename to redfish-core/schema/dmtf/json-schema/redfish-error.v1_0_1.json
diff --git a/static/redfish/v1/JsonSchemas/redfish-payload-annotations/redfish-payload-annotations.json b/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations-v1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/redfish-payload-annotations/redfish-payload-annotations.json
rename to redfish-core/schema/dmtf/json-schema/redfish-payload-annotations-v1.json
diff --git a/static/redfish/v1/JsonSchemas/redfish-schema-v1/redfish-schema-v1.json b/redfish-core/schema/dmtf/json-schema/redfish-schema-v1.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/redfish-schema-v1/redfish-schema-v1.json
rename to redfish-core/schema/dmtf/json-schema/redfish-schema-v1.json
diff --git a/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json b/redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_0.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json
rename to redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_0.json
diff --git a/static/redfish/v1/schema/OemComputerSystem_v1.xml b/redfish-core/schema/oem/openbmc/csdl/OemComputerSystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OemComputerSystem_v1.xml
rename to redfish-core/schema/oem/openbmc/csdl/OemComputerSystem_v1.xml
diff --git a/static/redfish/v1/schema/OemManager_v1.xml b/redfish-core/schema/oem/openbmc/csdl/OemManager_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OemManager_v1.xml
rename to redfish-core/schema/oem/openbmc/csdl/OemManager_v1.xml
diff --git a/static/redfish/v1/schema/OemVirtualMedia_v1.xml b/redfish-core/schema/oem/openbmc/csdl/OemVirtualMedia_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OemVirtualMedia_v1.xml
rename to redfish-core/schema/oem/openbmc/csdl/OemVirtualMedia_v1.xml
diff --git a/static/redfish/v1/schema/OpenBMCAccountService_v1.xml b/redfish-core/schema/oem/openbmc/csdl/OpenBMCAccountService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OpenBMCAccountService_v1.xml
rename to redfish-core/schema/oem/openbmc/csdl/OpenBMCAccountService_v1.xml
diff --git a/static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json b/redfish-core/schema/oem/openbmc/json-schema/OemAccountService.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json
rename to redfish-core/schema/oem/openbmc/json-schema/OemAccountService.json
diff --git a/static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json b/redfish-core/schema/oem/openbmc/json-schema/OemComputerSystem.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json
rename to redfish-core/schema/oem/openbmc/json-schema/OemComputerSystem.json
diff --git a/static/redfish/v1/JsonSchemas/OemManager/OemManager.json b/redfish-core/schema/oem/openbmc/json-schema/OemManager.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemManager/OemManager.json
rename to redfish-core/schema/oem/openbmc/json-schema/OemManager.json
diff --git a/static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json b/redfish-core/schema/oem/openbmc/json-schema/OemVirtualMedia.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json
rename to redfish-core/schema/oem/openbmc/json-schema/OemVirtualMedia.json
diff --git a/scripts/generate_schema_collections.py b/scripts/generate_schema_collections.py
index c44ca59..cf1f2f3 100755
--- a/scripts/generate_schema_collections.py
+++ b/scripts/generate_schema_collections.py
@@ -22,9 +22,6 @@
  ***************************************************************/"""
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-REDFISH_SCHEMA_DIR = os.path.realpath(
-    os.path.join(SCRIPT_DIR, "..", "static", "redfish", "v1", "schema")
-)
 CPP_OUTFILE = os.path.realpath(
     os.path.join(
         SCRIPT_DIR, "..", "redfish-core", "include", "aggregation_utils.hpp"
@@ -39,8 +36,19 @@
 seen_paths = set()
 
 
+def resolve_filename(xml_file):
+    for root, dirs, files in os.walk(
+        os.path.join(SCRIPT_DIR, "..", "redfish-core", "schema")
+    ):
+        for csdl_file in files:
+            if csdl_file == xml_file:
+                return os.path.join(root, csdl_file)
+    raise Exception(f"Could not resolve {xml_file} in search folders")
+
+
 def parse_node(target_entitytype, path, top_collections, found_top, xml_file):
-    filepath = os.path.join(REDFISH_SCHEMA_DIR, xml_file)
+
+    filepath = resolve_filename(xml_file)
     tree = ET.parse(filepath)
     root = tree.getroot()
 
diff --git a/scripts/generate_schema_enums.py b/scripts/generate_schema_enums.py
index a2e7ee2..fb39b98 100755
--- a/scripts/generate_schema_enums.py
+++ b/scripts/generate_schema_enums.py
@@ -7,7 +7,7 @@
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 REDFISH_SCHEMA_DIR = os.path.realpath(
-    os.path.join(SCRIPT_DIR, "..", "static", "redfish", "v1", "schema")
+    os.path.join(SCRIPT_DIR, "..", "redfish-core", "schema")
 )
 
 OUTFOLDER = os.path.realpath(
@@ -45,6 +45,7 @@
 
 
 def parse_file(filename):
+    print(f"Parsing {filename}")
     tree = ET.parse(filename)
     root = tree.getroot()
     results = []
@@ -135,12 +136,13 @@
 
 def main():
     print("Reading from {}".format(REDFISH_SCHEMA_DIR))
-    dir_list = os.listdir(REDFISH_SCHEMA_DIR)
 
-    filepaths = [
-        os.path.join(REDFISH_SCHEMA_DIR, filename) for filename in dir_list
-    ]
-
+    filepaths = []
+    for root, dirs, files in os.walk(REDFISH_SCHEMA_DIR):
+        for csdl_file in files:
+            if csdl_file.endswith(".xml"):
+                filepaths.append(os.path.join(root, csdl_file))
+    print(filepaths)
     enum_list = []
 
     for filepath in filepaths:
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 2e8487d..ea17d04 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -23,132 +23,6 @@
  * github organization.
  ***************************************************************/"""
 
-# To use a new schema, add to list and rerun tool
-include_list = [
-    "AccountService",
-    "ActionInfo",
-    "AggregationService",
-    "AggregationSource",
-    "AggregationSourceCollection",
-    "Assembly",
-    "AttributeRegistry",
-    "Bios",
-    "Cable",
-    "CableCollection",
-    "Certificate",
-    "CertificateCollection",
-    "CertificateLocations",
-    "CertificateService",
-    "Chassis",
-    "ChassisCollection",
-    "ComputerSystem",
-    "ComputerSystemCollection",
-    "ComponentIntegrity",
-    "ComponentIntegrityCollection",
-    "Drive",
-    "DriveCollection",
-    "EnvironmentMetrics",
-    "EthernetInterface",
-    "EthernetInterfaceCollection",
-    "Event",
-    "EventDestination",
-    "EventDestinationCollection",
-    "EventService",
-    "FabricAdapter",
-    "FabricAdapterCollection",
-    "Fan",
-    "FanCollection",
-    "IPAddresses",
-    "JsonSchemaFile",
-    "JsonSchemaFileCollection",  # redfish/v1/JsonSchemas
-    "LogEntry",
-    "LogEntryCollection",
-    "LogService",
-    "LogServiceCollection",
-    "Manager",
-    "ManagerAccount",
-    "ManagerAccountCollection",
-    "ManagerCollection",
-    "ManagerDiagnosticData",
-    "ManagerNetworkProtocol",
-    "Memory",
-    "MemoryCollection",
-    "Message",
-    "MessageRegistry",
-    "MessageRegistryCollection",
-    "MessageRegistryFile",
-    "MessageRegistryFileCollection",
-    "MetricDefinition",
-    "MetricDefinitionCollection",
-    "MetricReport",
-    "MetricReportCollection",
-    "MetricReportDefinition",
-    "MetricReportDefinitionCollection",
-    "OperatingConfig",
-    "OperatingConfigCollection",
-    "PCIeDevice",
-    "PCIeDeviceCollection",
-    "PCIeFunction",
-    "PCIeFunctionCollection",
-    "PhysicalContext",
-    "PCIeSlots",
-    "Port",
-    "PortCollection",
-    "Power",
-    "PowerSubsystem",
-    "PowerSupply",
-    "PowerSupplyCollection",
-    "Privileges",  # Used in Role
-    "Processor",
-    "ProcessorCollection",
-    "Protocol",
-    "RedfishError",
-    "RedfishExtensions",
-    "Redundancy",
-    "Resource",
-    "Role",
-    "RoleCollection",
-    "Sensor",
-    "SensorCollection",
-    "ServiceRoot",
-    "Session",
-    "SessionCollection",
-    "SessionService",
-    "Settings",
-    "SoftwareInventory",
-    "SoftwareInventoryCollection",
-    "Storage",
-    "StorageCollection",
-    "StorageController",
-    "StorageControllerCollection",
-    "Task",
-    "TaskCollection",
-    "TaskService",
-    "TelemetryService",
-    "Thermal",
-    "ThermalMetrics",
-    "ThermalSubsystem",
-    "Triggers",
-    "TriggersCollection",
-    "UpdateService",
-    "VirtualMedia",
-    "VirtualMediaCollection",
-    "odata",
-    "odata-v4",
-    "redfish-error",
-    "redfish-payload-annotations",
-    "redfish-schema",
-    "redfish-schema-v1",
-]
-
-# OEM schemas
-oem_schema_names = [
-    "OemManager",
-    "OemComputerSystem",
-    "OemVirtualMedia",
-    "OpenBMCAccountService",
-]
-
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 proxies = {"https": os.environ.get("https_proxy", None)}
@@ -173,8 +47,12 @@
 )
 
 
-schema_path = os.path.join(static_path, "schema")
-json_schema_path = os.path.join(static_path, "JsonSchemas")
+schema_path = os.path.join(
+    SCRIPT_DIR, "..", "redfish-core", "schema", "dmtf", "csdl"
+)
+json_schema_path = os.path.join(
+    SCRIPT_DIR, "..", "redfish-core", "schema", "dmtf", "json-schema"
+)
 metadata_index_path = os.path.join(static_path, "$metadata", "index.xml")
 
 zipBytesIO = BytesIO(r.content)
@@ -249,9 +127,6 @@
     elif zip_file.filename.startswith("json-schema/"):
         filename = os.path.basename(zip_file.filename)
         filenamesplit = filename.split(".")
-        # exclude schemas again to save flash space
-        if filenamesplit[0] not in include_list:
-            continue
         json_schema_files[filenamesplit[0]].append(filename)
     elif zip_file.filename.startswith("openapi/"):
         pass
@@ -266,16 +141,11 @@
 json_schema_files = OrderedDict(
     sorted(json_schema_files.items(), key=lambda x: SchemaVersion(x[0]))
 )
-
-csdl_filenames.sort(key=SchemaVersion)
-
-# Create oem filenames - from oem json names
-oem_csdl_filenames = []
-for filename in oem_schema_names:
-    oem_csdl_filenames.append(filename + "_v1.xml")
-
-# Append Oem csdl files
-csdl_filenames += oem_csdl_filenames
+for csdl_file in csdl_filenames:
+    with open(os.path.join(schema_path, csdl_file), "wb") as schema_out:
+        content = zip_ref.read(os.path.join("csdl", csdl_file))
+        content = content.replace(b"\r\n", b"\n")
+        schema_out.write(content)
 
 with open(metadata_index_path, "w") as metadata_index:
     metadata_index.write('<?xml version="1.0" encoding="UTF-8"?>\n')
@@ -285,28 +155,20 @@
         ' Version="4.0">\n'
     )
 
-    for filename in csdl_filenames:
-        # filename looks like Zone_v1.xml
-        if filename in oem_csdl_filenames:
-            with open(
-                os.path.join(schema_path, filename), "rb"
-            ) as oem_csdl_in:
-                content = oem_csdl_in.read()
-                content = content.replace(b"\r\n", b"\n")
-        else:
-            with open(os.path.join(schema_path, filename), "wb") as schema_out:
-                content = zip_ref.read(os.path.join("csdl", filename))
-                content = content.replace(b"\r\n", b"\n")
-                schema_out.write(content)
-                filenamesplit = filename.split("_")
-                if filenamesplit[0] not in include_list:
-                    continue
+    schema_static_dir = os.path.join(
+        SCRIPT_DIR, "..", "static", "redfish", "v1", "schema"
+    )
+    for filename in sorted(os.listdir(schema_static_dir), key=SchemaVersion):
+        if not filename.endswith(".xml"):
+            continue
 
         metadata_index.write(
             '    <edmx:Reference Uri="/redfish/v1/schema/' + filename + '">\n'
         )
 
-        xml_root = ET.fromstring(content)
+        xml_root = ET.parse(
+            os.path.join(schema_static_dir, filename)
+        ).getroot()
         edmx = "{http://docs.oasis-open.org/odata/ns/edmx}"
         edm = "{http://docs.oasis-open.org/odata/ns/edm}"
         for edmx_child in xml_root:
@@ -344,13 +206,18 @@
 
 for schema, version in json_schema_files.items():
     zip_filepath = os.path.join("json-schema", version[0])
-    schemadir = os.path.join(json_schema_path, schema)
-    os.makedirs(schemadir)
 
-    with open(os.path.join(schemadir, schema + ".json"), "wb") as schema_file:
+    with open(os.path.join(json_schema_path, version[0]), "wb") as schema_file:
         schema_file.write(zip_ref.read(zip_filepath).replace(b"\r\n", b"\n"))
 
 with open(os.path.join(cpp_path, "schemas.hpp"), "w") as hpp_file:
+    schemas = []
+    for root, dirs, files in os.walk(
+        os.path.join(SCRIPT_DIR, "..", "static", "redfish", "v1", "schema")
+    ):
+        for csdl_file in sorted(files, key=SchemaVersion):
+            if csdl_file.endswith(".xml"):
+                schemas.append(csdl_file.replace("_v1.xml", ""))
     hpp_file.write(
         "#pragma once\n"
         "{WARNING}\n"
@@ -362,14 +229,11 @@
         "{{\n"
         "    constexpr std::array<std::string_view,{SIZE}> schemas {{\n".format(
             WARNING=WARNING,
-            SIZE=len(json_schema_files) + len(oem_schema_names),
+            SIZE=len(schemas),
         )
     )
-    for schema_file in json_schema_files:
-        hpp_file.write('        "{}",\n'.format(schema_file))
-
-    for schema_file in oem_schema_names:
-        hpp_file.write('        "{}",\n'.format(schema_file))
+    for schema in schemas:
+        hpp_file.write('        "{}",\n'.format(schema))
 
     hpp_file.write("    };\n}\n")
 
@@ -377,19 +241,3 @@
 
 generate_schema_enums.main()
 generate_top_collections()
-
-# Now delete the xml schema files we aren't supporting
-if os.path.exists(schema_path):
-    files = [
-        os.path.join(schema_path, f)
-        for f in os.listdir(schema_path)
-        if not any([f.startswith(prefix) for prefix in skip_prefixes])
-    ]
-    for filename in files:
-        # filename will include the absolute path
-        filenamesplit = filename.split("/")
-        name = filenamesplit.pop()
-        namesplit = name.split("_")
-        if namesplit[0] not in include_list:
-            print("excluding schema: " + filename)
-            os.remove(filename)
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml
index c0bc62f..044fc6c 100644
--- a/static/redfish/v1/$metadata/index.xml
+++ b/static/redfish/v1/$metadata/index.xml
@@ -2385,6 +2385,20 @@
     <edmx:Reference Uri="/redfish/v1/schema/MetricReportDefinitionCollection_v1.xml">
         <edmx:Include Namespace="MetricReportDefinitionCollection"/>
     </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/OemComputerSystem_v1.xml">
+        <edmx:Include Namespace="OemComputerSystem"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/OemManager_v1.xml">
+        <edmx:Include Namespace="OemManager"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/OemVirtualMedia_v1.xml">
+        <edmx:Include Namespace="OemVirtualMedia"/>
+        <edmx:Include Namespace="OemVirtualMedia.v1_0_0"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/OpenBMCAccountService_v1.xml">
+        <edmx:Include Namespace="OpenBMCAccountService"/>
+        <edmx:Include Namespace="OpenBMCAccountService.v1_0_0"/>
+    </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/OperatingConfig_v1.xml">
         <edmx:Include Namespace="OperatingConfig"/>
         <edmx:Include Namespace="OperatingConfig.v1_0_0"/>
@@ -3937,20 +3951,6 @@
     <edmx:Reference Uri="/redfish/v1/schema/VirtualMediaCollection_v1.xml">
         <edmx:Include Namespace="VirtualMediaCollection"/>
     </edmx:Reference>
-    <edmx:Reference Uri="/redfish/v1/schema/OemManager_v1.xml">
-        <edmx:Include Namespace="OemManager"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="/redfish/v1/schema/OemComputerSystem_v1.xml">
-        <edmx:Include Namespace="OemComputerSystem"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="/redfish/v1/schema/OemVirtualMedia_v1.xml">
-        <edmx:Include Namespace="OemVirtualMedia"/>
-        <edmx:Include Namespace="OemVirtualMedia.v1_0_0"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="/redfish/v1/schema/OpenBMCAccountService_v1.xml">
-        <edmx:Include Namespace="OpenBMCAccountService"/>
-        <edmx:Include Namespace="OpenBMCAccountService.v1_0_0"/>
-    </edmx:Reference>
     <edmx:DataServices>
         <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Service">
             <EntityContainer Name="Service" Extends="ServiceRoot.v1_0_0.ServiceContainer"/>
diff --git a/static/redfish/v1/odata/index.json b/static/redfish/v1/odata/index.json
index f5b73dd..dbde0a8 100644
--- a/static/redfish/v1/odata/index.json
+++ b/static/redfish/v1/odata/index.json
@@ -57,4 +57,4 @@
             "url": "/redfish/v1/UpdateService"
         }
     ]
-}
\ No newline at end of file
+}