diff --git a/runtime/include/http/http_parser_settings.h b/runtime/include/http_parser_settings.h
similarity index 98%
rename from runtime/include/http/http_parser_settings.h
rename to runtime/include/http_parser_settings.h
index f833332..185fb85 100644
--- a/runtime/include/http/http_parser_settings.h
+++ b/runtime/include/http_parser_settings.h
@@ -1,8 +1,8 @@
 #ifndef SRFT_HTTP_PARSER_SETTINGS_H
 #define SRFT_HTTP_PARSER_SETTINGS_H
 
-#include <http/http_request.h>
-#include <http/http_response.h>
+#include <http_request.h>
+#include <http_response.h>
 #include <sandbox.h>
 #include <uv.h>
 
diff --git a/runtime/include/http/http_request.h b/runtime/include/http_request.h
similarity index 100%
rename from runtime/include/http/http_request.h
rename to runtime/include/http_request.h
diff --git a/runtime/include/http/http_response.h b/runtime/include/http_response.h
similarity index 100%
rename from runtime/include/http/http_response.h
rename to runtime/include/http_response.h
diff --git a/runtime/include/libuv_callbacks.h b/runtime/include/libuv_callbacks.h
index 42ded7d..ad68546 100644
--- a/runtime/include/libuv_callbacks.h
+++ b/runtime/include/libuv_callbacks.h
@@ -9,7 +9,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <uv.h>
-#include <http/http_request.h>
+#include <http_request.h>
 
 /**
  *  TODO: is there some weird edge case where a UNICODE character might be split between reads? Do we care?
diff --git a/runtime/include/sandbox.h b/runtime/include/sandbox.h
index fbfc5a2..8b9cb2b 100644
--- a/runtime/include/sandbox.h
+++ b/runtime/include/sandbox.h
@@ -6,8 +6,8 @@
 
 #include "arch/context.h"
 #include "deque.h"
-#include <http/http_request.h>
-#include <http/http_response.h>
+#include <http_request.h>
+#include <http_response.h>
 #include "module.h"
 #include "ps_list.h"
 #include "softint.h"
diff --git a/runtime/src/http/http_request.c b/runtime/src/http_request.c
similarity index 94%
rename from runtime/src/http/http_request.c
rename to runtime/src/http_request.c
index 88f7124..bff2ee1 100644
--- a/runtime/src/http/http_request.c
+++ b/runtime/src/http_request.c
@@ -1,4 +1,4 @@
-#include <http/http_request.h>
+#include <http_request.h>
 
 /***************************************************
  * General HTTP Request Functions                  *
diff --git a/runtime/src/http/http_response.c b/runtime/src/http_response.c
similarity index 99%
rename from runtime/src/http/http_response.c
rename to runtime/src/http_response.c
index d589546..ab2cad0 100644
--- a/runtime/src/http/http_response.c
+++ b/runtime/src/http_response.c
@@ -1,4 +1,4 @@
-#include <http/http_response.h>
+#include <http_response.h>
 
 #ifdef USE_HTTP_UVIO
 #include <uv.h>
diff --git a/runtime/src/libc/uvio.c b/runtime/src/libc/uvio.c
index d8ca440..ab11c6c 100644
--- a/runtime/src/libc/uvio.c
+++ b/runtime/src/libc/uvio.c
@@ -1,7 +1,7 @@
 #include <runtime.h>
 #include <sandbox.h>
 #include <uv.h>
-#include <http/http_request.h>
+#include <http_request.h>
 #include <current_sandbox.h>
 
 // What should we tell the child program its UID and GID are?
diff --git a/runtime/src/runtime.c b/runtime/src/runtime.c
index 1f0c536..e5f82d1 100644
--- a/runtime/src/runtime.c
+++ b/runtime/src/runtime.c
@@ -10,7 +10,7 @@
 #include <softint.h>
 #include <uv.h>
 #include <util.h>
-#include <http/http_parser_settings.h>
+#include <http_parser_settings.h>
 #include <current_sandbox.h>
 
 #include "sandbox_request.h"
@@ -264,7 +264,7 @@ worker_thread__pull_and_process_sandbox_requests(void)
 
 	while (total_sandboxes_pulled < SBOX_PULL_MAX) {
 		sandbox_request_t *sandbox_request;
-		if ((sandbox_request = sandbox_request__steal_from_global_dequeue()) == NULL) break;
+		if ((sandbox_request = sandbox_request__steal_from_dequeue()) == NULL) break;
 		// Actually allocate the sandbox for the requests that we've pulled
 		struct sandbox *sandbox = sandbox__allocate(sandbox_request->module, sandbox_request->arguments,
 		                                            sandbox_request->socket_descriptor,