diff --git a/Makefile b/Makefile
index 3ad7754fe..4753e894b 100644
--- a/Makefile
+++ b/Makefile
@@ -30,14 +30,14 @@ PACKAGES=\
 	hledger-lib \
 	hledger \
 	hledger-web \
-	hledger-vty \
-	hledger-chart
+#	hledger-vty \
+#	hledger-chart
 INCLUDEPATHS=\
 	-i../hledger-lib \
 	-i../hledger \
 	-i../hledger-web \
-	-i../hledger-vty \
-	-i../hledger-chart
+#	-i../hledger-vty \
+#	-i../hledger-chart
 MAIN=hledger-cli.hs
 
 # all source files in the project (plus a few strays like Setup.hs & hlint.hs)
diff --git a/hledger-chart/Hledger/Chart.hs b/extra/hledger-chart/Hledger/Chart.hs
similarity index 100%
rename from hledger-chart/Hledger/Chart.hs
rename to extra/hledger-chart/Hledger/Chart.hs
diff --git a/hledger-chart/Hledger/Chart/Main.hs b/extra/hledger-chart/Hledger/Chart/Main.hs
similarity index 100%
rename from hledger-chart/Hledger/Chart/Main.hs
rename to extra/hledger-chart/Hledger/Chart/Main.hs
diff --git a/hledger-chart/Hledger/Chart/Options.hs b/extra/hledger-chart/Hledger/Chart/Options.hs
similarity index 100%
rename from hledger-chart/Hledger/Chart/Options.hs
rename to extra/hledger-chart/Hledger/Chart/Options.hs
diff --git a/hledger-chart/LICENSE b/extra/hledger-chart/LICENSE
similarity index 100%
rename from hledger-chart/LICENSE
rename to extra/hledger-chart/LICENSE
diff --git a/hledger-chart/Setup.hs b/extra/hledger-chart/Setup.hs
similarity index 100%
rename from hledger-chart/Setup.hs
rename to extra/hledger-chart/Setup.hs
diff --git a/hledger-chart/hledger-chart.cabal b/extra/hledger-chart/hledger-chart.cabal
similarity index 100%
rename from hledger-chart/hledger-chart.cabal
rename to extra/hledger-chart/hledger-chart.cabal
diff --git a/hledger-chart/hledger-chart.hs b/extra/hledger-chart/hledger-chart.hs
similarity index 100%
rename from hledger-chart/hledger-chart.hs
rename to extra/hledger-chart/hledger-chart.hs
diff --git a/hledger-vty/Hledger/Vty.hs b/extra/hledger-vty/Hledger/Vty.hs
similarity index 100%
rename from hledger-vty/Hledger/Vty.hs
rename to extra/hledger-vty/Hledger/Vty.hs
diff --git a/hledger-vty/Hledger/Vty/Main.hs b/extra/hledger-vty/Hledger/Vty/Main.hs
similarity index 100%
rename from hledger-vty/Hledger/Vty/Main.hs
rename to extra/hledger-vty/Hledger/Vty/Main.hs
diff --git a/hledger-vty/Hledger/Vty/Options.hs b/extra/hledger-vty/Hledger/Vty/Options.hs
similarity index 100%
rename from hledger-vty/Hledger/Vty/Options.hs
rename to extra/hledger-vty/Hledger/Vty/Options.hs
diff --git a/hledger-vty/LICENSE b/extra/hledger-vty/LICENSE
similarity index 100%
rename from hledger-vty/LICENSE
rename to extra/hledger-vty/LICENSE
diff --git a/hledger-vty/Setup.hs b/extra/hledger-vty/Setup.hs
similarity index 100%
rename from hledger-vty/Setup.hs
rename to extra/hledger-vty/Setup.hs
diff --git a/hledger-vty/hledger-vty.cabal b/extra/hledger-vty/hledger-vty.cabal
similarity index 100%
rename from hledger-vty/hledger-vty.cabal
rename to extra/hledger-vty/hledger-vty.cabal
diff --git a/hledger-vty/hledger-vty.hs b/extra/hledger-vty/hledger-vty.hs
similarity index 100%
rename from hledger-vty/hledger-vty.hs
rename to extra/hledger-vty/hledger-vty.hs