diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..19e9c4d
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+redfish-core/schema/dmtf
diff --git a/meson.build b/meson.build
index 63fed9e..da0036a 100644
--- a/meson.build
+++ b/meson.build
@@ -318,10 +318,10 @@
     section: 'Directories',
 )
 
-install_subdir('static', install_dir: 'share/www', strip_directory: true, follow_symlinks: true)
+subdir('static')
+subdir('redfish-core')
 
 # Config subdirectory
-
 subdir('config')
 bmcweb_dependencies += conf_h_dep
 
diff --git a/redfish-core/lib/redfish_v1.hpp b/redfish-core/lib/redfish_v1.hpp
index bbda45b..41bcafe 100644
--- a/redfish-core/lib/redfish_v1.hpp
+++ b/redfish-core/lib/redfish_v1.hpp
@@ -6,7 +6,6 @@
 #include "http_response.hpp"
 #include "query.hpp"
 #include "registries/privilege_registry.hpp"
-#include "schemas.hpp"
 #include "utility.hpp"
 
 #include <boost/url/format.hpp>
@@ -86,15 +85,32 @@
     json["Name"] = "JsonSchemaFile Collection";
     json["Description"] = "Collection of JsonSchemaFiles";
     nlohmann::json::array_t members;
-    for (std::string_view schema : schemas)
+
+    std::error_code ec;
+    std::filesystem::directory_iterator dirList(
+        "/usr/share/www/redfish/v1/JsonSchemas", ec);
+    if (ec)
     {
+        messages::internalError(asyncResp->res);
+        return;
+    }
+    for (const std::filesystem::path& file : dirList)
+    {
+        std::string filename = file.filename();
+        std::vector<std::string> split;
+        bmcweb::split(split, filename, '.');
+        if (split.empty())
+        {
+            continue;
+        }
         nlohmann::json::object_t member;
         member["@odata.id"] = boost::urls::format("/redfish/v1/JsonSchemas/{}",
-                                                  schema);
+                                                  split[0]);
         members.emplace_back(std::move(member));
     }
+
+    json["Members@odata.count"] = members.size();
     json["Members"] = std::move(members);
-    json["Members@odata.count"] = schemas.size();
 }
 
 inline void jsonSchemaGet(App& app, const crow::Request& req,
@@ -106,40 +122,97 @@
         return;
     }
 
-    if (std::ranges::find(schemas, schema) == schemas.end())
+    std::error_code ec;
+    std::filesystem::directory_iterator dirList(
+        "/usr/share/www/redfish/v1/JsonSchemas", ec);
+    if (ec)
+    {
+        messages::resourceNotFound(asyncResp->res, "JsonSchemaFile", schema);
+        return;
+    }
+    for (const std::filesystem::path& file : dirList)
+    {
+        std::string filename = file.filename();
+        std::vector<std::string> split;
+        bmcweb::split(split, filename, '.');
+        if (split.empty())
+        {
+            continue;
+        }
+        BMCWEB_LOG_DEBUG("Checking {}", split[0]);
+        if (split[0] != schema)
+        {
+            continue;
+        }
+
+        nlohmann::json& json = asyncResp->res.jsonValue;
+        json["@odata.id"] = boost::urls::format("/redfish/v1/JsonSchemas/{}",
+                                                schema);
+        json["@odata.type"] = "#JsonSchemaFile.v1_0_2.JsonSchemaFile";
+        json["Name"] = schema + " Schema File";
+        json["Description"] = schema + " Schema File Location";
+        json["Id"] = schema;
+        std::string schemaName = std::format("#{}.{}", schema, schema);
+        json["Schema"] = std::move(schemaName);
+        constexpr std::array<std::string_view, 1> languages{"en"};
+        json["Languages"] = languages;
+        json["Languages@odata.count"] = languages.size();
+
+        nlohmann::json::array_t locationArray;
+        nlohmann::json::object_t locationEntry;
+        locationEntry["Language"] = "en";
+
+        locationEntry["PublicationUri"] = boost::urls::format(
+            "http://redfish.dmtf.org/schemas/v1/{}", filename);
+        locationEntry["Uri"] = boost::urls::format(
+            "/redfish/v1/JsonSchemas/{}/{}", schema, filename);
+
+        locationArray.emplace_back(locationEntry);
+
+        json["Location"] = std::move(locationArray);
+        json["Location@odata.count"] = 1;
+        return;
+    }
+    messages::resourceNotFound(asyncResp->res, "JsonSchemaFile", schema);
+}
+
+inline void
+    jsonSchemaGetFile(const crow::Request& /*req*/,
+                      const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
+                      const std::string& schema, const std::string& schemaFile)
+{
+    // Sanity check the filename
+    if (schemaFile.find_first_not_of(
+            "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-.") !=
+        std::string::npos)
+    {
+        messages::resourceNotFound(asyncResp->res, "JsonSchemaFile", schema);
+        return;
+    }
+    // Schema path should look like /redfish/v1/JsonSchemas/Foo/Foo.x.json
+    // Make sure the two paths match.
+    if (!schemaFile.starts_with(schema))
+    {
+        messages::resourceNotFound(asyncResp->res, "JsonSchemaFile", schema);
+        return;
+    }
+    std::filesystem::path filepath("/usr/share/www/redfish/v1/JsonSchemas");
+    filepath /= schemaFile;
+    if (filepath.is_relative())
     {
         messages::resourceNotFound(asyncResp->res, "JsonSchemaFile", schema);
         return;
     }
 
-    nlohmann::json& json = asyncResp->res.jsonValue;
-    json["@odata.id"] = boost::urls::format("/redfish/v1/JsonSchemas/{}",
-                                            schema);
-    json["@odata.type"] = "#JsonSchemaFile.v1_0_2.JsonSchemaFile";
-    json["Name"] = schema + " Schema File";
-    json["Description"] = schema + " Schema File Location";
-    json["Id"] = schema;
-    std::string schemaName = "#";
-    schemaName += schema;
-    schemaName += ".";
-    schemaName += schema;
-    json["Schema"] = std::move(schemaName);
-    constexpr std::array<std::string_view, 1> languages{"en"};
-    json["Languages"] = languages;
-    json["Languages@odata.count"] = languages.size();
+    if (!asyncResp->res.openFile(filepath))
+    {
+        BMCWEB_LOG_DEBUG("failed to read file");
+        asyncResp->res.result(
+            boost::beast::http::status::internal_server_error);
+        return;
+    }
 
-    nlohmann::json::array_t locationArray;
-    nlohmann::json::object_t locationEntry;
-    locationEntry["Language"] = "en";
-    locationEntry["PublicationUri"] = "http://redfish.dmtf.org/schemas/v1/" +
-                                      schema + ".json";
-    locationEntry["Uri"] = boost::urls::format(
-        "/redfish/v1/JsonSchemas/{}/{}", schema, std::string(schema) + ".json");
-
-    locationArray.emplace_back(locationEntry);
-
-    json["Location"] = std::move(locationArray);
-    json["Location@odata.count"] = 1;
+    messages::resourceNotFound(asyncResp->res, "JsonSchemaFile", schema);
 }
 
 inline void requestRoutesRedfish(App& app)
@@ -148,6 +221,10 @@
         .methods(boost::beast::http::verb::get)(
             std::bind_front(redfishGet, std::ref(app)));
 
