diff --git a/indra/aistatemachine/CMakeLists.txt b/indra/aistatemachine/CMakeLists.txt
index c372fecc0..18ba3c034 100644
--- a/indra/aistatemachine/CMakeLists.txt
+++ b/indra/aistatemachine/CMakeLists.txt
@@ -18,24 +18,15 @@ include_directories(
     )
 
 set(aistatemachine_SOURCE_FILES
-    debug_libcurl.cpp
     aistatemachine.cpp
     aitimer.cpp
-    aicurl.cpp
-    aicurlthread.cpp
-    aicurleasyrequeststatemachine.cpp
     )
 
 set(aistatemachine_HEADER_FILES
     CMakeLists.txt
 
-    debug_libcurl.h
     aistatemachine.h
     aitimer.h
-    aicurlprivate.h
-    aicurl.h
-    aicurlthread.h
-    aicurleasyrequeststatemachine.h
     )
 
 set_source_files_properties(${aistatemachine_HEADER_FILES}
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index de096ba31..8e7f1f577 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -22,8 +22,12 @@ include_directories(
     )
 
 set(llmessage_SOURCE_FILES
+    aicurl.cpp
+    aicurleasyrequeststatemachine.cpp
+    aicurlthread.cpp
     aihttpheaders.cpp
     aihttptimeoutpolicy.cpp
+    debug_libcurl.cpp
     llhttpclient.cpp
     llares.cpp
     llareslistener.cpp
@@ -107,8 +111,13 @@ set(llmessage_SOURCE_FILES
 set(llmessage_HEADER_FILES
     CMakeLists.txt
 
+    aicurl.h
+    aicurleasyrequeststatemachine.h
+    aicurlprivate.h
+    aicurlthread.h
     aihttpheaders.h
     aihttptimeoutpolicy.h
+    debug_libcurl.h
     llares.h
     llareslistener.h
     llassetstorage.h
diff --git a/indra/aistatemachine/aicurl.cpp b/indra/llmessage/aicurl.cpp
similarity index 100%
rename from indra/aistatemachine/aicurl.cpp
rename to indra/llmessage/aicurl.cpp
diff --git a/indra/aistatemachine/aicurl.h b/indra/llmessage/aicurl.h
similarity index 100%
rename from indra/aistatemachine/aicurl.h
rename to indra/llmessage/aicurl.h
diff --git a/indra/aistatemachine/aicurleasyrequeststatemachine.cpp b/indra/llmessage/aicurleasyrequeststatemachine.cpp
similarity index 100%
rename from indra/aistatemachine/aicurleasyrequeststatemachine.cpp
rename to indra/llmessage/aicurleasyrequeststatemachine.cpp
diff --git a/indra/aistatemachine/aicurleasyrequeststatemachine.h b/indra/llmessage/aicurleasyrequeststatemachine.h
similarity index 100%
rename from indra/aistatemachine/aicurleasyrequeststatemachine.h
rename to indra/llmessage/aicurleasyrequeststatemachine.h
diff --git a/indra/aistatemachine/aicurlprivate.h b/indra/llmessage/aicurlprivate.h
similarity index 100%
rename from indra/aistatemachine/aicurlprivate.h
rename to indra/llmessage/aicurlprivate.h
diff --git a/indra/aistatemachine/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
similarity index 100%
rename from indra/aistatemachine/aicurlthread.cpp
rename to indra/llmessage/aicurlthread.cpp
diff --git a/indra/aistatemachine/aicurlthread.h b/indra/llmessage/aicurlthread.h
similarity index 100%
rename from indra/aistatemachine/aicurlthread.h
rename to indra/llmessage/aicurlthread.h
diff --git a/indra/aistatemachine/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
similarity index 100%
rename from indra/aistatemachine/debug_libcurl.cpp
rename to indra/llmessage/debug_libcurl.cpp
diff --git a/indra/aistatemachine/debug_libcurl.h b/indra/llmessage/debug_libcurl.h
similarity index 100%
rename from indra/aistatemachine/debug_libcurl.h
rename to indra/llmessage/debug_libcurl.h