diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt
index 468530be31..a58b02d1d4 100644
--- a/Gems/AWSCore/Code/CMakeLists.txt
+++ b/Gems/AWSCore/Code/CMakeLists.txt
@@ -86,7 +86,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     )
 
     ly_add_target(
-        NAME AWSCore.ResourceMappintTool MODULE
+        NAME AWSCore.ResourceMappingTool MODULE
         NAMESPACE Gem
         OUTPUT_SUBDIRECTORY AWSCoreEditorQtBin
         FILES_CMAKE
@@ -94,15 +94,11 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
         INCLUDE_DIRECTORIES
             PRIVATE
                 Include/Private
-            PUBLIC
-                Include/Public
         BUILD_DEPENDENCIES
             PRIVATE
-                3rdParty::Qt::Core
-                3rdParty::Qt::Widgets
-                AZ::AzToolsFramework
+                Gem::AWSCore.Editor.Static
     )
-    ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappintTool)
+    ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool)
 endif()
 
 ################################################################################
diff --git a/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp b/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp
new file mode 100644
index 0000000000..794ee6c880
--- /dev/null
+++ b/Gems/AWSCore/Code/Source/AWSCoreResourceMappingToolModule.cpp
@@ -0,0 +1,44 @@
+/*
+* All or portions of this file Copyright(c) Amazon.com, Inc.or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#include <AzCore/Module/Module.h>
+#include <AWSCoreEditorSystemComponent.h>
+
+namespace AWSCore
+{
+    class AWSCoreResourceMappingToolModule
+        : public AZ::Module
+    {
+    public:
+        AZ_RTTI(AWSCoreResourceMappingToolModule, "{9D16F400-009C-47FF-A186-E48BEB73D94D}", AZ::Module);
+        AZ_CLASS_ALLOCATOR(AWSCoreResourceMappingToolModule, AZ::SystemAllocator, 0);
+
+        AWSCoreResourceMappingToolModule()
+        {
+            m_descriptors.insert(m_descriptors.end(),
+                {
+                    AWSCoreEditorSystemComponent::CreateDescriptor(),
+                });
+        }
+
+        ~AWSCoreResourceMappingToolModule() override = default;
+
+        AZ::ComponentTypeList GetRequiredSystemComponents() const override
+        {
+            return AZ::ComponentTypeList{azrtti_typeid<AWSCoreEditorSystemComponent>()};
+        }
+    };
+}
+
+// DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
+// The first parameter should be GemName_GemIdLower
+// The second should be the fully qualified name of the class above
+AZ_DECLARE_MODULE_CLASS(Gem_AWSCore_ResourceMappingTool, AWSCore::AWSCoreResourceMappingToolModule)
diff --git a/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake b/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
index b67c50e955..466a2c917f 100644
--- a/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
+++ b/Gems/AWSCore/Code/awscore_resourcemappingtool_files.cmake
@@ -10,6 +10,5 @@
 #
 
 set(FILES
-    Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
-    Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
+    Source/AWSCoreResourceMappingToolModule.cpp
 )