+    BMCWEB_ROUTE(app, "/redfish/v1/JsonSchemas/<str>/<str>")
+        .privileges(redfish::privileges::getJsonSchemaFile)
+        .methods(boost::beast::http::verb::get)(jsonSchemaGetFile);
+
     BMCWEB_ROUTE(app, "/redfish/v1/JsonSchemas/<str>/")
         .privileges(redfish::privileges::getJsonSchemaFileCollection)
         .methods(boost::beast::http::verb::get)(
diff --git a/redfish-core/meson.build b/redfish-core/meson.build
new file mode 100644
index 0000000..28579fa
--- /dev/null
+++ b/redfish-core/meson.build
@@ -0,0 +1 @@
+subdir('schema')
\ No newline at end of file
diff --git a/static/redfish/v1/schema/AccountService_v1.xml b/redfish-core/schema/dmtf/installed/AccountService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AccountService_v1.xml
rename to redfish-core/schema/dmtf/installed/AccountService_v1.xml
diff --git a/static/redfish/v1/schema/ActionInfo_v1.xml b/redfish-core/schema/dmtf/installed/ActionInfo_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ActionInfo_v1.xml
rename to redfish-core/schema/dmtf/installed/ActionInfo_v1.xml
diff --git a/static/redfish/v1/schema/AggregationService_v1.xml b/redfish-core/schema/dmtf/installed/AggregationService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AggregationService_v1.xml
rename to redfish-core/schema/dmtf/installed/AggregationService_v1.xml
diff --git a/static/redfish/v1/schema/AggregationSourceCollection_v1.xml b/redfish-core/schema/dmtf/installed/AggregationSourceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AggregationSourceCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/AggregationSourceCollection_v1.xml
diff --git a/static/redfish/v1/schema/AggregationSource_v1.xml b/redfish-core/schema/dmtf/installed/AggregationSource_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AggregationSource_v1.xml
rename to redfish-core/schema/dmtf/installed/AggregationSource_v1.xml
diff --git a/static/redfish/v1/schema/Assembly_v1.xml b/redfish-core/schema/dmtf/installed/Assembly_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Assembly_v1.xml
rename to redfish-core/schema/dmtf/installed/Assembly_v1.xml
diff --git a/static/redfish/v1/schema/AttributeRegistry_v1.xml b/redfish-core/schema/dmtf/installed/AttributeRegistry_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/AttributeRegistry_v1.xml
rename to redfish-core/schema/dmtf/installed/AttributeRegistry_v1.xml
diff --git a/static/redfish/v1/schema/Bios_v1.xml b/redfish-core/schema/dmtf/installed/Bios_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Bios_v1.xml
rename to redfish-core/schema/dmtf/installed/Bios_v1.xml
diff --git a/static/redfish/v1/schema/CableCollection_v1.xml b/redfish-core/schema/dmtf/installed/CableCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CableCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/CableCollection_v1.xml
diff --git a/static/redfish/v1/schema/Cable_v1.xml b/redfish-core/schema/dmtf/installed/Cable_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Cable_v1.xml
rename to redfish-core/schema/dmtf/installed/Cable_v1.xml
diff --git a/static/redfish/v1/schema/CertificateCollection_v1.xml b/redfish-core/schema/dmtf/installed/CertificateCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CertificateCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/CertificateCollection_v1.xml
diff --git a/static/redfish/v1/schema/CertificateLocations_v1.xml b/redfish-core/schema/dmtf/installed/CertificateLocations_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CertificateLocations_v1.xml
rename to redfish-core/schema/dmtf/installed/CertificateLocations_v1.xml
diff --git a/static/redfish/v1/schema/CertificateService_v1.xml b/redfish-core/schema/dmtf/installed/CertificateService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/CertificateService_v1.xml
rename to redfish-core/schema/dmtf/installed/CertificateService_v1.xml
diff --git a/static/redfish/v1/schema/Certificate_v1.xml b/redfish-core/schema/dmtf/installed/Certificate_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Certificate_v1.xml
rename to redfish-core/schema/dmtf/installed/Certificate_v1.xml
diff --git a/static/redfish/v1/schema/ChassisCollection_v1.xml b/redfish-core/schema/dmtf/installed/ChassisCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ChassisCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/ChassisCollection_v1.xml
diff --git a/static/redfish/v1/schema/Chassis_v1.xml b/redfish-core/schema/dmtf/installed/Chassis_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Chassis_v1.xml
rename to redfish-core/schema/dmtf/installed/Chassis_v1.xml
diff --git a/static/redfish/v1/schema/ComponentIntegrityCollection_v1.xml b/redfish-core/schema/dmtf/installed/ComponentIntegrityCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComponentIntegrityCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/ComponentIntegrityCollection_v1.xml
diff --git a/static/redfish/v1/schema/ComponentIntegrity_v1.xml b/redfish-core/schema/dmtf/installed/ComponentIntegrity_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComponentIntegrity_v1.xml
rename to redfish-core/schema/dmtf/installed/ComponentIntegrity_v1.xml
diff --git a/static/redfish/v1/schema/ComputerSystemCollection_v1.xml b/redfish-core/schema/dmtf/installed/ComputerSystemCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComputerSystemCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/ComputerSystemCollection_v1.xml
diff --git a/static/redfish/v1/schema/ComputerSystem_v1.xml b/redfish-core/schema/dmtf/installed/ComputerSystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ComputerSystem_v1.xml
rename to redfish-core/schema/dmtf/installed/ComputerSystem_v1.xml
diff --git a/static/redfish/v1/schema/DriveCollection_v1.xml b/redfish-core/schema/dmtf/installed/DriveCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/DriveCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/DriveCollection_v1.xml
diff --git a/static/redfish/v1/schema/Drive_v1.xml b/redfish-core/schema/dmtf/installed/Drive_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Drive_v1.xml
rename to redfish-core/schema/dmtf/installed/Drive_v1.xml
diff --git a/static/redfish/v1/schema/EnvironmentMetrics_v1.xml b/redfish-core/schema/dmtf/installed/EnvironmentMetrics_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EnvironmentMetrics_v1.xml
rename to redfish-core/schema/dmtf/installed/EnvironmentMetrics_v1.xml
diff --git a/static/redfish/v1/schema/EthernetInterfaceCollection_v1.xml b/redfish-core/schema/dmtf/installed/EthernetInterfaceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EthernetInterfaceCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/EthernetInterfaceCollection_v1.xml
diff --git a/static/redfish/v1/schema/EthernetInterface_v1.xml b/redfish-core/schema/dmtf/installed/EthernetInterface_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EthernetInterface_v1.xml
rename to redfish-core/schema/dmtf/installed/EthernetInterface_v1.xml
diff --git a/static/redfish/v1/schema/EventDestinationCollection_v1.xml b/redfish-core/schema/dmtf/installed/EventDestinationCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EventDestinationCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/EventDestinationCollection_v1.xml
diff --git a/static/redfish/v1/schema/EventDestination_v1.xml b/redfish-core/schema/dmtf/installed/EventDestination_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EventDestination_v1.xml
rename to redfish-core/schema/dmtf/installed/EventDestination_v1.xml
diff --git a/static/redfish/v1/schema/EventService_v1.xml b/redfish-core/schema/dmtf/installed/EventService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/EventService_v1.xml
rename to redfish-core/schema/dmtf/installed/EventService_v1.xml
diff --git a/static/redfish/v1/schema/Event_v1.xml b/redfish-core/schema/dmtf/installed/Event_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Event_v1.xml
rename to redfish-core/schema/dmtf/installed/Event_v1.xml
diff --git a/static/redfish/v1/schema/FabricAdapterCollection_v1.xml b/redfish-core/schema/dmtf/installed/FabricAdapterCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/FabricAdapterCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/FabricAdapterCollection_v1.xml
diff --git a/static/redfish/v1/schema/FabricAdapter_v1.xml b/redfish-core/schema/dmtf/installed/FabricAdapter_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/FabricAdapter_v1.xml
rename to redfish-core/schema/dmtf/installed/FabricAdapter_v1.xml
diff --git a/static/redfish/v1/schema/FanCollection_v1.xml b/redfish-core/schema/dmtf/installed/FanCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/FanCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/FanCollection_v1.xml
diff --git a/static/redfish/v1/schema/Fan_v1.xml b/redfish-core/schema/dmtf/installed/Fan_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Fan_v1.xml
rename to redfish-core/schema/dmtf/installed/Fan_v1.xml
diff --git a/static/redfish/v1/schema/IPAddresses_v1.xml b/redfish-core/schema/dmtf/installed/IPAddresses_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/IPAddresses_v1.xml
rename to redfish-core/schema/dmtf/installed/IPAddresses_v1.xml
diff --git a/static/redfish/v1/schema/JsonSchemaFileCollection_v1.xml b/redfish-core/schema/dmtf/installed/JsonSchemaFileCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/JsonSchemaFileCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/JsonSchemaFileCollection_v1.xml
diff --git a/static/redfish/v1/schema/JsonSchemaFile_v1.xml b/redfish-core/schema/dmtf/installed/JsonSchemaFile_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/JsonSchemaFile_v1.xml
rename to redfish-core/schema/dmtf/installed/JsonSchemaFile_v1.xml
diff --git a/static/redfish/v1/schema/LogEntryCollection_v1.xml b/redfish-core/schema/dmtf/installed/LogEntryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogEntryCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/LogEntryCollection_v1.xml
diff --git a/static/redfish/v1/schema/LogEntry_v1.xml b/redfish-core/schema/dmtf/installed/LogEntry_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogEntry_v1.xml
rename to redfish-core/schema/dmtf/installed/LogEntry_v1.xml
diff --git a/static/redfish/v1/schema/LogServiceCollection_v1.xml b/redfish-core/schema/dmtf/installed/LogServiceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogServiceCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/LogServiceCollection_v1.xml
diff --git a/static/redfish/v1/schema/LogService_v1.xml b/redfish-core/schema/dmtf/installed/LogService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/LogService_v1.xml
rename to redfish-core/schema/dmtf/installed/LogService_v1.xml
diff --git a/static/redfish/v1/schema/ManagerAccountCollection_v1.xml b/redfish-core/schema/dmtf/installed/ManagerAccountCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerAccountCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/ManagerAccountCollection_v1.xml
diff --git a/static/redfish/v1/schema/ManagerAccount_v1.xml b/redfish-core/schema/dmtf/installed/ManagerAccount_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerAccount_v1.xml
rename to redfish-core/schema/dmtf/installed/ManagerAccount_v1.xml
diff --git a/static/redfish/v1/schema/ManagerCollection_v1.xml b/redfish-core/schema/dmtf/installed/ManagerCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/ManagerCollection_v1.xml
diff --git a/static/redfish/v1/schema/ManagerDiagnosticData_v1.xml b/redfish-core/schema/dmtf/installed/ManagerDiagnosticData_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerDiagnosticData_v1.xml
rename to redfish-core/schema/dmtf/installed/ManagerDiagnosticData_v1.xml
diff --git a/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml b/redfish-core/schema/dmtf/installed/ManagerNetworkProtocol_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
rename to redfish-core/schema/dmtf/installed/ManagerNetworkProtocol_v1.xml
diff --git a/static/redfish/v1/schema/Manager_v1.xml b/redfish-core/schema/dmtf/installed/Manager_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Manager_v1.xml
rename to redfish-core/schema/dmtf/installed/Manager_v1.xml
diff --git a/static/redfish/v1/schema/MemoryCollection_v1.xml b/redfish-core/schema/dmtf/installed/MemoryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MemoryCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/MemoryCollection_v1.xml
diff --git a/static/redfish/v1/schema/Memory_v1.xml b/redfish-core/schema/dmtf/installed/Memory_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Memory_v1.xml
rename to redfish-core/schema/dmtf/installed/Memory_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistryCollection_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistryCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/MessageRegistryCollection_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistryFileCollection_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistryFileCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistryFileCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/MessageRegistryFileCollection_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistryFile_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistryFile_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistryFile_v1.xml
rename to redfish-core/schema/dmtf/installed/MessageRegistryFile_v1.xml
diff --git a/static/redfish/v1/schema/MessageRegistry_v1.xml b/redfish-core/schema/dmtf/installed/MessageRegistry_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MessageRegistry_v1.xml
rename to redfish-core/schema/dmtf/installed/MessageRegistry_v1.xml
diff --git a/static/redfish/v1/schema/Message_v1.xml b/redfish-core/schema/dmtf/installed/Message_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Message_v1.xml
rename to redfish-core/schema/dmtf/installed/Message_v1.xml
diff --git a/static/redfish/v1/schema/MetricDefinitionCollection_v1.xml b/redfish-core/schema/dmtf/installed/MetricDefinitionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricDefinitionCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/MetricDefinitionCollection_v1.xml
diff --git a/static/redfish/v1/schema/MetricDefinition_v1.xml b/redfish-core/schema/dmtf/installed/MetricDefinition_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricDefinition_v1.xml
rename to redfish-core/schema/dmtf/installed/MetricDefinition_v1.xml
diff --git a/static/redfish/v1/schema/MetricReportCollection_v1.xml b/redfish-core/schema/dmtf/installed/MetricReportCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReportCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/MetricReportCollection_v1.xml
diff --git a/static/redfish/v1/schema/MetricReportDefinitionCollection_v1.xml b/redfish-core/schema/dmtf/installed/MetricReportDefinitionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReportDefinitionCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/MetricReportDefinitionCollection_v1.xml
diff --git a/static/redfish/v1/schema/MetricReportDefinition_v1.xml b/redfish-core/schema/dmtf/installed/MetricReportDefinition_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReportDefinition_v1.xml
rename to redfish-core/schema/dmtf/installed/MetricReportDefinition_v1.xml
diff --git a/static/redfish/v1/schema/MetricReport_v1.xml b/redfish-core/schema/dmtf/installed/MetricReport_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/MetricReport_v1.xml
rename to redfish-core/schema/dmtf/installed/MetricReport_v1.xml
diff --git a/static/redfish/v1/schema/OemComputerSystem_v1.xml b/redfish-core/schema/dmtf/installed/OemComputerSystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OemComputerSystem_v1.xml
rename to redfish-core/schema/dmtf/installed/OemComputerSystem_v1.xml
diff --git a/static/redfish/v1/schema/OemManager_v1.xml b/redfish-core/schema/dmtf/installed/OemManager_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OemManager_v1.xml
rename to redfish-core/schema/dmtf/installed/OemManager_v1.xml
diff --git a/static/redfish/v1/schema/OemVirtualMedia_v1.xml b/redfish-core/schema/dmtf/installed/OemVirtualMedia_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OemVirtualMedia_v1.xml
rename to redfish-core/schema/dmtf/installed/OemVirtualMedia_v1.xml
diff --git a/static/redfish/v1/schema/OpenBMCAccountService_v1.xml b/redfish-core/schema/dmtf/installed/OpenBMCAccountService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OpenBMCAccountService_v1.xml
rename to redfish-core/schema/dmtf/installed/OpenBMCAccountService_v1.xml
diff --git a/static/redfish/v1/schema/OperatingConfigCollection_v1.xml b/redfish-core/schema/dmtf/installed/OperatingConfigCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OperatingConfigCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/OperatingConfigCollection_v1.xml
diff --git a/static/redfish/v1/schema/OperatingConfig_v1.xml b/redfish-core/schema/dmtf/installed/OperatingConfig_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/OperatingConfig_v1.xml
rename to redfish-core/schema/dmtf/installed/OperatingConfig_v1.xml
diff --git a/static/redfish/v1/schema/PCIeDeviceCollection_v1.xml b/redfish-core/schema/dmtf/installed/PCIeDeviceCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeDeviceCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/PCIeDeviceCollection_v1.xml
diff --git a/static/redfish/v1/schema/PCIeDevice_v1.xml b/redfish-core/schema/dmtf/installed/PCIeDevice_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeDevice_v1.xml
rename to redfish-core/schema/dmtf/installed/PCIeDevice_v1.xml
diff --git a/static/redfish/v1/schema/PCIeFunctionCollection_v1.xml b/redfish-core/schema/dmtf/installed/PCIeFunctionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeFunctionCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/PCIeFunctionCollection_v1.xml
diff --git a/static/redfish/v1/schema/PCIeFunction_v1.xml b/redfish-core/schema/dmtf/installed/PCIeFunction_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeFunction_v1.xml
rename to redfish-core/schema/dmtf/installed/PCIeFunction_v1.xml
diff --git a/static/redfish/v1/schema/PCIeSlots_v1.xml b/redfish-core/schema/dmtf/installed/PCIeSlots_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PCIeSlots_v1.xml
rename to redfish-core/schema/dmtf/installed/PCIeSlots_v1.xml
diff --git a/static/redfish/v1/schema/PhysicalContext_v1.xml b/redfish-core/schema/dmtf/installed/PhysicalContext_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PhysicalContext_v1.xml
rename to redfish-core/schema/dmtf/installed/PhysicalContext_v1.xml
diff --git a/static/redfish/v1/schema/PortCollection_v1.xml b/redfish-core/schema/dmtf/installed/PortCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PortCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/PortCollection_v1.xml
diff --git a/static/redfish/v1/schema/Port_v1.xml b/redfish-core/schema/dmtf/installed/Port_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Port_v1.xml
rename to redfish-core/schema/dmtf/installed/Port_v1.xml
diff --git a/static/redfish/v1/schema/PowerSubsystem_v1.xml b/redfish-core/schema/dmtf/installed/PowerSubsystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PowerSubsystem_v1.xml
rename to redfish-core/schema/dmtf/installed/PowerSubsystem_v1.xml
diff --git a/static/redfish/v1/schema/PowerSupplyCollection_v1.xml b/redfish-core/schema/dmtf/installed/PowerSupplyCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PowerSupplyCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/PowerSupplyCollection_v1.xml
diff --git a/static/redfish/v1/schema/PowerSupply_v1.xml b/redfish-core/schema/dmtf/installed/PowerSupply_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/PowerSupply_v1.xml
rename to redfish-core/schema/dmtf/installed/PowerSupply_v1.xml
diff --git a/static/redfish/v1/schema/Power_v1.xml b/redfish-core/schema/dmtf/installed/Power_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Power_v1.xml
rename to redfish-core/schema/dmtf/installed/Power_v1.xml
diff --git a/static/redfish/v1/schema/Privileges_v1.xml b/redfish-core/schema/dmtf/installed/Privileges_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Privileges_v1.xml
rename to redfish-core/schema/dmtf/installed/Privileges_v1.xml
diff --git a/static/redfish/v1/schema/ProcessorCollection_v1.xml b/redfish-core/schema/dmtf/installed/ProcessorCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ProcessorCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/ProcessorCollection_v1.xml
diff --git a/static/redfish/v1/schema/Processor_v1.xml b/redfish-core/schema/dmtf/installed/Processor_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Processor_v1.xml
rename to redfish-core/schema/dmtf/installed/Processor_v1.xml
diff --git a/static/redfish/v1/schema/Protocol_v1.xml b/redfish-core/schema/dmtf/installed/Protocol_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Protocol_v1.xml
rename to redfish-core/schema/dmtf/installed/Protocol_v1.xml
diff --git a/static/redfish/v1/schema/RedfishError_v1.xml b/redfish-core/schema/dmtf/installed/RedfishError_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/RedfishError_v1.xml
rename to redfish-core/schema/dmtf/installed/RedfishError_v1.xml
diff --git a/static/redfish/v1/schema/RedfishExtensions_v1.xml b/redfish-core/schema/dmtf/installed/RedfishExtensions_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/RedfishExtensions_v1.xml
rename to redfish-core/schema/dmtf/installed/RedfishExtensions_v1.xml
diff --git a/static/redfish/v1/schema/Redundancy_v1.xml b/redfish-core/schema/dmtf/installed/Redundancy_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Redundancy_v1.xml
rename to redfish-core/schema/dmtf/installed/Redundancy_v1.xml
diff --git a/static/redfish/v1/schema/Resource_v1.xml b/redfish-core/schema/dmtf/installed/Resource_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Resource_v1.xml
rename to redfish-core/schema/dmtf/installed/Resource_v1.xml
diff --git a/static/redfish/v1/schema/RoleCollection_v1.xml b/redfish-core/schema/dmtf/installed/RoleCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/RoleCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/RoleCollection_v1.xml
diff --git a/static/redfish/v1/schema/Role_v1.xml b/redfish-core/schema/dmtf/installed/Role_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Role_v1.xml
rename to redfish-core/schema/dmtf/installed/Role_v1.xml
diff --git a/static/redfish/v1/schema/SensorCollection_v1.xml b/redfish-core/schema/dmtf/installed/SensorCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SensorCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/SensorCollection_v1.xml
diff --git a/static/redfish/v1/schema/Sensor_v1.xml b/redfish-core/schema/dmtf/installed/Sensor_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Sensor_v1.xml
rename to redfish-core/schema/dmtf/installed/Sensor_v1.xml
diff --git a/static/redfish/v1/schema/ServiceRoot_v1.xml b/redfish-core/schema/dmtf/installed/ServiceRoot_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ServiceRoot_v1.xml
rename to redfish-core/schema/dmtf/installed/ServiceRoot_v1.xml
diff --git a/static/redfish/v1/schema/SessionCollection_v1.xml b/redfish-core/schema/dmtf/installed/SessionCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SessionCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/SessionCollection_v1.xml
diff --git a/static/redfish/v1/schema/SessionService_v1.xml b/redfish-core/schema/dmtf/installed/SessionService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SessionService_v1.xml
rename to redfish-core/schema/dmtf/installed/SessionService_v1.xml
diff --git a/static/redfish/v1/schema/Session_v1.xml b/redfish-core/schema/dmtf/installed/Session_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Session_v1.xml
rename to redfish-core/schema/dmtf/installed/Session_v1.xml
diff --git a/static/redfish/v1/schema/Settings_v1.xml b/redfish-core/schema/dmtf/installed/Settings_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Settings_v1.xml
rename to redfish-core/schema/dmtf/installed/Settings_v1.xml
diff --git a/static/redfish/v1/schema/SoftwareInventoryCollection_v1.xml b/redfish-core/schema/dmtf/installed/SoftwareInventoryCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SoftwareInventoryCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/SoftwareInventoryCollection_v1.xml
diff --git a/static/redfish/v1/schema/SoftwareInventory_v1.xml b/redfish-core/schema/dmtf/installed/SoftwareInventory_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/SoftwareInventory_v1.xml
rename to redfish-core/schema/dmtf/installed/SoftwareInventory_v1.xml
diff --git a/static/redfish/v1/schema/StorageCollection_v1.xml b/redfish-core/schema/dmtf/installed/StorageCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/StorageCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/StorageCollection_v1.xml
diff --git a/static/redfish/v1/schema/StorageControllerCollection_v1.xml b/redfish-core/schema/dmtf/installed/StorageControllerCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/StorageControllerCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/StorageControllerCollection_v1.xml
diff --git a/static/redfish/v1/schema/StorageController_v1.xml b/redfish-core/schema/dmtf/installed/StorageController_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/StorageController_v1.xml
rename to redfish-core/schema/dmtf/installed/StorageController_v1.xml
diff --git a/static/redfish/v1/schema/Storage_v1.xml b/redfish-core/schema/dmtf/installed/Storage_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Storage_v1.xml
rename to redfish-core/schema/dmtf/installed/Storage_v1.xml
diff --git a/static/redfish/v1/schema/TaskCollection_v1.xml b/redfish-core/schema/dmtf/installed/TaskCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TaskCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/TaskCollection_v1.xml
diff --git a/static/redfish/v1/schema/TaskService_v1.xml b/redfish-core/schema/dmtf/installed/TaskService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TaskService_v1.xml
rename to redfish-core/schema/dmtf/installed/TaskService_v1.xml
diff --git a/static/redfish/v1/schema/Task_v1.xml b/redfish-core/schema/dmtf/installed/Task_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Task_v1.xml
rename to redfish-core/schema/dmtf/installed/Task_v1.xml
diff --git a/static/redfish/v1/schema/TelemetryService_v1.xml b/redfish-core/schema/dmtf/installed/TelemetryService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TelemetryService_v1.xml
rename to redfish-core/schema/dmtf/installed/TelemetryService_v1.xml
diff --git a/static/redfish/v1/schema/ThermalMetrics_v1.xml b/redfish-core/schema/dmtf/installed/ThermalMetrics_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ThermalMetrics_v1.xml
rename to redfish-core/schema/dmtf/installed/ThermalMetrics_v1.xml
diff --git a/static/redfish/v1/schema/ThermalSubsystem_v1.xml b/redfish-core/schema/dmtf/installed/ThermalSubsystem_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/ThermalSubsystem_v1.xml
rename to redfish-core/schema/dmtf/installed/ThermalSubsystem_v1.xml
diff --git a/static/redfish/v1/schema/Thermal_v1.xml b/redfish-core/schema/dmtf/installed/Thermal_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Thermal_v1.xml
rename to redfish-core/schema/dmtf/installed/Thermal_v1.xml
diff --git a/static/redfish/v1/schema/TriggersCollection_v1.xml b/redfish-core/schema/dmtf/installed/TriggersCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/TriggersCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/TriggersCollection_v1.xml
diff --git a/static/redfish/v1/schema/Triggers_v1.xml b/redfish-core/schema/dmtf/installed/Triggers_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/Triggers_v1.xml
rename to redfish-core/schema/dmtf/installed/Triggers_v1.xml
diff --git a/static/redfish/v1/schema/UpdateService_v1.xml b/redfish-core/schema/dmtf/installed/UpdateService_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/UpdateService_v1.xml
rename to redfish-core/schema/dmtf/installed/UpdateService_v1.xml
diff --git a/static/redfish/v1/schema/VirtualMediaCollection_v1.xml b/redfish-core/schema/dmtf/installed/VirtualMediaCollection_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/VirtualMediaCollection_v1.xml
rename to redfish-core/schema/dmtf/installed/VirtualMediaCollection_v1.xml
diff --git a/static/redfish/v1/schema/VirtualMedia_v1.xml b/redfish-core/schema/dmtf/installed/VirtualMedia_v1.xml
similarity index 100%
rename from static/redfish/v1/schema/VirtualMedia_v1.xml
rename to redfish-core/schema/dmtf/installed/VirtualMedia_v1.xml
diff --git a/redfish-core/schema/dmtf/json-schema-installed/AccountService.v1_15_1.json b/redfish-core/schema/dmtf/json-schema-installed/AccountService.v1_15_1.json
new file mode 120000
index 0000000..ce1dcf4
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/AccountService.v1_15_1.json
@@ -0,0 +1 @@
+../json-schema/AccountService.v1_15_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ActionInfo.v1_4_2.json b/redfish-core/schema/dmtf/json-schema-installed/ActionInfo.v1_4_2.json
new file mode 120000
index 0000000..f139348
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ActionInfo.v1_4_2.json
@@ -0,0 +1 @@
+../json-schema/ActionInfo.v1_4_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/AggregationService.v1_0_3.json b/redfish-core/schema/dmtf/json-schema-installed/AggregationService.v1_0_3.json
new file mode 120000
index 0000000..f683467
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/AggregationService.v1_0_3.json
@@ -0,0 +1 @@
+../json-schema/AggregationService.v1_0_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/AggregationSource.v1_4_1.json b/redfish-core/schema/dmtf/json-schema-installed/AggregationSource.v1_4_1.json
new file mode 120000
index 0000000..3d2676f
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/AggregationSource.v1_4_1.json
@@ -0,0 +1 @@
+../json-schema/AggregationSource.v1_4_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/AggregationSourceCollection.json b/redfish-core/schema/dmtf/json-schema-installed/AggregationSourceCollection.json
new file mode 120000
index 0000000..33d6bbb
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/AggregationSourceCollection.json
@@ -0,0 +1 @@
+../json-schema/AggregationSourceCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Assembly.v1_5_1.json b/redfish-core/schema/dmtf/json-schema-installed/Assembly.v1_5_1.json
new file mode 120000
index 0000000..0b09680
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Assembly.v1_5_1.json
@@ -0,0 +1 @@
+../json-schema/Assembly.v1_5_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/AttributeRegistry.v1_3_9.json b/redfish-core/schema/dmtf/json-schema-installed/AttributeRegistry.v1_3_9.json
new file mode 120000
index 0000000..4ab154d
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/AttributeRegistry.v1_3_9.json
@@ -0,0 +1 @@
+../json-schema/AttributeRegistry.v1_3_9.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Bios.v1_2_3.json b/redfish-core/schema/dmtf/json-schema-installed/Bios.v1_2_3.json
new file mode 120000
index 0000000..339a150
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Bios.v1_2_3.json
@@ -0,0 +1 @@
+../json-schema/Bios.v1_2_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Cable.v1_2_3.json b/redfish-core/schema/dmtf/json-schema-installed/Cable.v1_2_3.json
new file mode 120000
index 0000000..7f22b35
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Cable.v1_2_3.json
@@ -0,0 +1 @@
+../json-schema/Cable.v1_2_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/CableCollection.json b/redfish-core/schema/dmtf/json-schema-installed/CableCollection.json
new file mode 120000
index 0000000..4792927
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/CableCollection.json
@@ -0,0 +1 @@
+../json-schema/CableCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Certificate.v1_8_2.json b/redfish-core/schema/dmtf/json-schema-installed/Certificate.v1_8_2.json
new file mode 120000
index 0000000..3f9db26
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Certificate.v1_8_2.json
@@ -0,0 +1 @@
+../json-schema/Certificate.v1_8_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/CertificateCollection.json b/redfish-core/schema/dmtf/json-schema-installed/CertificateCollection.json
new file mode 120000
index 0000000..725795a
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/CertificateCollection.json
@@ -0,0 +1 @@
+../json-schema/CertificateCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/CertificateLocations.v1_0_4.json b/redfish-core/schema/dmtf/json-schema-installed/CertificateLocations.v1_0_4.json
new file mode 120000
index 0000000..8aae28c
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/CertificateLocations.v1_0_4.json
@@ -0,0 +1 @@
+../json-schema/CertificateLocations.v1_0_4.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/CertificateService.v1_0_5.json b/redfish-core/schema/dmtf/json-schema-installed/CertificateService.v1_0_5.json
new file mode 120000
index 0000000..764f300
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/CertificateService.v1_0_5.json
@@ -0,0 +1 @@
+../json-schema/CertificateService.v1_0_5.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Chassis.v1_25_1.json b/redfish-core/schema/dmtf/json-schema-installed/Chassis.v1_25_1.json
new file mode 120000
index 0000000..43d3657
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Chassis.v1_25_1.json
@@ -0,0 +1 @@
+../json-schema/Chassis.v1_25_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ChassisCollection.json b/redfish-core/schema/dmtf/json-schema-installed/ChassisCollection.json
new file mode 120000
index 0000000..2bffa17
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ChassisCollection.json
@@ -0,0 +1 @@
+../json-schema/ChassisCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ComponentIntegrity.v1_2_3.json b/redfish-core/schema/dmtf/json-schema-installed/ComponentIntegrity.v1_2_3.json
new file mode 120000
index 0000000..69af057
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ComponentIntegrity.v1_2_3.json
@@ -0,0 +1 @@
+../json-schema/ComponentIntegrity.v1_2_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ComponentIntegrityCollection.json b/redfish-core/schema/dmtf/json-schema-installed/ComponentIntegrityCollection.json
new file mode 120000
index 0000000..56b0a68
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ComponentIntegrityCollection.json
@@ -0,0 +1 @@
+../json-schema/ComponentIntegrityCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ComputerSystem.v1_22_1.json b/redfish-core/schema/dmtf/json-schema-installed/ComputerSystem.v1_22_1.json
new file mode 120000
index 0000000..8571a29
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ComputerSystem.v1_22_1.json
@@ -0,0 +1 @@
+../json-schema/ComputerSystem.v1_22_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ComputerSystemCollection.json b/redfish-core/schema/dmtf/json-schema-installed/ComputerSystemCollection.json
new file mode 120000
index 0000000..d8ceb57
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ComputerSystemCollection.json
@@ -0,0 +1 @@
+../json-schema/ComputerSystemCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Drive.v1_19_0.json b/redfish-core/schema/dmtf/json-schema-installed/Drive.v1_19_0.json
new file mode 120000
index 0000000..ad7b3e1
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Drive.v1_19_0.json
@@ -0,0 +1 @@
+../json-schema/Drive.v1_19_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/DriveCollection.json b/redfish-core/schema/dmtf/json-schema-installed/DriveCollection.json
new file mode 120000
index 0000000..ae1058f
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/DriveCollection.json
@@ -0,0 +1 @@
+../json-schema/DriveCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/EnvironmentMetrics.v1_3_2.json b/redfish-core/schema/dmtf/json-schema-installed/EnvironmentMetrics.v1_3_2.json
new file mode 120000
index 0000000..91a315b
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/EnvironmentMetrics.v1_3_2.json
@@ -0,0 +1 @@
+../json-schema/EnvironmentMetrics.v1_3_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/EthernetInterface.v1_12_1.json b/redfish-core/schema/dmtf/json-schema-installed/EthernetInterface.v1_12_1.json
new file mode 120000
index 0000000..0417d7b
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/EthernetInterface.v1_12_1.json
@@ -0,0 +1 @@
+../json-schema/EthernetInterface.v1_12_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/EthernetInterfaceCollection.json b/redfish-core/schema/dmtf/json-schema-installed/EthernetInterfaceCollection.json
new file mode 120000
index 0000000..9f9a1e0
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/EthernetInterfaceCollection.json
@@ -0,0 +1 @@
+../json-schema/EthernetInterfaceCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Event.v1_10_1.json b/redfish-core/schema/dmtf/json-schema-installed/Event.v1_10_1.json
new file mode 120000
index 0000000..2a18075
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Event.v1_10_1.json
@@ -0,0 +1 @@
+../json-schema/Event.v1_10_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/EventDestination.v1_14_1.json b/redfish-core/schema/dmtf/json-schema-installed/EventDestination.v1_14_1.json
new file mode 120000
index 0000000..8aa563e
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/EventDestination.v1_14_1.json
@@ -0,0 +1 @@
+../json-schema/EventDestination.v1_14_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/EventDestinationCollection.json b/redfish-core/schema/dmtf/json-schema-installed/EventDestinationCollection.json
new file mode 120000
index 0000000..33372ae
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/EventDestinationCollection.json
@@ -0,0 +1 @@
+../json-schema/EventDestinationCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/EventService.v1_10_2.json b/redfish-core/schema/dmtf/json-schema-installed/EventService.v1_10_2.json
new file mode 120000
index 0000000..9d0f231
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/EventService.v1_10_2.json
@@ -0,0 +1 @@
+../json-schema/EventService.v1_10_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/FabricAdapter.v1_5_3.json b/redfish-core/schema/dmtf/json-schema-installed/FabricAdapter.v1_5_3.json
new file mode 120000
index 0000000..4100194
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/FabricAdapter.v1_5_3.json
@@ -0,0 +1 @@
+../json-schema/FabricAdapter.v1_5_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/FabricAdapterCollection.json b/redfish-core/schema/dmtf/json-schema-installed/FabricAdapterCollection.json
new file mode 120000
index 0000000..74c868a
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/FabricAdapterCollection.json
@@ -0,0 +1 @@
+../json-schema/FabricAdapterCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Fan.v1_5_2.json b/redfish-core/schema/dmtf/json-schema-installed/Fan.v1_5_2.json
new file mode 120000
index 0000000..dabed56
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Fan.v1_5_2.json
@@ -0,0 +1 @@
+../json-schema/Fan.v1_5_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/FanCollection.json b/redfish-core/schema/dmtf/json-schema-installed/FanCollection.json
new file mode 120000
index 0000000..74c0c7d
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/FanCollection.json
@@ -0,0 +1 @@
+../json-schema/FanCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/IPAddresses.v1_1_5.json b/redfish-core/schema/dmtf/json-schema-installed/IPAddresses.v1_1_5.json
new file mode 120000
index 0000000..9c919c8
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/IPAddresses.v1_1_5.json
@@ -0,0 +1 @@
+../json-schema/IPAddresses.v1_1_5.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/JsonSchemaFile.v1_1_5.json b/redfish-core/schema/dmtf/json-schema-installed/JsonSchemaFile.v1_1_5.json
new file mode 120000
index 0000000..89134f4
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/JsonSchemaFile.v1_1_5.json
@@ -0,0 +1 @@
+../json-schema/JsonSchemaFile.v1_1_5.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/JsonSchemaFileCollection.json b/redfish-core/schema/dmtf/json-schema-installed/JsonSchemaFileCollection.json
new file mode 120000
index 0000000..1f6852c
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/JsonSchemaFileCollection.json
@@ -0,0 +1 @@
+../json-schema/JsonSchemaFileCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/LogEntry.v1_16_1.json b/redfish-core/schema/dmtf/json-schema-installed/LogEntry.v1_16_1.json
new file mode 120000
index 0000000..b67d0b6
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/LogEntry.v1_16_1.json
@@ -0,0 +1 @@
+../json-schema/LogEntry.v1_16_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/LogEntryCollection.json b/redfish-core/schema/dmtf/json-schema-installed/LogEntryCollection.json
new file mode 120000
index 0000000..f3b2617
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/LogEntryCollection.json
@@ -0,0 +1 @@
+../json-schema/LogEntryCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/LogService.v1_7_0.json b/redfish-core/schema/dmtf/json-schema-installed/LogService.v1_7_0.json
new file mode 120000
index 0000000..a4cdd0d
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/LogService.v1_7_0.json
@@ -0,0 +1 @@
+../json-schema/LogService.v1_7_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/LogServiceCollection.json b/redfish-core/schema/dmtf/json-schema-installed/LogServiceCollection.json
new file mode 120000
index 0000000..44c6856
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/LogServiceCollection.json
@@ -0,0 +1 @@
+../json-schema/LogServiceCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Manager.v1_19_1.json b/redfish-core/schema/dmtf/json-schema-installed/Manager.v1_19_1.json
new file mode 120000
index 0000000..b7bf287
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Manager.v1_19_1.json
@@ -0,0 +1 @@
+../json-schema/Manager.v1_19_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ManagerAccount.v1_12_1.json b/redfish-core/schema/dmtf/json-schema-installed/ManagerAccount.v1_12_1.json
new file mode 120000
index 0000000..4b5069c
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ManagerAccount.v1_12_1.json
@@ -0,0 +1 @@
+../json-schema/ManagerAccount.v1_12_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ManagerAccountCollection.json b/redfish-core/schema/dmtf/json-schema-installed/ManagerAccountCollection.json
new file mode 120000
index 0000000..54df261
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ManagerAccountCollection.json
@@ -0,0 +1 @@
+../json-schema/ManagerAccountCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ManagerCollection.json b/redfish-core/schema/dmtf/json-schema-installed/ManagerCollection.json
new file mode 120000
index 0000000..3bdc7d7
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ManagerCollection.json
@@ -0,0 +1 @@
+../json-schema/ManagerCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ManagerDiagnosticData.v1_2_3.json b/redfish-core/schema/dmtf/json-schema-installed/ManagerDiagnosticData.v1_2_3.json
new file mode 120000
index 0000000..720a958
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ManagerDiagnosticData.v1_2_3.json
@@ -0,0 +1 @@
+../json-schema/ManagerDiagnosticData.v1_2_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ManagerNetworkProtocol.v1_10_1.json b/redfish-core/schema/dmtf/json-schema-installed/ManagerNetworkProtocol.v1_10_1.json
new file mode 120000
index 0000000..d50f418
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ManagerNetworkProtocol.v1_10_1.json
@@ -0,0 +1 @@
+../json-schema/ManagerNetworkProtocol.v1_10_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Memory.v1_20_0.json b/redfish-core/schema/dmtf/json-schema-installed/Memory.v1_20_0.json
new file mode 120000
index 0000000..7664900
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Memory.v1_20_0.json
@@ -0,0 +1 @@
+../json-schema/Memory.v1_20_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MemoryCollection.json b/redfish-core/schema/dmtf/json-schema-installed/MemoryCollection.json
new file mode 120000
index 0000000..e2181fc
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MemoryCollection.json
@@ -0,0 +1 @@
+../json-schema/MemoryCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Message.v1_2_1.json b/redfish-core/schema/dmtf/json-schema-installed/Message.v1_2_1.json
new file mode 120000
index 0000000..bdabd0f
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Message.v1_2_1.json
@@ -0,0 +1 @@
+../json-schema/Message.v1_2_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MessageRegistry.v1_6_3.json b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistry.v1_6_3.json
new file mode 120000
index 0000000..f567b49
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistry.v1_6_3.json
@@ -0,0 +1 @@
+../json-schema/MessageRegistry.v1_6_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryCollection.json b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryCollection.json
new file mode 120000
index 0000000..216c60d
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryCollection.json
@@ -0,0 +1 @@
+../json-schema/MessageRegistryCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryFile.v1_1_5.json b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryFile.v1_1_5.json
new file mode 120000
index 0000000..646824e
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryFile.v1_1_5.json
@@ -0,0 +1 @@
+../json-schema/MessageRegistryFile.v1_1_5.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryFileCollection.json b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryFileCollection.json
new file mode 120000
index 0000000..c9ae434
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MessageRegistryFileCollection.json
@@ -0,0 +1 @@
+../json-schema/MessageRegistryFileCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MetricDefinition.v1_3_4.json b/redfish-core/schema/dmtf/json-schema-installed/MetricDefinition.v1_3_4.json
new file mode 120000
index 0000000..cd4567c
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MetricDefinition.v1_3_4.json
@@ -0,0 +1 @@
+../json-schema/MetricDefinition.v1_3_4.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MetricDefinitionCollection.json b/redfish-core/schema/dmtf/json-schema-installed/MetricDefinitionCollection.json
new file mode 120000
index 0000000..b60e963
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MetricDefinitionCollection.json
@@ -0,0 +1 @@
+../json-schema/MetricDefinitionCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MetricReport.v1_5_1.json b/redfish-core/schema/dmtf/json-schema-installed/MetricReport.v1_5_1.json
new file mode 120000
index 0000000..16ba3dc
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MetricReport.v1_5_1.json
@@ -0,0 +1 @@
+../json-schema/MetricReport.v1_5_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MetricReportCollection.json b/redfish-core/schema/dmtf/json-schema-installed/MetricReportCollection.json
new file mode 120000
index 0000000..30f0e19
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MetricReportCollection.json
@@ -0,0 +1 @@
+../json-schema/MetricReportCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MetricReportDefinition.v1_4_6.json b/redfish-core/schema/dmtf/json-schema-installed/MetricReportDefinition.v1_4_6.json
new file mode 120000
index 0000000..f95c542
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MetricReportDefinition.v1_4_6.json
@@ -0,0 +1 @@
+../json-schema/MetricReportDefinition.v1_4_6.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/MetricReportDefinitionCollection.json b/redfish-core/schema/dmtf/json-schema-installed/MetricReportDefinitionCollection.json
new file mode 120000
index 0000000..90e6d72
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/MetricReportDefinitionCollection.json
@@ -0,0 +1 @@
+../json-schema/MetricReportDefinitionCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/OperatingConfig.v1_0_4.json b/redfish-core/schema/dmtf/json-schema-installed/OperatingConfig.v1_0_4.json
new file mode 120000
index 0000000..188a31b
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/OperatingConfig.v1_0_4.json
@@ -0,0 +1 @@
+../json-schema/OperatingConfig.v1_0_4.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/OperatingConfigCollection.json b/redfish-core/schema/dmtf/json-schema-installed/OperatingConfigCollection.json
new file mode 120000
index 0000000..520c1de
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/OperatingConfigCollection.json
@@ -0,0 +1 @@
+../json-schema/OperatingConfigCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PCIeDevice.v1_14_0.json b/redfish-core/schema/dmtf/json-schema-installed/PCIeDevice.v1_14_0.json
new file mode 120000
index 0000000..5a38374
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PCIeDevice.v1_14_0.json
@@ -0,0 +1 @@
+../json-schema/PCIeDevice.v1_14_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PCIeDeviceCollection.json b/redfish-core/schema/dmtf/json-schema-installed/PCIeDeviceCollection.json
new file mode 120000
index 0000000..03238f4
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PCIeDeviceCollection.json
@@ -0,0 +1 @@
+../json-schema/PCIeDeviceCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PCIeFunction.v1_6_0.json b/redfish-core/schema/dmtf/json-schema-installed/PCIeFunction.v1_6_0.json
new file mode 120000
index 0000000..011b554
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PCIeFunction.v1_6_0.json
@@ -0,0 +1 @@
+../json-schema/PCIeFunction.v1_6_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PCIeFunctionCollection.json b/redfish-core/schema/dmtf/json-schema-installed/PCIeFunctionCollection.json
new file mode 120000
index 0000000..c4089cb
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PCIeFunctionCollection.json
@@ -0,0 +1 @@
+../json-schema/PCIeFunctionCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PCIeSlots.v1_6_1.json b/redfish-core/schema/dmtf/json-schema-installed/PCIeSlots.v1_6_1.json
new file mode 120000
index 0000000..185e0ab
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PCIeSlots.v1_6_1.json
@@ -0,0 +1 @@
+../json-schema/PCIeSlots.v1_6_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PhysicalContext.json b/redfish-core/schema/dmtf/json-schema-installed/PhysicalContext.json
new file mode 120000
index 0000000..6a88423
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PhysicalContext.json
@@ -0,0 +1 @@
+../json-schema/PhysicalContext.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Port.v1_12_0.json b/redfish-core/schema/dmtf/json-schema-installed/Port.v1_12_0.json
new file mode 120000
index 0000000..4378a56
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Port.v1_12_0.json
@@ -0,0 +1 @@
+../json-schema/Port.v1_12_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PortCollection.json b/redfish-core/schema/dmtf/json-schema-installed/PortCollection.json
new file mode 120000
index 0000000..53c76df
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PortCollection.json
@@ -0,0 +1 @@
+../json-schema/PortCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Power.v1_7_3.json b/redfish-core/schema/dmtf/json-schema-installed/Power.v1_7_3.json
new file mode 120000
index 0000000..392e70e
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Power.v1_7_3.json
@@ -0,0 +1 @@
+../json-schema/Power.v1_7_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PowerSubsystem.v1_1_2.json b/redfish-core/schema/dmtf/json-schema-installed/PowerSubsystem.v1_1_2.json
new file mode 120000
index 0000000..192e77f
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PowerSubsystem.v1_1_2.json
@@ -0,0 +1 @@
+../json-schema/PowerSubsystem.v1_1_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PowerSupply.v1_6_0.json b/redfish-core/schema/dmtf/json-schema-installed/PowerSupply.v1_6_0.json
new file mode 120000
index 0000000..0f30446
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PowerSupply.v1_6_0.json
@@ -0,0 +1 @@
+../json-schema/PowerSupply.v1_6_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/PowerSupplyCollection.json b/redfish-core/schema/dmtf/json-schema-installed/PowerSupplyCollection.json
new file mode 120000
index 0000000..becf5d4
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/PowerSupplyCollection.json
@@ -0,0 +1 @@
+../json-schema/PowerSupplyCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Privileges.v1_0_6.json b/redfish-core/schema/dmtf/json-schema-installed/Privileges.v1_0_6.json
new file mode 120000
index 0000000..50717ba
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Privileges.v1_0_6.json
@@ -0,0 +1 @@
+../json-schema/Privileges.v1_0_6.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Processor.v1_20_0.json b/redfish-core/schema/dmtf/json-schema-installed/Processor.v1_20_0.json
new file mode 120000
index 0000000..6ac984c
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Processor.v1_20_0.json
@@ -0,0 +1 @@
+../json-schema/Processor.v1_20_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ProcessorCollection.json b/redfish-core/schema/dmtf/json-schema-installed/ProcessorCollection.json
new file mode 120000
index 0000000..31fde44
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ProcessorCollection.json
@@ -0,0 +1 @@
+../json-schema/ProcessorCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Protocol.json b/redfish-core/schema/dmtf/json-schema-installed/Protocol.json
new file mode 120000
index 0000000..dc91202
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Protocol.json
@@ -0,0 +1 @@
+../json-schema/Protocol.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Redundancy.v1_4_2.json b/redfish-core/schema/dmtf/json-schema-installed/Redundancy.v1_4_2.json
new file mode 120000
index 0000000..8021dba
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Redundancy.v1_4_2.json
@@ -0,0 +1 @@
+../json-schema/Redundancy.v1_4_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Resource.v1_19_0.json b/redfish-core/schema/dmtf/json-schema-installed/Resource.v1_19_0.json
new file mode 120000
index 0000000..a4821a2
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Resource.v1_19_0.json
@@ -0,0 +1 @@
+../json-schema/Resource.v1_19_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Role.v1_3_2.json b/redfish-core/schema/dmtf/json-schema-installed/Role.v1_3_2.json
new file mode 120000
index 0000000..7087dc4
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Role.v1_3_2.json
@@ -0,0 +1 @@
+../json-schema/Role.v1_3_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/RoleCollection.json b/redfish-core/schema/dmtf/json-schema-installed/RoleCollection.json
new file mode 120000
index 0000000..3f677e5
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/RoleCollection.json
@@ -0,0 +1 @@
+../json-schema/RoleCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Sensor.v1_9_0.json b/redfish-core/schema/dmtf/json-schema-installed/Sensor.v1_9_0.json
new file mode 120000
index 0000000..769db36
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Sensor.v1_9_0.json
@@ -0,0 +1 @@
+../json-schema/Sensor.v1_9_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/SensorCollection.json b/redfish-core/schema/dmtf/json-schema-installed/SensorCollection.json
new file mode 120000
index 0000000..9588c8d
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/SensorCollection.json
@@ -0,0 +1 @@
+../json-schema/SensorCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ServiceRoot.v1_17_0.json b/redfish-core/schema/dmtf/json-schema-installed/ServiceRoot.v1_17_0.json
new file mode 120000
index 0000000..70647b8
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ServiceRoot.v1_17_0.json
@@ -0,0 +1 @@
+../json-schema/ServiceRoot.v1_17_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Session.v1_7_2.json b/redfish-core/schema/dmtf/json-schema-installed/Session.v1_7_2.json
new file mode 120000
index 0000000..9db71ce
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Session.v1_7_2.json
@@ -0,0 +1 @@
+../json-schema/Session.v1_7_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/SessionCollection.json b/redfish-core/schema/dmtf/json-schema-installed/SessionCollection.json
new file mode 120000
index 0000000..482be72
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/SessionCollection.json
@@ -0,0 +1 @@
+../json-schema/SessionCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/SessionService.v1_1_9.json b/redfish-core/schema/dmtf/json-schema-installed/SessionService.v1_1_9.json
new file mode 120000
index 0000000..b7ecdb1
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/SessionService.v1_1_9.json
@@ -0,0 +1 @@
+../json-schema/SessionService.v1_1_9.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Settings.v1_4_0.json b/redfish-core/schema/dmtf/json-schema-installed/Settings.v1_4_0.json
new file mode 120000
index 0000000..61800c6
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Settings.v1_4_0.json
@@ -0,0 +1 @@
+../json-schema/Settings.v1_4_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/SoftwareInventory.v1_10_2.json b/redfish-core/schema/dmtf/json-schema-installed/SoftwareInventory.v1_10_2.json
new file mode 120000
index 0000000..63482ec
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/SoftwareInventory.v1_10_2.json
@@ -0,0 +1 @@
+../json-schema/SoftwareInventory.v1_10_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/SoftwareInventoryCollection.json b/redfish-core/schema/dmtf/json-schema-installed/SoftwareInventoryCollection.json
new file mode 120000
index 0000000..558b123
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/SoftwareInventoryCollection.json
@@ -0,0 +1 @@
+../json-schema/SoftwareInventoryCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Storage.v1_16_0.json b/redfish-core/schema/dmtf/json-schema-installed/Storage.v1_16_0.json
new file mode 120000
index 0000000..698511d
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Storage.v1_16_0.json
@@ -0,0 +1 @@
+../json-schema/Storage.v1_16_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/StorageCollection.json b/redfish-core/schema/dmtf/json-schema-installed/StorageCollection.json
new file mode 120000
index 0000000..fc3b30a
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/StorageCollection.json
@@ -0,0 +1 @@
+../json-schema/StorageCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/StorageController.v1_7_3.json b/redfish-core/schema/dmtf/json-schema-installed/StorageController.v1_7_3.json
new file mode 120000
index 0000000..d2a6476
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/StorageController.v1_7_3.json
@@ -0,0 +1 @@
+../json-schema/StorageController.v1_7_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/StorageControllerCollection.json b/redfish-core/schema/dmtf/json-schema-installed/StorageControllerCollection.json
new file mode 120000
index 0000000..0bb5dbb
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/StorageControllerCollection.json
@@ -0,0 +1 @@
+../json-schema/StorageControllerCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Task.v1_7_4.json b/redfish-core/schema/dmtf/json-schema-installed/Task.v1_7_4.json
new file mode 120000
index 0000000..09806fa
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Task.v1_7_4.json
@@ -0,0 +1 @@
+../json-schema/Task.v1_7_4.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/TaskCollection.json b/redfish-core/schema/dmtf/json-schema-installed/TaskCollection.json
new file mode 120000
index 0000000..d4c4263
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/TaskCollection.json
@@ -0,0 +1 @@
+../json-schema/TaskCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/TaskService.v1_2_1.json b/redfish-core/schema/dmtf/json-schema-installed/TaskService.v1_2_1.json
new file mode 120000
index 0000000..a154afd
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/TaskService.v1_2_1.json
@@ -0,0 +1 @@
+../json-schema/TaskService.v1_2_1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/TelemetryService.v1_3_4.json b/redfish-core/schema/dmtf/json-schema-installed/TelemetryService.v1_3_4.json
new file mode 120000
index 0000000..529a2d4
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/TelemetryService.v1_3_4.json
@@ -0,0 +1 @@
+../json-schema/TelemetryService.v1_3_4.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Thermal.v1_7_3.json b/redfish-core/schema/dmtf/json-schema-installed/Thermal.v1_7_3.json
new file mode 120000
index 0000000..8928213
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Thermal.v1_7_3.json
@@ -0,0 +1 @@
+../json-schema/Thermal.v1_7_3.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ThermalMetrics.v1_3_2.json b/redfish-core/schema/dmtf/json-schema-installed/ThermalMetrics.v1_3_2.json
new file mode 120000
index 0000000..e900949
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ThermalMetrics.v1_3_2.json
@@ -0,0 +1 @@
+../json-schema/ThermalMetrics.v1_3_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/ThermalSubsystem.v1_3_2.json b/redfish-core/schema/dmtf/json-schema-installed/ThermalSubsystem.v1_3_2.json
new file mode 120000
index 0000000..5f73963
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/ThermalSubsystem.v1_3_2.json
@@ -0,0 +1 @@
+../json-schema/ThermalSubsystem.v1_3_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/Triggers.v1_4_0.json b/redfish-core/schema/dmtf/json-schema-installed/Triggers.v1_4_0.json
new file mode 120000
index 0000000..44f626f
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/Triggers.v1_4_0.json
@@ -0,0 +1 @@
+../json-schema/Triggers.v1_4_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/TriggersCollection.json b/redfish-core/schema/dmtf/json-schema-installed/TriggersCollection.json
new file mode 120000
index 0000000..5e6bbba
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/TriggersCollection.json
@@ -0,0 +1 @@
+../json-schema/TriggersCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/UpdateService.v1_14_0.json b/redfish-core/schema/dmtf/json-schema-installed/UpdateService.v1_14_0.json
new file mode 120000
index 0000000..6842e93
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/UpdateService.v1_14_0.json
@@ -0,0 +1 @@
+../json-schema/UpdateService.v1_14_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/VirtualMedia.v1_6_4.json b/redfish-core/schema/dmtf/json-schema-installed/VirtualMedia.v1_6_4.json
new file mode 120000
index 0000000..8b7032e
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/VirtualMedia.v1_6_4.json
@@ -0,0 +1 @@
+../json-schema/VirtualMedia.v1_6_4.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/VirtualMediaCollection.json b/redfish-core/schema/dmtf/json-schema-installed/VirtualMediaCollection.json
new file mode 120000
index 0000000..76ca0ef
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/VirtualMediaCollection.json
@@ -0,0 +1 @@
+../json-schema/VirtualMediaCollection.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/odata-v4.json b/redfish-core/schema/dmtf/json-schema-installed/odata-v4.json
new file mode 120000
index 0000000..63af96e
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/odata-v4.json
@@ -0,0 +1 @@
+../json-schema/odata-v4.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/odata.v4_0_5.json b/redfish-core/schema/dmtf/json-schema-installed/odata.v4_0_5.json
new file mode 120000
index 0000000..e25f354
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/odata.v4_0_5.json
@@ -0,0 +1 @@
+../json-schema/odata.v4_0_5.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/redfish-error.v1_0_2.json b/redfish-core/schema/dmtf/json-schema-installed/redfish-error.v1_0_2.json
new file mode 120000
index 0000000..df50b05
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/redfish-error.v1_0_2.json
@@ -0,0 +1 @@
+../json-schema/redfish-error.v1_0_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/redfish-payload-annotations.v1_2_2.json b/redfish-core/schema/dmtf/json-schema-installed/redfish-payload-annotations.v1_2_2.json
new file mode 120000
index 0000000..4fdb922
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/redfish-payload-annotations.v1_2_2.json
@@ -0,0 +1 @@
+../json-schema/redfish-payload-annotations.v1_2_2.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/redfish-schema-v1.json b/redfish-core/schema/dmtf/json-schema-installed/redfish-schema-v1.json
new file mode 120000
index 0000000..d80643c
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/redfish-schema-v1.json
@@ -0,0 +1 @@
+../json-schema/redfish-schema-v1.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema-installed/redfish-schema.v1_10_0.json b/redfish-core/schema/dmtf/json-schema-installed/redfish-schema.v1_10_0.json
new file mode 120000
index 0000000..56d4f75
--- /dev/null
+++ b/redfish-core/schema/dmtf/json-schema-installed/redfish-schema.v1_10_0.json
@@ -0,0 +1 @@
+../json-schema/redfish-schema.v1_10_0.json
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/meson.build b/redfish-core/schema/dmtf/meson.build
new file mode 100644
index 0000000..b827cc4
--- /dev/null
+++ b/redfish-core/schema/dmtf/meson.build
@@ -0,0 +1,11 @@
+install_subdir(
+    'installed',
+    install_dir: 'share/www/redfish/v1/schema',
+    strip_directory: true,
+)
+
+install_subdir(
+    'json-schema-installed',
+    install_dir: 'share/www/redfish/v1/JsonSchemas',
+    strip_directory: true,
+)
\ No newline at end of file
diff --git a/redfish-core/schema/meson.build b/redfish-core/schema/meson.build
new file mode 100644
index 0000000..279b408
--- /dev/null
+++ b/redfish-core/schema/meson.build
@@ -0,0 +1,2 @@
+subdir('dmtf')
+subdir('oem')
\ No newline at end of file
diff --git a/redfish-core/schema/oem/meson.build b/redfish-core/schema/oem/meson.build
new file mode 100644
index 0000000..2a2dc1d
--- /dev/null
+++ b/redfish-core/schema/oem/meson.build
@@ -0,0 +1 @@
+subdir('openbmc')
\ No newline at end of file
diff --git a/redfish-core/schema/oem/openbmc/meson.build b/redfish-core/schema/oem/openbmc/meson.build
new file mode 100644
index 0000000..651aaaf
--- /dev/null
+++ b/redfish-core/schema/oem/openbmc/meson.build
@@ -0,0 +1,21 @@
+# Mapping from option key name to schemas that should be installed if that option is enabled
+schemas = {
+    'insecure-disable-auth': 'OpenBMCAccountService',
+    'redfish-oem-manager-fan-data': 'OemManager',
+    'redfish-provisioning-feature': 'OemComputerSystem',
+    #'vm-nbdproxy': 'OemVirtualMedia',
+}
+
+foreach option_key, schema : schemas
+    if get_option(option_key).allowed()
+        install_data(
+            'csdl/@0@_v1.xml'.format(schema),
+            install_dir: '/var/www/redfish/v1/schema',
+        )
+
+        install_data(
+            'json-schema/@0@.json'.format(schema),
+            install_dir: '/var/www/redfish/v1/JsonSchema/@0@'.format(schema),
+        )
+    endif
+endforeach
\ No newline at end of file
diff --git a/scripts/generate_schema_enums.py b/scripts/generate_schema_enums.py
index fb39b98..d827501 100755
--- a/scripts/generate_schema_enums.py
+++ b/scripts/generate_schema_enums.py
@@ -140,11 +140,14 @@
     filepaths = []
     for root, dirs, files in os.walk(REDFISH_SCHEMA_DIR):
         for csdl_file in files:
+            filepath = os.path.join(root, csdl_file)
+            if os.path.islink(filepath):
+                continue
             if csdl_file.endswith(".xml"):
-                filepaths.append(os.path.join(root, csdl_file))
+                filepaths.append(filepath)
     print(filepaths)
     enum_list = []
-
+    filepaths.sort()
     for filepath in filepaths:
         out = parse_file(filepath)
         enum_list.extend(out)
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index febaf39..4207c53 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -11,17 +11,6 @@
 
 VERSION = "DSP8010_2024.1"
 
-WARNING = """/****************************************************************
- *                 READ THIS WARNING FIRST
- * This is an auto-generated header which contains definitions
- * for Redfish DMTF defined schemas.
- * DO NOT modify this registry outside of running the
- * update_schemas.py script.  The definitions contained within
- * this file are owned by DMTF.  Any modifications to these files
- * should be first pushed to the relevant registry in the DMTF
- * github organization.
- ***************************************************************/"""
-
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 proxies = {"https": os.environ.get("https_proxy", None)}
@@ -35,22 +24,13 @@
 
 r.raise_for_status()
 
+redfish_core_path = os.path.join(SCRIPT_DIR, "..", "redfish-core")
 
-static_path = os.path.realpath(
-    os.path.join(SCRIPT_DIR, "..", "static", "redfish", "v1")
-)
+cpp_path = os.path.realpath(os.path.join(redfish_core_path, "include"))
 
-
-cpp_path = os.path.realpath(
-    os.path.join(SCRIPT_DIR, "..", "redfish-core", "include")
-)
-
-
-schema_path = os.path.join(
-    SCRIPT_DIR, "..", "redfish-core", "schema", "dmtf", "csdl"
-)
+schema_path = os.path.join(redfish_core_path, "schema", "dmtf", "csdl")
 json_schema_path = os.path.join(
-    SCRIPT_DIR, "..", "redfish-core", "schema", "dmtf", "json-schema"
+    redfish_core_path, "schema", "dmtf", "json-schema"
 )
 
 zipBytesIO = BytesIO(r.content)
@@ -83,36 +63,16 @@
         return self.version_pieces < other.version_pieces
 
 
-# Remove the old files
-skip_prefixes = ["Oem", "OpenBMC"]
-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 f in files:
-        os.remove(f)
-if os.path.exists(json_schema_path):
-    files = [
-        os.path.join(json_schema_path, f)
-        for f in os.listdir(json_schema_path)
-        if not any([f.startswith(prefix) for prefix in skip_prefixes])
-    ]
-    for f in files:
-        if os.path.isfile(f):
-            os.remove(f)
-        else:
-            shutil.rmtree(f)
+shutil.rmtree(schema_path)
+os.makedirs(schema_path)
 
-if not os.path.exists(schema_path):
-    os.makedirs(schema_path)
-if not os.path.exists(json_schema_path):
-    os.makedirs(json_schema_path)
+shutil.rmtree(json_schema_path)
+os.makedirs(json_schema_path)
 
 csdl_filenames = []
 json_schema_files = defaultdict(list)
 
+
 for zip_file in zip_ref.infolist():
     if zip_file.is_dir():
         continue
@@ -135,44 +95,23 @@
 json_schema_files = OrderedDict(
     sorted(json_schema_files.items(), key=lambda x: SchemaVersion(x[0]))
 )
+
+
 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)
 
