diff --git a/dub.json b/dub.json
index ab294155..355e9a9e 100644
--- a/dub.json
+++ b/dub.json
@@ -4,7 +4,7 @@
   "homepage": "https://github.com/CyberShadow/ae",
   "license": "MPL-2.0",
 
-  "targetType": "sourceLibrary",
+  "targetType": "library",
 
   "authors": [
     "Vladimir Panteleev <vladimir@thecybershadow.net>"
@@ -18,63 +18,5 @@
       "version": ">=1.1.3+1.0.1g",
       "optional": true
     }
-  },
-
-  "subPackages": [
-    {
-      "name": "net-http-server",
-      "targetType": "sourceLibrary",
-      "sourceFiles": [
-        "net/http/server.d",
-        "net/http/server.d",
-        "net/http/common.d",
-        "net/asockets.d",
-        "net/ietf/url.d",
-        "net/ietf/headers.d",
-        "net/ietf/headerparse.d",
-        "sys/data.d",
-        "sys/log.d",
-        "sys/file.d",
-        "sys/timing.d",
-        "sys/dataset.d",
-        "sys/signals.d",
-        "utils/aa.d",
-        "utils/appender.d",
-        "utils/meta/package.d",
-        "utils/meta/misc.d",
-        "utils/meta/reference.d",
-        "utils/meta/x.d",
-        "utils/meta/proxy.d",
-        "utils/meta/binding_v1.d",
-        "utils/meta/binding.d",
-        "utils/meta/caps.d",
-        "utils/regex.d",
-        "utils/math.d",
-        "utils/container.d",
-        "utils/text.d",
-        "utils/textout.d",
-        "utils/array.d",
-        "utils/time.d",
-        "utils/zlib.d",
-        "utils/gzip.d",
-        "utils/alloc.d",
-        "net/shutdown.d",
-        "sys/shutdown.d"
-      ],
-    }
-  ],
-
-  "sourcePaths": [ "." ],
-  "importPaths": [ "." ],
-
-  "excludedSourceFiles": [
-    "demo/*",
-    "*sdl*",
-    "sys/vfs_curl.d",
-    "sys/net/wininet.d",
-    "sys/windows/*",
-    "ui/app/windows/*",
-    "sys/benchmark.d",
-    "*/main.d"
-  ]
+  }
 }
diff --git a/utils/aa.d b/src/ae/utils/aa.d
similarity index 100%
rename from utils/aa.d
rename to src/ae/utils/aa.d
diff --git a/utils/appender.d b/src/ae/utils/appender.d
similarity index 100%
rename from utils/appender.d
rename to src/ae/utils/appender.d
diff --git a/utils/array.d b/src/ae/utils/array.d
similarity index 100%
rename from utils/array.d
rename to src/ae/utils/array.d
diff --git a/utils/exception.d b/src/ae/utils/exception.d
similarity index 100%
rename from utils/exception.d
rename to src/ae/utils/exception.d
diff --git a/utils/meta/args.d b/src/ae/utils/meta/args.d
similarity index 100%
rename from utils/meta/args.d
rename to src/ae/utils/meta/args.d
diff --git a/utils/meta/binding.d b/src/ae/utils/meta/binding.d
similarity index 100%
rename from utils/meta/binding.d
rename to src/ae/utils/meta/binding.d
diff --git a/utils/meta/binding_v1.d b/src/ae/utils/meta/binding_v1.d
similarity index 100%
rename from utils/meta/binding_v1.d
rename to src/ae/utils/meta/binding_v1.d
diff --git a/utils/meta/caps.d b/src/ae/utils/meta/caps.d
similarity index 100%
rename from utils/meta/caps.d
rename to src/ae/utils/meta/caps.d
diff --git a/utils/meta/chain.d b/src/ae/utils/meta/chain.d
similarity index 100%
rename from utils/meta/chain.d
rename to src/ae/utils/meta/chain.d
diff --git a/utils/meta/package.d b/src/ae/utils/meta/package.d
similarity index 100%
rename from utils/meta/package.d
rename to src/ae/utils/meta/package.d
diff --git a/utils/meta/proxy.d b/src/ae/utils/meta/proxy.d
similarity index 100%
rename from utils/meta/proxy.d
rename to src/ae/utils/meta/proxy.d
diff --git a/utils/meta/reference.d b/src/ae/utils/meta/reference.d
similarity index 100%
rename from utils/meta/reference.d
rename to src/ae/utils/meta/reference.d
diff --git a/utils/meta/x.d b/src/ae/utils/meta/x.d
similarity index 100%
rename from utils/meta/x.d
rename to src/ae/utils/meta/x.d
diff --git a/utils/regex.d b/src/ae/utils/regex.d
similarity index 100%
rename from utils/regex.d
rename to src/ae/utils/regex.d
diff --git a/utils/text/ascii.d b/src/ae/utils/text/ascii.d
similarity index 100%
rename from utils/text/ascii.d
rename to src/ae/utils/text/ascii.d
diff --git a/utils/text/html.d b/src/ae/utils/text/html.d
similarity index 100%
rename from utils/text/html.d
rename to src/ae/utils/text/html.d
diff --git a/utils/text/package.d b/src/ae/utils/text/package.d
similarity index 100%
rename from utils/text/package.d
rename to src/ae/utils/text/package.d
diff --git a/utils/textout.d b/src/ae/utils/textout.d
similarity index 100%
rename from utils/textout.d
rename to src/ae/utils/textout.d
diff --git a/utils/time/common.d b/src/ae/utils/time/common.d
similarity index 100%
rename from utils/time/common.d
rename to src/ae/utils/time/common.d
diff --git a/utils/time/format.d b/src/ae/utils/time/format.d
similarity index 100%
rename from utils/time/format.d
rename to src/ae/utils/time/format.d
diff --git a/utils/time/fpdur.d b/src/ae/utils/time/fpdur.d
similarity index 100%
rename from utils/time/fpdur.d
rename to src/ae/utils/time/fpdur.d
diff --git a/utils/time/package.d b/src/ae/utils/time/package.d
similarity index 100%
rename from utils/time/package.d
rename to src/ae/utils/time/package.d
diff --git a/utils/time/parse.d b/src/ae/utils/time/parse.d
similarity index 100%
rename from utils/time/parse.d
rename to src/ae/utils/time/parse.d
diff --git a/utils/time/parsedur.d b/src/ae/utils/time/parsedur.d
similarity index 100%
rename from utils/time/parsedur.d
rename to src/ae/utils/time/parsedur.d
diff --git a/utils/xml.d b/src/ae/utils/xml.d
similarity index 100%
rename from utils/xml.d
rename to src/ae/utils/xml.d
diff --git a/utils/xmlbuild.d b/src/ae/utils/xmlbuild.d
similarity index 100%
rename from utils/xmlbuild.d
rename to src/ae/utils/xmlbuild.d
diff --git a/utils/xmllite.d b/src/ae/utils/xmllite.d
similarity index 100%
rename from utils/xmllite.d
rename to src/ae/utils/xmllite.d
diff --git a/utils/xmlwriter.d b/src/ae/utils/xmlwriter.d
similarity index 100%
rename from utils/xmlwriter.d
rename to src/ae/utils/xmlwriter.d