diff --git a/.gitignore b/.gitignore
index 849ddff..1521c8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-dist/
+dist
diff --git a/.gitmodules b/.gitmodules
index 98dbc02..0610a8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "vendor/https-everywhere"]
-	path   = vendor/https-everywhere
+[submodule "https-everywhere-rules-raw/vendor/https-everywhere"]
+	path   = https-everywhere-rules-raw/vendor/https-everywhere
 	url    = https://git.torproject.org/https-everywhere.git
 	branch = 4.0
diff --git a/LICENSE b/https-everywhere-rules-raw/LICENSE
similarity index 100%
rename from LICENSE
rename to https-everywhere-rules-raw/LICENSE
diff --git a/README.md b/https-everywhere-rules-raw/README.md
similarity index 100%
rename from README.md
rename to https-everywhere-rules-raw/README.md
diff --git a/Setup.hs b/https-everywhere-rules-raw/Setup.hs
similarity index 100%
rename from Setup.hs
rename to https-everywhere-rules-raw/Setup.hs
diff --git a/default.nix b/https-everywhere-rules-raw/default.nix
similarity index 100%
rename from default.nix
rename to https-everywhere-rules-raw/default.nix
diff --git a/https-everywhere-rules-raw.cabal b/https-everywhere-rules-raw/https-everywhere-rules-raw.cabal
similarity index 93%
rename from https-everywhere-rules-raw.cabal
rename to https-everywhere-rules-raw/https-everywhere-rules-raw.cabal
index 94e50c0..bf5d237 100644
--- a/https-everywhere-rules-raw.cabal
+++ b/https-everywhere-rules-raw/https-everywhere-rules-raw.cabal
@@ -5,7 +5,7 @@ version:
 synopsis:
   Low-level (i.e. XML) access to HTTPS Everywhere rulesets.
 homepage:
-  https://github.com/fmap/https-everywhere-rules-raw
+  https://github.com/fmap/https-everywhere-rules
 license:
   GPL-2
 license-file:
diff --git a/src/Data/HTTPSEverywhere/Rules/Raw.hs b/https-everywhere-rules-raw/src/Data/HTTPSEverywhere/Rules/Raw.hs
similarity index 100%
rename from src/Data/HTTPSEverywhere/Rules/Raw.hs
rename to https-everywhere-rules-raw/src/Data/HTTPSEverywhere/Rules/Raw.hs
diff --git a/vendor/https-everywhere b/https-everywhere-rules-raw/vendor/https-everywhere
similarity index 100%
rename from vendor/https-everywhere
rename to https-everywhere-rules-raw/vendor/https-everywhere