-for schema, version in json_schema_files.items():
-    zip_filepath = os.path.join("json-schema", version[0])
+for schema_filename, versions in json_schema_files.items():
+    zip_filepath = os.path.join("json-schema", versions[0])
 
-    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"
-        "// clang-format off\n"
-        "#include <array>\n"
-        "#include <string_view>\n"
-        "\n"
-        "namespace redfish\n"
-        "{{\n"
-        "    constexpr std::array<std::string_view,{SIZE}> schemas {{\n".format(
-            WARNING=WARNING,
-            SIZE=len(schemas),
-        )
-    )
-    for schema in schemas:
-        hpp_file.write('        "{}",\n'.format(schema))
-
-    hpp_file.write("    };\n}\n")
+    with open(
+        os.path.join(json_schema_path, versions[0]), "wb"
+    ) as schema_file:
+        content = zip_ref.read(zip_filepath)
+        content = content.replace(b"\r\n", b"\n")
+        schema_file.write(content)
 
 zip_ref.close()
 
diff --git a/src/json_html_serializer.cpp b/src/json_html_serializer.cpp
index df34e2b..d35cab9 100644
--- a/src/json_html_serializer.cpp
+++ b/src/json_html_serializer.cpp
@@ -556,11 +556,11 @@
     out += "<html>\n"
            "<head>\n"
            "<title>Redfish API</title>\n"
