diff --git a/redfish-core/schema/dmtf/installed/AccountService_v1.xml b/redfish-core/schema/dmtf/installed/AccountService_v1.xml
index 9849ebc..325f861 120000
--- a/redfish-core/schema/dmtf/installed/AccountService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/AccountService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/AccountService_v1.xml
\ No newline at end of file
+../csdl/AccountService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ActionInfo_v1.xml b/redfish-core/schema/dmtf/installed/ActionInfo_v1.xml
index 5087247..d6f25c7 120000
--- a/redfish-core/schema/dmtf/installed/ActionInfo_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ActionInfo_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ActionInfo_v1.xml
\ No newline at end of file
+../csdl/ActionInfo_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/AggregationService_v1.xml b/redfish-core/schema/dmtf/installed/AggregationService_v1.xml
index 239ddc1..513916c 120000
--- a/redfish-core/schema/dmtf/installed/AggregationService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/AggregationService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/AggregationService_v1.xml
\ No newline at end of file
+../csdl/AggregationService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/AggregationSourceCollection_v1.xml b/redfish-core/schema/dmtf/installed/AggregationSourceCollection_v1.xml
index 8cd3c01..d4162c8 120000
--- a/redfish-core/schema/dmtf/installed/AggregationSourceCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/AggregationSourceCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/AggregationSourceCollection_v1.xml
\ No newline at end of file
+../csdl/AggregationSourceCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/AggregationSource_v1.xml b/redfish-core/schema/dmtf/installed/AggregationSource_v1.xml
index e23b991..a2a7055 120000
--- a/redfish-core/schema/dmtf/installed/AggregationSource_v1.xml
+++ b/redfish-core/schema/dmtf/installed/AggregationSource_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
\ No newline at end of file
+../csdl/AggregationSource_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Assembly_v1.xml b/redfish-core/schema/dmtf/installed/Assembly_v1.xml
index 8f4d70a..fd0bcfc 120000
--- a/redfish-core/schema/dmtf/installed/Assembly_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Assembly_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Assembly_v1.xml
\ No newline at end of file
+../csdl/Assembly_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/AttributeRegistry_v1.xml b/redfish-core/schema/dmtf/installed/AttributeRegistry_v1.xml
index 401dfa9..d8889a0 120000
--- a/redfish-core/schema/dmtf/installed/AttributeRegistry_v1.xml
+++ b/redfish-core/schema/dmtf/installed/AttributeRegistry_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/AttributeRegistry_v1.xml
\ No newline at end of file
+../csdl/AttributeRegistry_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Bios_v1.xml b/redfish-core/schema/dmtf/installed/Bios_v1.xml
index 584c785..fbf44e3 120000
--- a/redfish-core/schema/dmtf/installed/Bios_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Bios_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Bios_v1.xml
\ No newline at end of file
+../csdl/Bios_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/CableCollection_v1.xml b/redfish-core/schema/dmtf/installed/CableCollection_v1.xml
index 2a81943..ff27c48 120000
--- a/redfish-core/schema/dmtf/installed/CableCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/CableCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/CableCollection_v1.xml
\ No newline at end of file
+../csdl/CableCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Cable_v1.xml b/redfish-core/schema/dmtf/installed/Cable_v1.xml
index 6ea3721..9d618c0 120000
--- a/redfish-core/schema/dmtf/installed/Cable_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Cable_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Cable_v1.xml
\ No newline at end of file
+../csdl/Cable_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/CertificateCollection_v1.xml b/redfish-core/schema/dmtf/installed/CertificateCollection_v1.xml
index d85147a..72a6124 120000
--- a/redfish-core/schema/dmtf/installed/CertificateCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/CertificateCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/CertificateCollection_v1.xml
\ No newline at end of file
+../csdl/CertificateCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/CertificateLocations_v1.xml b/redfish-core/schema/dmtf/installed/CertificateLocations_v1.xml
index 0f686db..1c3dd72 120000
--- a/redfish-core/schema/dmtf/installed/CertificateLocations_v1.xml
+++ b/redfish-core/schema/dmtf/installed/CertificateLocations_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/CertificateLocations_v1.xml
\ No newline at end of file
+../csdl/CertificateLocations_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/CertificateService_v1.xml b/redfish-core/schema/dmtf/installed/CertificateService_v1.xml
index 6462ef0..ac93e56 120000
--- a/redfish-core/schema/dmtf/installed/CertificateService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/CertificateService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
\ No newline at end of file
+../csdl/CertificateService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Certificate_v1.xml b/redfish-core/schema/dmtf/installed/Certificate_v1.xml
index d883b3c..7626e14 120000
--- a/redfish-core/schema/dmtf/installed/Certificate_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Certificate_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Certificate_v1.xml
\ No newline at end of file
+../csdl/Certificate_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ChassisCollection_v1.xml b/redfish-core/schema/dmtf/installed/ChassisCollection_v1.xml
index 3521863..c478661 120000
--- a/redfish-core/schema/dmtf/installed/ChassisCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ChassisCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ChassisCollection_v1.xml
\ No newline at end of file
+../csdl/ChassisCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Chassis_v1.xml b/redfish-core/schema/dmtf/installed/Chassis_v1.xml
index 73af087..36090bf 120000
--- a/redfish-core/schema/dmtf/installed/Chassis_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Chassis_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Chassis_v1.xml
\ No newline at end of file
+../csdl/Chassis_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ComponentIntegrityCollection_v1.xml b/redfish-core/schema/dmtf/installed/ComponentIntegrityCollection_v1.xml
index 11af9e5..1d32a36 120000
--- a/redfish-core/schema/dmtf/installed/ComponentIntegrityCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ComponentIntegrityCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ComponentIntegrityCollection_v1.xml
\ No newline at end of file
+../csdl/ComponentIntegrityCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ComponentIntegrity_v1.xml b/redfish-core/schema/dmtf/installed/ComponentIntegrity_v1.xml
index 7817086..25a648f 120000
--- a/redfish-core/schema/dmtf/installed/ComponentIntegrity_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ComponentIntegrity_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ComponentIntegrity_v1.xml
\ No newline at end of file
+../csdl/ComponentIntegrity_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ComputerSystemCollection_v1.xml b/redfish-core/schema/dmtf/installed/ComputerSystemCollection_v1.xml
index 7d88c79..106ee64 120000
--- a/redfish-core/schema/dmtf/installed/ComputerSystemCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ComputerSystemCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ComputerSystemCollection_v1.xml
\ No newline at end of file
+../csdl/ComputerSystemCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ComputerSystem_v1.xml b/redfish-core/schema/dmtf/installed/ComputerSystem_v1.xml
index f65b130..65a3d93 120000
--- a/redfish-core/schema/dmtf/installed/ComputerSystem_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ComputerSystem_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
\ No newline at end of file
+../csdl/ComputerSystem_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/DriveCollection_v1.xml b/redfish-core/schema/dmtf/installed/DriveCollection_v1.xml
index 6bd9d4e..acb44cb 120000
--- a/redfish-core/schema/dmtf/installed/DriveCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/DriveCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/DriveCollection_v1.xml
\ No newline at end of file
+../csdl/DriveCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Drive_v1.xml b/redfish-core/schema/dmtf/installed/Drive_v1.xml
index 8148bec..fdaeb41 120000
--- a/redfish-core/schema/dmtf/installed/Drive_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Drive_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Drive_v1.xml
\ No newline at end of file
+../csdl/Drive_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/EnvironmentMetrics_v1.xml b/redfish-core/schema/dmtf/installed/EnvironmentMetrics_v1.xml
index a4c82df..5386b33 120000
--- a/redfish-core/schema/dmtf/installed/EnvironmentMetrics_v1.xml
+++ b/redfish-core/schema/dmtf/installed/EnvironmentMetrics_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/EnvironmentMetrics_v1.xml
\ No newline at end of file
+../csdl/EnvironmentMetrics_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/EthernetInterfaceCollection_v1.xml b/redfish-core/schema/dmtf/installed/EthernetInterfaceCollection_v1.xml
index 7f03e68..ed7f32f 120000
--- a/redfish-core/schema/dmtf/installed/EthernetInterfaceCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/EthernetInterfaceCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/EthernetInterfaceCollection_v1.xml
\ No newline at end of file
+../csdl/EthernetInterfaceCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/EthernetInterface_v1.xml b/redfish-core/schema/dmtf/installed/EthernetInterface_v1.xml
index ce6e53e..f7aadd3 120000
--- a/redfish-core/schema/dmtf/installed/EthernetInterface_v1.xml
+++ b/redfish-core/schema/dmtf/installed/EthernetInterface_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/EthernetInterface_v1.xml
\ No newline at end of file
+../csdl/EthernetInterface_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/EventDestinationCollection_v1.xml b/redfish-core/schema/dmtf/installed/EventDestinationCollection_v1.xml
index 455dcd8..ed8976a 120000
--- a/redfish-core/schema/dmtf/installed/EventDestinationCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/EventDestinationCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/EventDestinationCollection_v1.xml
\ No newline at end of file
+../csdl/EventDestinationCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/EventDestination_v1.xml b/redfish-core/schema/dmtf/installed/EventDestination_v1.xml
index 6a6857e..7f39986 120000
--- a/redfish-core/schema/dmtf/installed/EventDestination_v1.xml
+++ b/redfish-core/schema/dmtf/installed/EventDestination_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/EventDestination_v1.xml
\ No newline at end of file
+../csdl/EventDestination_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/EventService_v1.xml b/redfish-core/schema/dmtf/installed/EventService_v1.xml
index d4e1f3a..7c3d719 120000
--- a/redfish-core/schema/dmtf/installed/EventService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/EventService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/EventService_v1.xml
\ No newline at end of file
+../csdl/EventService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Event_v1.xml b/redfish-core/schema/dmtf/installed/Event_v1.xml
index 735dd9b..87facf6 120000
--- a/redfish-core/schema/dmtf/installed/Event_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Event_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Event_v1.xml
\ No newline at end of file
+../csdl/Event_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/FabricAdapterCollection_v1.xml b/redfish-core/schema/dmtf/installed/FabricAdapterCollection_v1.xml
index 0b90e15..9bad3dc 120000
--- a/redfish-core/schema/dmtf/installed/FabricAdapterCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/FabricAdapterCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/FabricAdapterCollection_v1.xml
\ No newline at end of file
+../csdl/FabricAdapterCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/FabricAdapter_v1.xml b/redfish-core/schema/dmtf/installed/FabricAdapter_v1.xml
index 7369fcb..36bbf74 120000
--- a/redfish-core/schema/dmtf/installed/FabricAdapter_v1.xml
+++ b/redfish-core/schema/dmtf/installed/FabricAdapter_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/FabricAdapter_v1.xml
\ No newline at end of file
+../csdl/FabricAdapter_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/FanCollection_v1.xml b/redfish-core/schema/dmtf/installed/FanCollection_v1.xml
index 37e4262..3d268c7 120000
--- a/redfish-core/schema/dmtf/installed/FanCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/FanCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/FanCollection_v1.xml
\ No newline at end of file
+../csdl/FanCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Fan_v1.xml b/redfish-core/schema/dmtf/installed/Fan_v1.xml
index 6ebfe2b..275415b 120000
--- a/redfish-core/schema/dmtf/installed/Fan_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Fan_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Fan_v1.xml
\ No newline at end of file
+../csdl/Fan_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/IPAddresses_v1.xml b/redfish-core/schema/dmtf/installed/IPAddresses_v1.xml
index a6e00e1..d481341 120000
--- a/redfish-core/schema/dmtf/installed/IPAddresses_v1.xml
+++ b/redfish-core/schema/dmtf/installed/IPAddresses_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/IPAddresses_v1.xml
\ No newline at end of file
+../csdl/IPAddresses_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/JsonSchemaFileCollection_v1.xml b/redfish-core/schema/dmtf/installed/JsonSchemaFileCollection_v1.xml
index e413801..1e24b43 120000
--- a/redfish-core/schema/dmtf/installed/JsonSchemaFileCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/JsonSchemaFileCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/JsonSchemaFileCollection_v1.xml
\ No newline at end of file
+../csdl/JsonSchemaFileCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/JsonSchemaFile_v1.xml b/redfish-core/schema/dmtf/installed/JsonSchemaFile_v1.xml
index da937f5..8c0972e 120000
--- a/redfish-core/schema/dmtf/installed/JsonSchemaFile_v1.xml
+++ b/redfish-core/schema/dmtf/installed/JsonSchemaFile_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/JsonSchemaFile_v1.xml
\ No newline at end of file
+../csdl/JsonSchemaFile_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/LogEntryCollection_v1.xml b/redfish-core/schema/dmtf/installed/LogEntryCollection_v1.xml
index 58cc333..94d9a5c 120000
--- a/redfish-core/schema/dmtf/installed/LogEntryCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/LogEntryCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/LogEntryCollection_v1.xml
\ No newline at end of file
+../csdl/LogEntryCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/LogEntry_v1.xml b/redfish-core/schema/dmtf/installed/LogEntry_v1.xml
index c8975d9..68af7f6 120000
--- a/redfish-core/schema/dmtf/installed/LogEntry_v1.xml
+++ b/redfish-core/schema/dmtf/installed/LogEntry_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
\ No newline at end of file
+../csdl/LogEntry_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/LogServiceCollection_v1.xml b/redfish-core/schema/dmtf/installed/LogServiceCollection_v1.xml
index 26acc18..d13bf5d 120000
--- a/redfish-core/schema/dmtf/installed/LogServiceCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/LogServiceCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/LogServiceCollection_v1.xml
\ No newline at end of file
+../csdl/LogServiceCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/LogService_v1.xml b/redfish-core/schema/dmtf/installed/LogService_v1.xml
index 6f198f9..21fd883 120000
--- a/redfish-core/schema/dmtf/installed/LogService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/LogService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/LogService_v1.xml
\ No newline at end of file
+../csdl/LogService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ManagerAccountCollection_v1.xml b/redfish-core/schema/dmtf/installed/ManagerAccountCollection_v1.xml
index b2a92d8..8593ab8 120000
--- a/redfish-core/schema/dmtf/installed/ManagerAccountCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ManagerAccountCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ManagerAccountCollection_v1.xml
\ No newline at end of file
+../csdl/ManagerAccountCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ManagerAccount_v1.xml b/redfish-core/schema/dmtf/installed/ManagerAccount_v1.xml
index bcc93ba..ddb7997 120000
--- a/redfish-core/schema/dmtf/installed/ManagerAccount_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ManagerAccount_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
\ No newline at end of file
+../csdl/ManagerAccount_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ManagerCollection_v1.xml b/redfish-core/schema/dmtf/installed/ManagerCollection_v1.xml
index 4dc7bad..f600d2d 120000
--- a/redfish-core/schema/dmtf/installed/ManagerCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ManagerCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ManagerCollection_v1.xml
\ No newline at end of file
+../csdl/ManagerCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ManagerDiagnosticData_v1.xml b/redfish-core/schema/dmtf/installed/ManagerDiagnosticData_v1.xml
index c4c1bd5..c72d8f9 120000
--- a/redfish-core/schema/dmtf/installed/ManagerDiagnosticData_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ManagerDiagnosticData_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ManagerDiagnosticData_v1.xml
\ No newline at end of file
+../csdl/ManagerDiagnosticData_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ManagerNetworkProtocol_v1.xml b/redfish-core/schema/dmtf/installed/ManagerNetworkProtocol_v1.xml
index e52500a..8e7f185 120000
--- a/redfish-core/schema/dmtf/installed/ManagerNetworkProtocol_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ManagerNetworkProtocol_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ManagerNetworkProtocol_v1.xml
\ No newline at end of file
+../csdl/ManagerNetworkProtocol_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Manager_v1.xml b/redfish-core/schema/dmtf/installed/Manager_v1.xml
index 0cf2141..3dc34bd 120000
--- a/redfish-core/schema/dmtf/installed/Manager_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Manager_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Manager_v1.xml
\ No newline at end of file
+../csdl/Manager_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MemoryCollection_v1.xml b/redfish-core/schema/dmtf/installed/MemoryCollection_v1.xml
index 2f60544..451bf20 120000
--- a/redfish-core/schema/dmtf/installed/MemoryCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MemoryCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MemoryCollection_v1.xml
\ No newline at end of file
+../csdl/MemoryCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Memory_v1.xml b/redfish-core/schema/dmtf/installed/Memory_v1.xml
index ec2e238..367ab86 120000
--- a/redfish-core/schema/dmtf/installed/Memory_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Memory_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Memory_v1.xml
\ No newline at end of file
+../csdl/Memory_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MessageRegistryCollection_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistryCollection_v1.xml
index c3b4743..f72667d 120000
--- a/redfish-core/schema/dmtf/installed/MessageRegistryCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MessageRegistryCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MessageRegistryCollection_v1.xml
\ No newline at end of file
+../csdl/MessageRegistryCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MessageRegistryFileCollection_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistryFileCollection_v1.xml
index bc584a3..1993d2a 120000
--- a/redfish-core/schema/dmtf/installed/MessageRegistryFileCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MessageRegistryFileCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MessageRegistryFileCollection_v1.xml
\ No newline at end of file
+../csdl/MessageRegistryFileCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MessageRegistryFile_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistryFile_v1.xml
index d50967d..6c3a651 120000
--- a/redfish-core/schema/dmtf/installed/MessageRegistryFile_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MessageRegistryFile_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MessageRegistryFile_v1.xml
\ No newline at end of file
+../csdl/MessageRegistryFile_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MessageRegistry_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistry_v1.xml
index 2da80ea..dfdf95d 120000
--- a/redfish-core/schema/dmtf/installed/MessageRegistry_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MessageRegistry_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MessageRegistry_v1.xml
\ No newline at end of file
+../csdl/MessageRegistry_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Message_v1.xml b/redfish-core/schema/dmtf/installed/Message_v1.xml
index c0e6905..ef39adb 120000
--- a/redfish-core/schema/dmtf/installed/Message_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Message_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Message_v1.xml
\ No newline at end of file
+../csdl/Message_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MetricDefinitionCollection_v1.xml b/redfish-core/schema/dmtf/installed/MetricDefinitionCollection_v1.xml
index ae8b265..fd8e453 120000
--- a/redfish-core/schema/dmtf/installed/MetricDefinitionCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MetricDefinitionCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MetricDefinitionCollection_v1.xml
\ No newline at end of file
+../csdl/MetricDefinitionCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MetricDefinition_v1.xml b/redfish-core/schema/dmtf/installed/MetricDefinition_v1.xml
index 7afb0d4..c2f71b9 120000
--- a/redfish-core/schema/dmtf/installed/MetricDefinition_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MetricDefinition_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MetricDefinition_v1.xml
\ No newline at end of file
+../csdl/MetricDefinition_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MetricReportCollection_v1.xml b/redfish-core/schema/dmtf/installed/MetricReportCollection_v1.xml
index f185252..c5938b8 120000
--- a/redfish-core/schema/dmtf/installed/MetricReportCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MetricReportCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MetricReportCollection_v1.xml
\ No newline at end of file
+../csdl/MetricReportCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MetricReportDefinitionCollection_v1.xml b/redfish-core/schema/dmtf/installed/MetricReportDefinitionCollection_v1.xml
index 08fd092..f28f9e8 120000
--- a/redfish-core/schema/dmtf/installed/MetricReportDefinitionCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MetricReportDefinitionCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MetricReportDefinitionCollection_v1.xml
\ No newline at end of file
+../csdl/MetricReportDefinitionCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MetricReportDefinition_v1.xml b/redfish-core/schema/dmtf/installed/MetricReportDefinition_v1.xml
index 9edff1f..8c04715 120000
--- a/redfish-core/schema/dmtf/installed/MetricReportDefinition_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MetricReportDefinition_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MetricReportDefinition_v1.xml
\ No newline at end of file
+../csdl/MetricReportDefinition_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/MetricReport_v1.xml b/redfish-core/schema/dmtf/installed/MetricReport_v1.xml
index 2468470..3438122 120000
--- a/redfish-core/schema/dmtf/installed/MetricReport_v1.xml
+++ b/redfish-core/schema/dmtf/installed/MetricReport_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/MetricReport_v1.xml
\ No newline at end of file
+../csdl/MetricReport_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/OperatingConfigCollection_v1.xml b/redfish-core/schema/dmtf/installed/OperatingConfigCollection_v1.xml
index ecf294f..c078320 120000
--- a/redfish-core/schema/dmtf/installed/OperatingConfigCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/OperatingConfigCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/OperatingConfigCollection_v1.xml
\ No newline at end of file
+../csdl/OperatingConfigCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/OperatingConfig_v1.xml b/redfish-core/schema/dmtf/installed/OperatingConfig_v1.xml
index 4436e16..2a968ca 120000
--- a/redfish-core/schema/dmtf/installed/OperatingConfig_v1.xml
+++ b/redfish-core/schema/dmtf/installed/OperatingConfig_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/OperatingConfig_v1.xml
\ No newline at end of file
+../csdl/OperatingConfig_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PCIeDeviceCollection_v1.xml b/redfish-core/schema/dmtf/installed/PCIeDeviceCollection_v1.xml
index a396f8d..c708b3a 120000
--- a/redfish-core/schema/dmtf/installed/PCIeDeviceCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PCIeDeviceCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PCIeDeviceCollection_v1.xml
\ No newline at end of file
+../csdl/PCIeDeviceCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PCIeDevice_v1.xml b/redfish-core/schema/dmtf/installed/PCIeDevice_v1.xml
index 63138e7..762d77d 120000
--- a/redfish-core/schema/dmtf/installed/PCIeDevice_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PCIeDevice_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
\ No newline at end of file
+../csdl/PCIeDevice_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PCIeFunctionCollection_v1.xml b/redfish-core/schema/dmtf/installed/PCIeFunctionCollection_v1.xml
index f0f3867..493a675 120000
--- a/redfish-core/schema/dmtf/installed/PCIeFunctionCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PCIeFunctionCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PCIeFunctionCollection_v1.xml
\ No newline at end of file
+../csdl/PCIeFunctionCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PCIeFunction_v1.xml b/redfish-core/schema/dmtf/installed/PCIeFunction_v1.xml
index ac95c17..b742805 120000
--- a/redfish-core/schema/dmtf/installed/PCIeFunction_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PCIeFunction_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PCIeFunction_v1.xml
\ No newline at end of file
+../csdl/PCIeFunction_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PCIeSlots_v1.xml b/redfish-core/schema/dmtf/installed/PCIeSlots_v1.xml
index a54245d..ca16952 120000
--- a/redfish-core/schema/dmtf/installed/PCIeSlots_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PCIeSlots_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PCIeSlots_v1.xml
\ No newline at end of file
+../csdl/PCIeSlots_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PhysicalContext_v1.xml b/redfish-core/schema/dmtf/installed/PhysicalContext_v1.xml
index 9ba0aa4..6d2b7b2 120000
--- a/redfish-core/schema/dmtf/installed/PhysicalContext_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PhysicalContext_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
\ No newline at end of file
+../csdl/PhysicalContext_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PortCollection_v1.xml b/redfish-core/schema/dmtf/installed/PortCollection_v1.xml
index db505e1..b87fe34 120000
--- a/redfish-core/schema/dmtf/installed/PortCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PortCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PortCollection_v1.xml
\ No newline at end of file
+../csdl/PortCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Port_v1.xml b/redfish-core/schema/dmtf/installed/Port_v1.xml
index 682c035..8c90402 120000
--- a/redfish-core/schema/dmtf/installed/Port_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Port_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Port_v1.xml
\ No newline at end of file
+../csdl/Port_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PowerSubsystem_v1.xml b/redfish-core/schema/dmtf/installed/PowerSubsystem_v1.xml
index a9f85f7..47238af 120000
--- a/redfish-core/schema/dmtf/installed/PowerSubsystem_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PowerSubsystem_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PowerSubsystem_v1.xml
\ No newline at end of file
+../csdl/PowerSubsystem_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PowerSupplyCollection_v1.xml b/redfish-core/schema/dmtf/installed/PowerSupplyCollection_v1.xml
index 7a0bd98..375c0b7 120000
--- a/redfish-core/schema/dmtf/installed/PowerSupplyCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PowerSupplyCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PowerSupplyCollection_v1.xml
\ No newline at end of file
+../csdl/PowerSupplyCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/PowerSupply_v1.xml b/redfish-core/schema/dmtf/installed/PowerSupply_v1.xml
index e3fa05f..48b15fb 120000
--- a/redfish-core/schema/dmtf/installed/PowerSupply_v1.xml
+++ b/redfish-core/schema/dmtf/installed/PowerSupply_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/PowerSupply_v1.xml
\ No newline at end of file
+../csdl/PowerSupply_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Power_v1.xml b/redfish-core/schema/dmtf/installed/Power_v1.xml
index d42d5b9..2099d43 120000
--- a/redfish-core/schema/dmtf/installed/Power_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Power_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Power_v1.xml
\ No newline at end of file
+../csdl/Power_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Privileges_v1.xml b/redfish-core/schema/dmtf/installed/Privileges_v1.xml
index 58ed098..b9bf8de 120000
--- a/redfish-core/schema/dmtf/installed/Privileges_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Privileges_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Privileges_v1.xml
\ No newline at end of file
+../csdl/Privileges_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ProcessorCollection_v1.xml b/redfish-core/schema/dmtf/installed/ProcessorCollection_v1.xml
index 076c193..a6c054d 120000
--- a/redfish-core/schema/dmtf/installed/ProcessorCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ProcessorCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ProcessorCollection_v1.xml
\ No newline at end of file
+../csdl/ProcessorCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Processor_v1.xml b/redfish-core/schema/dmtf/installed/Processor_v1.xml
index 847e837..9d6882a 120000
--- a/redfish-core/schema/dmtf/installed/Processor_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Processor_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Processor_v1.xml
\ No newline at end of file
+../csdl/Processor_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Protocol_v1.xml b/redfish-core/schema/dmtf/installed/Protocol_v1.xml
index 4f2dabd..85575fa 120000
--- a/redfish-core/schema/dmtf/installed/Protocol_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Protocol_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Protocol_v1.xml
\ No newline at end of file
+../csdl/Protocol_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/RedfishError_v1.xml b/redfish-core/schema/dmtf/installed/RedfishError_v1.xml
index b86dbf8..80b7329 120000
--- a/redfish-core/schema/dmtf/installed/RedfishError_v1.xml
+++ b/redfish-core/schema/dmtf/installed/RedfishError_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/RedfishError_v1.xml
\ No newline at end of file
+../csdl/RedfishError_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/RedfishExtensions_v1.xml b/redfish-core/schema/dmtf/installed/RedfishExtensions_v1.xml
index 02915ac..507a69f 120000
--- a/redfish-core/schema/dmtf/installed/RedfishExtensions_v1.xml
+++ b/redfish-core/schema/dmtf/installed/RedfishExtensions_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/RedfishExtensions_v1.xml
\ No newline at end of file
+../csdl/RedfishExtensions_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Redundancy_v1.xml b/redfish-core/schema/dmtf/installed/Redundancy_v1.xml
index 791d9e3..c3733af 120000
--- a/redfish-core/schema/dmtf/installed/Redundancy_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Redundancy_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Redundancy_v1.xml
\ No newline at end of file
+../csdl/Redundancy_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Resource_v1.xml b/redfish-core/schema/dmtf/installed/Resource_v1.xml
index 6a084de..2ed9bc1 120000
--- a/redfish-core/schema/dmtf/installed/Resource_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Resource_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Resource_v1.xml
\ No newline at end of file
+../csdl/Resource_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/RoleCollection_v1.xml b/redfish-core/schema/dmtf/installed/RoleCollection_v1.xml
index a549edd..251323c 120000
--- a/redfish-core/schema/dmtf/installed/RoleCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/RoleCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/RoleCollection_v1.xml
\ No newline at end of file
+../csdl/RoleCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Role_v1.xml b/redfish-core/schema/dmtf/installed/Role_v1.xml
index a3c1af1..8bd6daf 120000
--- a/redfish-core/schema/dmtf/installed/Role_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Role_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Role_v1.xml
\ No newline at end of file
+../csdl/Role_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/SensorCollection_v1.xml b/redfish-core/schema/dmtf/installed/SensorCollection_v1.xml
index a91309f..a341c22 120000
--- a/redfish-core/schema/dmtf/installed/SensorCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/SensorCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/SensorCollection_v1.xml
\ No newline at end of file
+../csdl/SensorCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Sensor_v1.xml b/redfish-core/schema/dmtf/installed/Sensor_v1.xml
index 1bca82b..67f8863 120000
--- a/redfish-core/schema/dmtf/installed/Sensor_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Sensor_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Sensor_v1.xml
\ No newline at end of file
+../csdl/Sensor_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ServiceRoot_v1.xml b/redfish-core/schema/dmtf/installed/ServiceRoot_v1.xml
index 8b83002..b741aeb 120000
--- a/redfish-core/schema/dmtf/installed/ServiceRoot_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ServiceRoot_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ServiceRoot_v1.xml
\ No newline at end of file
+../csdl/ServiceRoot_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/SessionCollection_v1.xml b/redfish-core/schema/dmtf/installed/SessionCollection_v1.xml
index 5a5583e..3f939da 120000
--- a/redfish-core/schema/dmtf/installed/SessionCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/SessionCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/SessionCollection_v1.xml
\ No newline at end of file
+../csdl/SessionCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/SessionService_v1.xml b/redfish-core/schema/dmtf/installed/SessionService_v1.xml
index 12de5b2..7c4469d 120000
--- a/redfish-core/schema/dmtf/installed/SessionService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/SessionService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/SessionService_v1.xml
\ No newline at end of file
+../csdl/SessionService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Session_v1.xml b/redfish-core/schema/dmtf/installed/Session_v1.xml
index 7978348..4831a45 120000
--- a/redfish-core/schema/dmtf/installed/Session_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Session_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Session_v1.xml
\ No newline at end of file
+../csdl/Session_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Settings_v1.xml b/redfish-core/schema/dmtf/installed/Settings_v1.xml
index ce8c8c9..1ef4069 120000
--- a/redfish-core/schema/dmtf/installed/Settings_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Settings_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Settings_v1.xml
\ No newline at end of file
+../csdl/Settings_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/SoftwareInventoryCollection_v1.xml b/redfish-core/schema/dmtf/installed/SoftwareInventoryCollection_v1.xml
index 0fa1312..b83e09b 120000
--- a/redfish-core/schema/dmtf/installed/SoftwareInventoryCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/SoftwareInventoryCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/SoftwareInventoryCollection_v1.xml
\ No newline at end of file
+../csdl/SoftwareInventoryCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/SoftwareInventory_v1.xml b/redfish-core/schema/dmtf/installed/SoftwareInventory_v1.xml
index 0b6c50d..3bfbf11 120000
--- a/redfish-core/schema/dmtf/installed/SoftwareInventory_v1.xml
+++ b/redfish-core/schema/dmtf/installed/SoftwareInventory_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/SoftwareInventory_v1.xml
\ No newline at end of file
+../csdl/SoftwareInventory_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/StorageCollection_v1.xml b/redfish-core/schema/dmtf/installed/StorageCollection_v1.xml
index 0a745fd..4c266ef 120000
--- a/redfish-core/schema/dmtf/installed/StorageCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/StorageCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/StorageCollection_v1.xml
\ No newline at end of file
+../csdl/StorageCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/StorageControllerCollection_v1.xml b/redfish-core/schema/dmtf/installed/StorageControllerCollection_v1.xml
index 74c6836..4a2a874 120000
--- a/redfish-core/schema/dmtf/installed/StorageControllerCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/StorageControllerCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/StorageControllerCollection_v1.xml
\ No newline at end of file
+../csdl/StorageControllerCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/StorageController_v1.xml b/redfish-core/schema/dmtf/installed/StorageController_v1.xml
index 867e0ad..919a0bf 120000
--- a/redfish-core/schema/dmtf/installed/StorageController_v1.xml
+++ b/redfish-core/schema/dmtf/installed/StorageController_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/StorageController_v1.xml
\ No newline at end of file
+../csdl/StorageController_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Storage_v1.xml b/redfish-core/schema/dmtf/installed/Storage_v1.xml
index 0413b80..f7629f8 120000
--- a/redfish-core/schema/dmtf/installed/Storage_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Storage_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Storage_v1.xml
\ No newline at end of file
+../csdl/Storage_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/TaskCollection_v1.xml b/redfish-core/schema/dmtf/installed/TaskCollection_v1.xml
index 3fd7faa..0b6dcde 120000
--- a/redfish-core/schema/dmtf/installed/TaskCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/TaskCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/TaskCollection_v1.xml
\ No newline at end of file
+../csdl/TaskCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/TaskService_v1.xml b/redfish-core/schema/dmtf/installed/TaskService_v1.xml
index 5bc8121..4cec850 120000
--- a/redfish-core/schema/dmtf/installed/TaskService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/TaskService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/TaskService_v1.xml
\ No newline at end of file
+../csdl/TaskService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Task_v1.xml b/redfish-core/schema/dmtf/installed/Task_v1.xml
index f0e3a8f..718c572 120000
--- a/redfish-core/schema/dmtf/installed/Task_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Task_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Task_v1.xml
\ No newline at end of file
+../csdl/Task_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/TelemetryService_v1.xml b/redfish-core/schema/dmtf/installed/TelemetryService_v1.xml
index 72e2fc8..b15a323 120000
--- a/redfish-core/schema/dmtf/installed/TelemetryService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/TelemetryService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/TelemetryService_v1.xml
\ No newline at end of file
+../csdl/TelemetryService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ThermalMetrics_v1.xml b/redfish-core/schema/dmtf/installed/ThermalMetrics_v1.xml
index 80e17b9..8e032d8 120000
--- a/redfish-core/schema/dmtf/installed/ThermalMetrics_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ThermalMetrics_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ThermalMetrics_v1.xml
\ No newline at end of file
+../csdl/ThermalMetrics_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/ThermalSubsystem_v1.xml b/redfish-core/schema/dmtf/installed/ThermalSubsystem_v1.xml
index e5c54bc..2ff6473 120000
--- a/redfish-core/schema/dmtf/installed/ThermalSubsystem_v1.xml
+++ b/redfish-core/schema/dmtf/installed/ThermalSubsystem_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
\ No newline at end of file
+../csdl/ThermalSubsystem_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Thermal_v1.xml b/redfish-core/schema/dmtf/installed/Thermal_v1.xml
index 3da8640..7d325f4 120000
--- a/redfish-core/schema/dmtf/installed/Thermal_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Thermal_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Thermal_v1.xml
\ No newline at end of file
+../csdl/Thermal_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/TriggersCollection_v1.xml b/redfish-core/schema/dmtf/installed/TriggersCollection_v1.xml
index 4a870f8..e3ee310 120000
--- a/redfish-core/schema/dmtf/installed/TriggersCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/TriggersCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/TriggersCollection_v1.xml
\ No newline at end of file
+../csdl/TriggersCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/Triggers_v1.xml b/redfish-core/schema/dmtf/installed/Triggers_v1.xml
index af50645..20f6d11 120000
--- a/redfish-core/schema/dmtf/installed/Triggers_v1.xml
+++ b/redfish-core/schema/dmtf/installed/Triggers_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/Triggers_v1.xml
\ No newline at end of file
+../csdl/Triggers_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/UpdateService_v1.xml b/redfish-core/schema/dmtf/installed/UpdateService_v1.xml
index 73f4bde..1b5d333 120000
--- a/redfish-core/schema/dmtf/installed/UpdateService_v1.xml
+++ b/redfish-core/schema/dmtf/installed/UpdateService_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
\ No newline at end of file
+../csdl/UpdateService_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/VirtualMediaCollection_v1.xml b/redfish-core/schema/dmtf/installed/VirtualMediaCollection_v1.xml
index e06b837..4ab683c 120000
--- a/redfish-core/schema/dmtf/installed/VirtualMediaCollection_v1.xml
+++ b/redfish-core/schema/dmtf/installed/VirtualMediaCollection_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/VirtualMediaCollection_v1.xml
\ No newline at end of file
+../csdl/VirtualMediaCollection_v1.xml
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/installed/VirtualMedia_v1.xml b/redfish-core/schema/dmtf/installed/VirtualMedia_v1.xml
index 6fe497a..a74bfb3 120000
--- a/redfish-core/schema/dmtf/installed/VirtualMedia_v1.xml
+++ b/redfish-core/schema/dmtf/installed/VirtualMedia_v1.xml
@@ -1 +1 @@
-../../../../redfish-core/schema/dmtf/csdl/VirtualMedia_v1.xml
\ No newline at end of file
+../csdl/VirtualMedia_v1.xml
\ No newline at end of file
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 85eb23c..20dfefa 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -33,6 +33,10 @@
     redfish_core_path, "schema", "dmtf", "json-schema"
 )
 
