diff --git a/.gitignore b/.gitignore
index 5be10f3..095ad28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ dub.selections.json
 
 __test__*__
 __test__*__.core
-/tanya-test-*
+tanya-*test-*
 /dub_platform_probe[_-]*
 
 /docs/
diff --git a/.travis.yml b/.travis.yml
index a358fb0..62343f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,10 @@ before_script:
 
 script:
 - if [ -n "$DDOC" ]; then
+    dub build :meta -b ddox --compiler=$DC;
     dub build -b ddox --compiler=$DC;
   elif [ -z "$DSCANNER" ]; then
+    dub test :meta -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
     dub test -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
   else
     dub fetch dscanner --version=$DSCANNER;
diff --git a/appveyor.yml b/appveyor.yml
index 2d98a5a..61eea5c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -57,4 +57,5 @@ test_script:
   - echo %PATH%
   - 'dub --version'
   - '%DC% --version'
+  - dub test :meta -b unittest --arch=%Darch% --compiler=%DC%
   - dub test -b unittest --arch=%Darch% --compiler=%DC%
diff --git a/dub.json b/dub.json
index e52bbfd..736c5ba 100644
--- a/dub.json
+++ b/dub.json
@@ -9,10 +9,18 @@
 
 	"targetType": "library",
 
+	"dependencies": {
+		"tanya:meta": "*"
+	},
+
 	"dependencies-linux": {
 		"mir-linux-kernel": "~>1.0.0"
 	},
 
+	"subPackages": [
+		"./meta"
+	],
+
 	"configurations": [
 		{
 			"name": "library",
diff --git a/meta/dub.json b/meta/dub.json
new file mode 100644
index 0000000..c8d2ba7
--- /dev/null
+++ b/meta/dub.json
@@ -0,0 +1,5 @@
+{
+	"name": "meta",
+	"description": "Template metaprogramming",
+	"targetType": "library"
+}
diff --git a/source/tanya/meta/metafunction.d b/meta/source/tanya/meta/metafunction.d
similarity index 100%
rename from source/tanya/meta/metafunction.d
rename to meta/source/tanya/meta/metafunction.d
diff --git a/source/tanya/meta/package.d b/meta/source/tanya/meta/package.d
similarity index 100%
rename from source/tanya/meta/package.d
rename to meta/source/tanya/meta/package.d
diff --git a/source/tanya/meta/trait.d b/meta/source/tanya/meta/trait.d
similarity index 100%
rename from source/tanya/meta/trait.d
rename to meta/source/tanya/meta/trait.d
diff --git a/source/tanya/meta/transform.d b/meta/source/tanya/meta/transform.d
similarity index 100%
rename from source/tanya/meta/transform.d
rename to meta/source/tanya/meta/transform.d