-           "<link href=\"/redfish.css\" rel=\"stylesheet\">\n"
+           "<link href=\"/styles/redfish.css\" rel=\"stylesheet\">\n"
            "</head>\n"
            "<body>\n"
            "<div class=\"container\">\n"
-           "<img src=\"/DMTF_Redfish_logo_2017.svg\" alt=\"redfish\" "
+           "<img src=\"/images/DMTF_Redfish_logo_2017.svg\" alt=\"redfish\" "
            "height=\"406px\" "
            "width=\"576px\">\n"
            "<div class=\"content\">\n";
diff --git a/static/DMTF_Redfish_logo_2017.svg b/static/images/DMTF_Redfish_logo_2017.svg
similarity index 100%
rename from static/DMTF_Redfish_logo_2017.svg
rename to static/images/DMTF_Redfish_logo_2017.svg
diff --git a/static/meson.build b/static/meson.build
new file mode 100644
index 0000000..3629781
--- /dev/null
+++ b/static/meson.build
@@ -0,0 +1,7 @@
+if get_option('google-api').allowed()
+    install_subdir('google', install_dir: 'share/www')
+endif
+
+install_subdir('images', install_dir: 'share/www')
+
+install_subdir('styles', install_dir: 'share/www')
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AccountService/AccountService.json b/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
deleted file mode 120000
index a5e15b4..0000000
--- a/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/AccountService.v1_15_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ActionInfo/ActionInfo.json b/static/redfish/v1/JsonSchemas/ActionInfo/ActionInfo.json
deleted file mode 120000
index d67643e..0000000
--- a/static/redfish/v1/JsonSchemas/ActionInfo/ActionInfo.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ActionInfo.v1_4_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json b/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json
deleted file mode 120000
index b1d7b2e..0000000
--- a/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/AggregationService.v1_0_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json b/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json
deleted file mode 120000
index 591a62e..0000000
--- a/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AggregationSourceCollection/AggregationSourceCollection.json b/static/redfish/v1/JsonSchemas/AggregationSourceCollection/AggregationSourceCollection.json
deleted file mode 120000
index 13e9183..0000000
--- a/static/redfish/v1/JsonSchemas/AggregationSourceCollection/AggregationSourceCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/AggregationSourceCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Assembly/Assembly.json b/static/redfish/v1/JsonSchemas/Assembly/Assembly.json
deleted file mode 120000
index 1c94bf5..0000000
--- a/static/redfish/v1/JsonSchemas/Assembly/Assembly.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Assembly.v1_5_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json b/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json
deleted file mode 120000
index 8b4f925..0000000
--- a/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/AttributeRegistry.v1_3_9.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Bios/Bios.json b/static/redfish/v1/JsonSchemas/Bios/Bios.json
deleted file mode 120000
index f122c90..0000000
--- a/static/redfish/v1/JsonSchemas/Bios/Bios.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Bios.v1_2_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Cable/Cable.json b/static/redfish/v1/JsonSchemas/Cable/Cable.json
deleted file mode 120000
index c56cd88..0000000
--- a/static/redfish/v1/JsonSchemas/Cable/Cable.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Cable.v1_2_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/CableCollection/CableCollection.json b/static/redfish/v1/JsonSchemas/CableCollection/CableCollection.json
deleted file mode 120000
index c8cf79e..0000000
--- a/static/redfish/v1/JsonSchemas/CableCollection/CableCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/CableCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Certificate/Certificate.json b/static/redfish/v1/JsonSchemas/Certificate/Certificate.json
deleted file mode 120000
index 7ffb3e3..0000000
--- a/static/redfish/v1/JsonSchemas/Certificate/Certificate.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Certificate.v1_8_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/CertificateCollection/CertificateCollection.json b/static/redfish/v1/JsonSchemas/CertificateCollection/CertificateCollection.json
deleted file mode 120000
index f7d9bea..0000000
--- a/static/redfish/v1/JsonSchemas/CertificateCollection/CertificateCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/CertificateCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/CertificateLocations/CertificateLocations.json b/static/redfish/v1/JsonSchemas/CertificateLocations/CertificateLocations.json
deleted file mode 120000
index a01d4f3..0000000
--- a/static/redfish/v1/JsonSchemas/CertificateLocations/CertificateLocations.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/CertificateLocations.v1_0_4.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json b/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json
deleted file mode 120000
index b6966ef..0000000
--- a/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_5.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Chassis/Chassis.json b/static/redfish/v1/JsonSchemas/Chassis/Chassis.json
deleted file mode 120000
index bac36e5..0000000
--- a/static/redfish/v1/JsonSchemas/Chassis/Chassis.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Chassis.v1_25_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ChassisCollection/ChassisCollection.json b/static/redfish/v1/JsonSchemas/ChassisCollection/ChassisCollection.json
deleted file mode 120000
index 856794c..0000000
--- a/static/redfish/v1/JsonSchemas/ChassisCollection/ChassisCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ChassisCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ComponentIntegrity/ComponentIntegrity.json b/static/redfish/v1/JsonSchemas/ComponentIntegrity/ComponentIntegrity.json
deleted file mode 120000
index bc50526..0000000
--- a/static/redfish/v1/JsonSchemas/ComponentIntegrity/ComponentIntegrity.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_2_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ComponentIntegrityCollection/ComponentIntegrityCollection.json b/static/redfish/v1/JsonSchemas/ComponentIntegrityCollection/ComponentIntegrityCollection.json
deleted file mode 120000
index 005c7d1..0000000
--- a/static/redfish/v1/JsonSchemas/ComponentIntegrityCollection/ComponentIntegrityCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ComponentIntegrityCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json b/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json
deleted file mode 120000
index 2d106df..0000000
--- a/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ComputerSystemCollection/ComputerSystemCollection.json b/static/redfish/v1/JsonSchemas/ComputerSystemCollection/ComputerSystemCollection.json
deleted file mode 120000
index b44d7b8..0000000
--- a/static/redfish/v1/JsonSchemas/ComputerSystemCollection/ComputerSystemCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ComputerSystemCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Drive/Drive.json b/static/redfish/v1/JsonSchemas/Drive/Drive.json
deleted file mode 120000
index 6a87e2a..0000000
--- a/static/redfish/v1/JsonSchemas/Drive/Drive.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Drive.v1_19_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/DriveCollection/DriveCollection.json b/static/redfish/v1/JsonSchemas/DriveCollection/DriveCollection.json
deleted file mode 120000
index a743ef6..0000000
--- a/static/redfish/v1/JsonSchemas/DriveCollection/DriveCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/DriveCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json b/static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json
deleted file mode 120000
index eab3c37..0000000
--- a/static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/EnvironmentMetrics.v1_3_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json b/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json
deleted file mode 120000
index d45d054..0000000
--- a/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EthernetInterfaceCollection/EthernetInterfaceCollection.json b/static/redfish/v1/JsonSchemas/EthernetInterfaceCollection/EthernetInterfaceCollection.json
deleted file mode 120000
index 7cc32ad..0000000
--- a/static/redfish/v1/JsonSchemas/EthernetInterfaceCollection/EthernetInterfaceCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/EthernetInterfaceCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Event/Event.json b/static/redfish/v1/JsonSchemas/Event/Event.json
deleted file mode 120000
index 5e46f70..0000000
--- a/static/redfish/v1/JsonSchemas/Event/Event.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Event.v1_10_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json b/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json
deleted file mode 120000
index 64e985a..0000000
--- a/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/EventDestination.v1_14_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EventDestinationCollection/EventDestinationCollection.json b/static/redfish/v1/JsonSchemas/EventDestinationCollection/EventDestinationCollection.json
deleted file mode 120000
index afb08ef..0000000
--- a/static/redfish/v1/JsonSchemas/EventDestinationCollection/EventDestinationCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/EventDestinationCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EventService/EventService.json b/static/redfish/v1/JsonSchemas/EventService/EventService.json
deleted file mode 120000
index fd1caaf..0000000
--- a/static/redfish/v1/JsonSchemas/EventService/EventService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/EventService.v1_10_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/FabricAdapter/FabricAdapter.json b/static/redfish/v1/JsonSchemas/FabricAdapter/FabricAdapter.json
deleted file mode 120000
index 9e8878f..0000000
--- a/static/redfish/v1/JsonSchemas/FabricAdapter/FabricAdapter.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/FabricAdapter.v1_5_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/FabricAdapterCollection/FabricAdapterCollection.json b/static/redfish/v1/JsonSchemas/FabricAdapterCollection/FabricAdapterCollection.json
deleted file mode 120000
index 3c77059..0000000
--- a/static/redfish/v1/JsonSchemas/FabricAdapterCollection/FabricAdapterCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/FabricAdapterCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Fan/Fan.json b/static/redfish/v1/JsonSchemas/Fan/Fan.json
deleted file mode 120000
index 6c8329e..0000000
--- a/static/redfish/v1/JsonSchemas/Fan/Fan.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Fan.v1_5_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/FanCollection/FanCollection.json b/static/redfish/v1/JsonSchemas/FanCollection/FanCollection.json
deleted file mode 120000
index dafe359..0000000
--- a/static/redfish/v1/JsonSchemas/FanCollection/FanCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/FanCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/IPAddresses/IPAddresses.json b/static/redfish/v1/JsonSchemas/IPAddresses/IPAddresses.json
deleted file mode 120000
index a95c056..0000000
--- a/static/redfish/v1/JsonSchemas/IPAddresses/IPAddresses.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/IPAddresses.v1_1_5.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/JsonSchemaFile/JsonSchemaFile.json b/static/redfish/v1/JsonSchemas/JsonSchemaFile/JsonSchemaFile.json
deleted file mode 120000
index 467c1ad..0000000
--- a/static/redfish/v1/JsonSchemas/JsonSchemaFile/JsonSchemaFile.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/JsonSchemaFile.v1_1_5.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/JsonSchemaFileCollection/JsonSchemaFileCollection.json b/static/redfish/v1/JsonSchemas/JsonSchemaFileCollection/JsonSchemaFileCollection.json
deleted file mode 120000
index 3e212eb..0000000
--- a/static/redfish/v1/JsonSchemas/JsonSchemaFileCollection/JsonSchemaFileCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/JsonSchemaFileCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json b/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json
deleted file mode 120000
index 3f1d211..0000000
--- a/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/LogEntryCollection/LogEntryCollection.json b/static/redfish/v1/JsonSchemas/LogEntryCollection/LogEntryCollection.json
deleted file mode 120000
index e98301d..0000000
--- a/static/redfish/v1/JsonSchemas/LogEntryCollection/LogEntryCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/LogEntryCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/LogService/LogService.json b/static/redfish/v1/JsonSchemas/LogService/LogService.json
deleted file mode 120000
index 72e32d8..0000000
--- a/static/redfish/v1/JsonSchemas/LogService/LogService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/LogService.v1_7_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/LogServiceCollection/LogServiceCollection.json b/static/redfish/v1/JsonSchemas/LogServiceCollection/LogServiceCollection.json
deleted file mode 120000
index f870797..0000000
--- a/static/redfish/v1/JsonSchemas/LogServiceCollection/LogServiceCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/LogServiceCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Manager/Manager.json b/static/redfish/v1/JsonSchemas/Manager/Manager.json
deleted file mode 120000
index 2bda1bf..0000000
--- a/static/redfish/v1/JsonSchemas/Manager/Manager.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Manager.v1_19_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json b/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
deleted file mode 120000
index 9d8fc38..0000000
--- a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_12_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerAccountCollection/ManagerAccountCollection.json b/static/redfish/v1/JsonSchemas/ManagerAccountCollection/ManagerAccountCollection.json
deleted file mode 120000
index 0d62f8b..0000000
--- a/static/redfish/v1/JsonSchemas/ManagerAccountCollection/ManagerAccountCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ManagerAccountCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerCollection/ManagerCollection.json b/static/redfish/v1/JsonSchemas/ManagerCollection/ManagerCollection.json
deleted file mode 120000
index c997556..0000000
--- a/static/redfish/v1/JsonSchemas/ManagerCollection/ManagerCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ManagerCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerDiagnosticData/ManagerDiagnosticData.json b/static/redfish/v1/JsonSchemas/ManagerDiagnosticData/ManagerDiagnosticData.json
deleted file mode 120000
index c3652d5..0000000
--- a/static/redfish/v1/JsonSchemas/ManagerDiagnosticData/ManagerDiagnosticData.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ManagerDiagnosticData.v1_2_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json b/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
deleted file mode 120000
index c9dc88a..0000000
--- a/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ManagerNetworkProtocol.v1_10_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Memory/Memory.json b/static/redfish/v1/JsonSchemas/Memory/Memory.json
deleted file mode 120000
index dc74b09..0000000
--- a/static/redfish/v1/JsonSchemas/Memory/Memory.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Memory.v1_20_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MemoryCollection/MemoryCollection.json b/static/redfish/v1/JsonSchemas/MemoryCollection/MemoryCollection.json
deleted file mode 120000
index bfcb19f..0000000
--- a/static/redfish/v1/JsonSchemas/MemoryCollection/MemoryCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MemoryCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Message/Message.json b/static/redfish/v1/JsonSchemas/Message/Message.json
deleted file mode 120000
index 66bb0a5..0000000
--- a/static/redfish/v1/JsonSchemas/Message/Message.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Message.v1_2_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json b/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
deleted file mode 120000
index 620448f..0000000
--- a/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MessageRegistry.v1_6_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistryCollection/MessageRegistryCollection.json b/static/redfish/v1/JsonSchemas/MessageRegistryCollection/MessageRegistryCollection.json
deleted file mode 120000
index 24fffda..0000000
--- a/static/redfish/v1/JsonSchemas/MessageRegistryCollection/MessageRegistryCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MessageRegistryCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistryFile/MessageRegistryFile.json b/static/redfish/v1/JsonSchemas/MessageRegistryFile/MessageRegistryFile.json
deleted file mode 120000
index 8f7c64d..0000000
--- a/static/redfish/v1/JsonSchemas/MessageRegistryFile/MessageRegistryFile.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MessageRegistryFile.v1_1_5.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistryFileCollection/MessageRegistryFileCollection.json b/static/redfish/v1/JsonSchemas/MessageRegistryFileCollection/MessageRegistryFileCollection.json
deleted file mode 120000
index 094a410..0000000
--- a/static/redfish/v1/JsonSchemas/MessageRegistryFileCollection/MessageRegistryFileCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MessageRegistryFileCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json b/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
deleted file mode 120000
index 2802dd4..0000000
--- a/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MetricDefinition.v1_3_4.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricDefinitionCollection/MetricDefinitionCollection.json b/static/redfish/v1/JsonSchemas/MetricDefinitionCollection/MetricDefinitionCollection.json
deleted file mode 120000
index 90963c8..0000000
--- a/static/redfish/v1/JsonSchemas/MetricDefinitionCollection/MetricDefinitionCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MetricDefinitionCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json b/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json
deleted file mode 120000
index fce292f..0000000
--- a/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricReportCollection/MetricReportCollection.json b/static/redfish/v1/JsonSchemas/MetricReportCollection/MetricReportCollection.json
deleted file mode 120000
index 9df6fd6..0000000
--- a/static/redfish/v1/JsonSchemas/MetricReportCollection/MetricReportCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MetricReportCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json b/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json
deleted file mode 120000
index 5ac8ee2..0000000
--- a/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MetricReportDefinition.v1_4_6.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricReportDefinitionCollection/MetricReportDefinitionCollection.json b/static/redfish/v1/JsonSchemas/MetricReportDefinitionCollection/MetricReportDefinitionCollection.json
deleted file mode 120000
index c18f89b..0000000
--- a/static/redfish/v1/JsonSchemas/MetricReportDefinitionCollection/MetricReportDefinitionCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/MetricReportDefinitionCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json b/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json
deleted file mode 120000
index b4b7832..0000000
--- a/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/OperatingConfig.v1_0_4.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/OperatingConfigCollection/OperatingConfigCollection.json b/static/redfish/v1/JsonSchemas/OperatingConfigCollection/OperatingConfigCollection.json
deleted file mode 120000
index a2c82d1..0000000
--- a/static/redfish/v1/JsonSchemas/OperatingConfigCollection/OperatingConfigCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/OperatingConfigCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json b/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
deleted file mode 120000
index 588d9cd..0000000
--- a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_14_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PCIeDeviceCollection/PCIeDeviceCollection.json b/static/redfish/v1/JsonSchemas/PCIeDeviceCollection/PCIeDeviceCollection.json
deleted file mode 120000
index 31c19b0..0000000
--- a/static/redfish/v1/JsonSchemas/PCIeDeviceCollection/PCIeDeviceCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PCIeDeviceCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json b/static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json
deleted file mode 120000
index c087855..0000000
--- a/static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PCIeFunction.v1_6_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PCIeFunctionCollection/PCIeFunctionCollection.json b/static/redfish/v1/JsonSchemas/PCIeFunctionCollection/PCIeFunctionCollection.json
deleted file mode 120000
index ed326c6..0000000
--- a/static/redfish/v1/JsonSchemas/PCIeFunctionCollection/PCIeFunctionCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PCIeFunctionCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json b/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json
deleted file mode 120000
index 8ca9fef..0000000
--- a/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PCIeSlots.v1_6_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PhysicalContext/PhysicalContext.json b/static/redfish/v1/JsonSchemas/PhysicalContext/PhysicalContext.json
deleted file mode 120000
index dd62b7e..0000000
--- a/static/redfish/v1/JsonSchemas/PhysicalContext/PhysicalContext.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PhysicalContext.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Port/Port.json b/static/redfish/v1/JsonSchemas/Port/Port.json
deleted file mode 120000
index 7e1c394..0000000
--- a/static/redfish/v1/JsonSchemas/Port/Port.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Port.v1_12_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PortCollection/PortCollection.json b/static/redfish/v1/JsonSchemas/PortCollection/PortCollection.json
deleted file mode 120000
index c730915..0000000
--- a/static/redfish/v1/JsonSchemas/PortCollection/PortCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PortCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Power/Power.json b/static/redfish/v1/JsonSchemas/Power/Power.json
deleted file mode 120000
index 12f166b..0000000
--- a/static/redfish/v1/JsonSchemas/Power/Power.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Power.v1_7_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json b/static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json
deleted file mode 120000
index f399bf7..0000000
--- a/static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json b/static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json
deleted file mode 120000
index 3370a35..0000000
--- a/static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PowerSupply.v1_6_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSupplyCollection/PowerSupplyCollection.json b/static/redfish/v1/JsonSchemas/PowerSupplyCollection/PowerSupplyCollection.json
deleted file mode 120000
index 84c7af9..0000000
--- a/static/redfish/v1/JsonSchemas/PowerSupplyCollection/PowerSupplyCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/PowerSupplyCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Privileges/Privileges.json b/static/redfish/v1/JsonSchemas/Privileges/Privileges.json
deleted file mode 120000
index 4921f5f..0000000
--- a/static/redfish/v1/JsonSchemas/Privileges/Privileges.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Privileges.v1_0_6.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Processor/Processor.json b/static/redfish/v1/JsonSchemas/Processor/Processor.json
deleted file mode 120000
index f281898..0000000
--- a/static/redfish/v1/JsonSchemas/Processor/Processor.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Processor.v1_20_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ProcessorCollection/ProcessorCollection.json b/static/redfish/v1/JsonSchemas/ProcessorCollection/ProcessorCollection.json
deleted file mode 120000
index 7af4e53..0000000
--- a/static/redfish/v1/JsonSchemas/ProcessorCollection/ProcessorCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ProcessorCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Protocol/Protocol.json b/static/redfish/v1/JsonSchemas/Protocol/Protocol.json
deleted file mode 120000
index 6f74cf0..0000000
--- a/static/redfish/v1/JsonSchemas/Protocol/Protocol.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Protocol.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json b/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json
deleted file mode 120000
index 32e4587..0000000
--- a/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Redundancy.v1_4_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Resource/Resource.json b/static/redfish/v1/JsonSchemas/Resource/Resource.json
deleted file mode 120000
index 54d12a7..0000000
--- a/static/redfish/v1/JsonSchemas/Resource/Resource.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Resource.v1_19_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Role/Role.json b/static/redfish/v1/JsonSchemas/Role/Role.json
deleted file mode 120000
index 65aa1ec..0000000
--- a/static/redfish/v1/JsonSchemas/Role/Role.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Role.v1_3_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/RoleCollection/RoleCollection.json b/static/redfish/v1/JsonSchemas/RoleCollection/RoleCollection.json
deleted file mode 120000
index 9e55aa5..0000000
--- a/static/redfish/v1/JsonSchemas/RoleCollection/RoleCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/RoleCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json b/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
deleted file mode 120000
index 249c963..0000000
--- a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Sensor.v1_9_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SensorCollection/SensorCollection.json b/static/redfish/v1/JsonSchemas/SensorCollection/SensorCollection.json
deleted file mode 120000
index 5bfdfe0..0000000
--- a/static/redfish/v1/JsonSchemas/SensorCollection/SensorCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/SensorCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json b/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
deleted file mode 120000
index fcd90d9..0000000
--- a/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ServiceRoot.v1_17_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Session/Session.json b/static/redfish/v1/JsonSchemas/Session/Session.json
deleted file mode 120000
index 805d658..0000000
--- a/static/redfish/v1/JsonSchemas/Session/Session.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Session.v1_7_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SessionCollection/SessionCollection.json b/static/redfish/v1/JsonSchemas/SessionCollection/SessionCollection.json
deleted file mode 120000
index 1f3ccd2..0000000
--- a/static/redfish/v1/JsonSchemas/SessionCollection/SessionCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/SessionCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SessionService/SessionService.json b/static/redfish/v1/JsonSchemas/SessionService/SessionService.json
deleted file mode 120000
index 4567331..0000000
--- a/static/redfish/v1/JsonSchemas/SessionService/SessionService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/SessionService.v1_1_9.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Settings/Settings.json b/static/redfish/v1/JsonSchemas/Settings/Settings.json
deleted file mode 120000
index 286b6c4..0000000
--- a/static/redfish/v1/JsonSchemas/Settings/Settings.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Settings.v1_4_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json b/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json
deleted file mode 120000
index 375405a..0000000
--- a/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/SoftwareInventory.v1_10_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SoftwareInventoryCollection/SoftwareInventoryCollection.json b/static/redfish/v1/JsonSchemas/SoftwareInventoryCollection/SoftwareInventoryCollection.json
deleted file mode 120000
index b4fc973..0000000
--- a/static/redfish/v1/JsonSchemas/SoftwareInventoryCollection/SoftwareInventoryCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/SoftwareInventoryCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Storage/Storage.json b/static/redfish/v1/JsonSchemas/Storage/Storage.json
deleted file mode 120000
index 4fe0dfd..0000000
--- a/static/redfish/v1/JsonSchemas/Storage/Storage.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Storage.v1_16_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/StorageCollection/StorageCollection.json b/static/redfish/v1/JsonSchemas/StorageCollection/StorageCollection.json
deleted file mode 120000
index 7e3d2d8..0000000
--- a/static/redfish/v1/JsonSchemas/StorageCollection/StorageCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/StorageCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/StorageController/StorageController.json b/static/redfish/v1/JsonSchemas/StorageController/StorageController.json
deleted file mode 120000
index 4aaca90..0000000
--- a/static/redfish/v1/JsonSchemas/StorageController/StorageController.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/StorageController.v1_7_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/StorageControllerCollection/StorageControllerCollection.json b/static/redfish/v1/JsonSchemas/StorageControllerCollection/StorageControllerCollection.json
deleted file mode 120000
index 2fc1bd8..0000000
--- a/static/redfish/v1/JsonSchemas/StorageControllerCollection/StorageControllerCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/StorageControllerCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Task/Task.json b/static/redfish/v1/JsonSchemas/Task/Task.json
deleted file mode 120000
index 6918f74..0000000
--- a/static/redfish/v1/JsonSchemas/Task/Task.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Task.v1_7_4.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/TaskCollection/TaskCollection.json b/static/redfish/v1/JsonSchemas/TaskCollection/TaskCollection.json
deleted file mode 120000
index 260775f..0000000
--- a/static/redfish/v1/JsonSchemas/TaskCollection/TaskCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/TaskCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/TaskService/TaskService.json b/static/redfish/v1/JsonSchemas/TaskService/TaskService.json
deleted file mode 120000
index 8e5f2f5..0000000
--- a/static/redfish/v1/JsonSchemas/TaskService/TaskService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/TaskService.v1_2_1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json b/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json
deleted file mode 120000
index 1c104cb..0000000
--- a/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/TelemetryService.v1_3_4.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Thermal/Thermal.json b/static/redfish/v1/JsonSchemas/Thermal/Thermal.json
deleted file mode 120000
index f53854a..0000000
--- a/static/redfish/v1/JsonSchemas/Thermal/Thermal.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Thermal.v1_7_3.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json b/static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json
deleted file mode 120000
index 6599762..0000000
--- a/static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ThermalMetrics.v1_3_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json b/static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json
deleted file mode 120000
index 14bf070..0000000
--- a/static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Triggers/Triggers.json b/static/redfish/v1/JsonSchemas/Triggers/Triggers.json
deleted file mode 120000
index 520655d..0000000
--- a/static/redfish/v1/JsonSchemas/Triggers/Triggers.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/Triggers.v1_4_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/TriggersCollection/TriggersCollection.json b/static/redfish/v1/JsonSchemas/TriggersCollection/TriggersCollection.json
deleted file mode 120000
index b1dbe6b..0000000
--- a/static/redfish/v1/JsonSchemas/TriggersCollection/TriggersCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/TriggersCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json b/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
deleted file mode 120000
index a9214df..0000000
--- a/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_0.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/VirtualMedia/VirtualMedia.json b/static/redfish/v1/JsonSchemas/VirtualMedia/VirtualMedia.json
deleted file mode 120000
index 9736b6f..0000000
--- a/static/redfish/v1/JsonSchemas/VirtualMedia/VirtualMedia.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/VirtualMedia.v1_6_4.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/VirtualMediaCollection/VirtualMediaCollection.json b/static/redfish/v1/JsonSchemas/VirtualMediaCollection/VirtualMediaCollection.json
deleted file mode 120000
index db6ff6b..0000000
--- a/static/redfish/v1/JsonSchemas/VirtualMediaCollection/VirtualMediaCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/VirtualMediaCollection.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/odata-v4/odata-v4.json b/static/redfish/v1/JsonSchemas/odata-v4/odata-v4.json
deleted file mode 120000
index 65d7844..0000000
--- a/static/redfish/v1/JsonSchemas/odata-v4/odata-v4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/odata-v4.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/odata/odata.json b/static/redfish/v1/JsonSchemas/odata/odata.json
deleted file mode 120000
index 72ce77d..0000000
--- a/static/redfish/v1/JsonSchemas/odata/odata.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/odata.v4_0_5.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/redfish-error/redfish-error.json b/static/redfish/v1/JsonSchemas/redfish-error/redfish-error.json
deleted file mode 120000
index 895982f..0000000
--- a/static/redfish/v1/JsonSchemas/redfish-error/redfish-error.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/redfish-error.v1_0_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/redfish-payload-annotations/redfish-payload-annotations.json b/static/redfish/v1/JsonSchemas/redfish-payload-annotations/redfish-payload-annotations.json
deleted file mode 120000
index 7184110..0000000
--- a/static/redfish/v1/JsonSchemas/redfish-payload-annotations/redfish-payload-annotations.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/redfish-payload-annotations.v1_2_2.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/redfish-schema-v1/redfish-schema-v1.json b/static/redfish/v1/JsonSchemas/redfish-schema-v1/redfish-schema-v1.json
deleted file mode 120000
index 493127a..0000000
--- a/static/redfish/v1/JsonSchemas/redfish-schema-v1/redfish-schema-v1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/redfish-schema-v1.json
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json b/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json
deleted file mode 120000
index 8d6aa80..0000000
--- a/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_0.json
\ No newline at end of file
diff --git a/static/redfish.css b/static/styles/redfish.css
similarity index 100%
rename from static/redfish.css
rename to static/styles/redfish.css
diff --git a/test/include/json_html_serializer.cpp b/test/include/json_html_serializer.cpp
index b941a59..69ac51a 100644
--- a/test/include/json_html_serializer.cpp
+++ b/test/include/json_html_serializer.cpp
@@ -19,11 +19,11 @@
     "<html>\n"
     "<head>\n"
     "<title>Redfish API</title>\n"
-    "<link href=\"/redfish.css\" rel=\"stylesheet\">\n"
+    "<link href=\"/styles/redfish.css\" rel=\"stylesheet\">\n"
     "</head>\n"
     "<body>\n"
     "<div class=\"container\">\n"
-    "<img src=\"/DMTF_Redfish_logo_2017.svg\" alt=\"redfish\" height=\"406px\" width=\"576px\">\n";
+    "<img src=\"/images/DMTF_Redfish_logo_2017.svg\" alt=\"redfish\" height=\"406px\" width=\"576px\">\n";
 
 const std::string boilerplateEnd = "</div>\n"
                                    "</body>\n"