diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f414d0953..9c504d4ef5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -286,7 +286,6 @@ set(bro_SRCS
     Analyzer.cc
     Anon.cc
     ARP.cc
-    AsciiInputOutput.cc
     Attr.cc
     AYIYA.cc
     BackDoor.cc
@@ -426,6 +425,7 @@ set(bro_SRCS
     strsep.c
     modp_numtoa.c
 
+    threading/AsciiInputOutput.cc
     threading/BasicThread.cc
     threading/Manager.cc
     threading/MsgThread.cc
diff --git a/src/input/readers/Ascii.h b/src/input/readers/Ascii.h
index ed641087c7..52078bf3d6 100644
--- a/src/input/readers/Ascii.h
+++ b/src/input/readers/Ascii.h
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "../ReaderBackend.h"
-#include "../../AsciiInputOutput.h"
+#include "../../threading/AsciiInputOutput.h"
 
 namespace input { namespace reader {
 
diff --git a/src/input/readers/Benchmark.h b/src/input/readers/Benchmark.h
index d259db463c..e83f446caa 100644
--- a/src/input/readers/Benchmark.h
+++ b/src/input/readers/Benchmark.h
@@ -4,7 +4,7 @@
 #define INPUT_READERS_BENCHMARK_H
 
 #include "../ReaderBackend.h"
-#include "../../AsciiInputOutput.h"
+#include "../../threading/AsciiInputOutput.h"
 
 namespace input { namespace reader {
 
diff --git a/src/logging/writers/Ascii.h b/src/logging/writers/Ascii.h
index 5236932889..f85d240c95 100644
--- a/src/logging/writers/Ascii.h
+++ b/src/logging/writers/Ascii.h
@@ -6,7 +6,7 @@
 #define LOGGING_WRITER_ASCII_H
 
 #include "../WriterBackend.h"
-#include "../../AsciiInputOutput.h"
+#include "../../threading/AsciiInputOutput.h"
 
 namespace logging { namespace writer {
 
diff --git a/src/logging/writers/ElasticSearch.cc b/src/logging/writers/ElasticSearch.cc
index a5897e7272..e9f5ab456b 100644
--- a/src/logging/writers/ElasticSearch.cc
+++ b/src/logging/writers/ElasticSearch.cc
@@ -16,7 +16,7 @@
 #include "BroString.h"
 #include "NetVar.h"
 #include "threading/SerialTypes.h"
-#include "../../AsciiInputOutput.h"
+#include "../../threading/AsciiInputOutput.h"
 
 #include <curl/curl.h>
 #include <curl/easy.h>
diff --git a/src/AsciiInputOutput.cc b/src/threading/AsciiInputOutput.cc
similarity index 99%
rename from src/AsciiInputOutput.cc
rename to src/threading/AsciiInputOutput.cc
index 28736b9a77..0f2198a229 100644
--- a/src/AsciiInputOutput.cc
+++ b/src/threading/AsciiInputOutput.cc
@@ -5,7 +5,7 @@
 #include <sstream>
 #include <errno.h>
 #include "AsciiInputOutput.h"
-#include "bro_inet_ntop.h"
+#include "../bro_inet_ntop.h"
 
 AsciiInputOutput::AsciiInputOutput(threading::MsgThread* t) 
 	{
diff --git a/src/AsciiInputOutput.h b/src/threading/AsciiInputOutput.h
similarity index 98%
rename from src/AsciiInputOutput.h
rename to src/threading/AsciiInputOutput.h
index 16198eae54..b988bb9e63 100644
--- a/src/AsciiInputOutput.h
+++ b/src/threading/AsciiInputOutput.h
@@ -3,8 +3,8 @@
 #ifndef AsciiInputOutput_h
 #define AsciiInputOutput_h
 
-#include "Desc.h"
-#include "threading/MsgThread.h"
+#include "../Desc.h"
+#include "MsgThread.h"
 
 class AsciiInputOutput {
 	public: