diff --git a/lib/src/http/controller.dart b/lib/src/core/controller.dart
similarity index 100%
rename from lib/src/http/controller.dart
rename to lib/src/core/controller.dart
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index 91b03380..c1898302 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -1,4 +1,5 @@
 export 'anonymous_service.dart';
+export 'controller.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
 export 'metadata.dart';
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 9c0dd52f..a1011815 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -10,7 +10,7 @@ import 'package:file/file.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:mime/mime.dart';
 
-import '../http/http.dart';
+import 'controller.dart';
 import 'request_context.dart';
 import 'server.dart' show Angel;
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 1bf3365a..503bcf42 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -13,7 +13,7 @@ import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
 import 'package:tuple/tuple.dart';
 
-import '../http/http.dart';
+import 'controller.dart';
 import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -40,7 +40,6 @@ class Angel extends Routable {
       handlerCache = new HashMap();
 
   Router _flattened;
-  AngelHttp _http;
   bool _isProduction;
   Angel _parent;
 
@@ -212,8 +211,7 @@ class Angel extends Routable {
     shutdownHooks.clear();
     responseFinalizers.clear();
     _flattened = null;
-    _http?.close();
-    return new Future.value(_http?.httpServer);
+    return new Future.value();
   }
 
   @override
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index d5187841..3784acb8 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -4,7 +4,6 @@ library angel_framework.http;
 import 'dart:async';
 import 'dart:io';
 export 'angel_http.dart';
-export 'controller.dart';
 export 'http_request_context.dart';
 export 'http_response_context.dart';