+# installed csdl/json symlinks
+schema_installed_path = os.path.join(schema_path, "..", "installed")
+json_schema_installed_path = json_schema_path + "-installed"
+
 zipBytesIO = BytesIO(r.content)
 zip_ref = zipfile.ZipFile(zipBytesIO)
 
@@ -95,13 +99,37 @@
     sorted(json_schema_files.items(), key=lambda x: SchemaVersion(x[0]))
 )
 
+# Get the currently-installed csdl
+csdl_installed_symlinks = set()
+for csdl_symlink in os.listdir(schema_installed_path):
+    csdl_installed_symlinks.add(csdl_symlink)
 
+shutil.rmtree(schema_installed_path)
+os.makedirs(schema_installed_path)
+
+# Create csdl files & keep the updated csdl-installed symlinks
 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(VERSION + "/csdl", csdl_file))
         content = content.replace(b"\r\n", b"\n")
         schema_out.write(content)
 
+    if csdl_file in csdl_installed_symlinks:
+        os.symlink(
+            os.path.join("..", "csdl", csdl_file),
+            os.path.join(schema_installed_path, csdl_file),
+        )
+
+# Get the currently-installed json symlinks
+json_base_symlinks = defaultdict(list)
+for json_symlink in os.listdir(json_schema_installed_path):
+    base_json_name = json_symlink.split(".")[0]
+    json_base_symlinks[base_json_name].append(json_symlink)
+
+shutil.rmtree(json_schema_installed_path)
+os.makedirs(json_schema_installed_path)
+
+# Create json files & keep the installed json symlinks
 for schema_filename, versions in json_schema_files.items():
     zip_filepath = os.path.join(VERSION + "/json-schema", versions[0])
 
@@ -112,6 +140,12 @@
         content = content.replace(b"\r\n", b"\n")
         schema_file.write(content)
 
+    if schema_filename in json_base_symlinks:
+        os.symlink(
+            os.path.join("..", "json-schema", versions[0]),
+            os.path.join(json_schema_installed_path, versions[0]),
+        )
+
 zip_ref.close()
 
 generate_schema_enums.main()