diff --git a/Makefile b/Makefile
index 25fbf27..3ae098b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 .PHONY: all clean
 
-all: MonadK.lagda.md
-	agda --html --html-dir=out MonadK.lagda.md --html-highlight=auto
-	agda --html --html-dir=out ElgotAlgebra.lagda.md --html-highlight=auto
+all: Everything.agda
+	agda --html --html-dir=out Everything.agda --html-highlight=auto
 	pandoc out/MonadK.md -s -c Agda.css -o out/MonadK.html
 	pandoc out/ElgotAlgebra.md -s -c Agda.css -o out/ElgotAlgebra.html
 
 clean:
+	rm Everything.agda
 	rm -rf out/*
 
 open:
@@ -14,4 +14,4 @@ open:
 	firefox out/ElgotAlgebra.html
 
 Everything.agda:
-	git ls-tree --full-tree -r --name-only HEAD | grep '^[^\.]*.agda' | sed -e 's|^[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda
\ No newline at end of file
+	git ls-tree --full-tree -r --name-only HEAD | grep '^src/[^\.]*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda
\ No newline at end of file
diff --git a/ElgotAlgebra.lagda.md b/src/ElgotAlgebra.lagda.md
similarity index 100%
rename from ElgotAlgebra.lagda.md
rename to src/ElgotAlgebra.lagda.md
diff --git a/ElgotAlgebras.agda b/src/ElgotAlgebras.agda
similarity index 100%
rename from ElgotAlgebras.agda
rename to src/ElgotAlgebras.agda
diff --git a/ElgotIteration.agda b/src/ElgotIteration.agda
similarity index 100%
rename from ElgotIteration.agda
rename to src/ElgotIteration.agda
diff --git a/Monad/ElgotMonad.agda b/src/Monad/ElgotMonad.agda
similarity index 100%
rename from Monad/ElgotMonad.agda
rename to src/Monad/ElgotMonad.agda
diff --git a/Monad/Instance/Delay.lagda.md b/src/Monad/Instance/Delay.lagda.md
similarity index 100%
rename from Monad/Instance/Delay.lagda.md
rename to src/Monad/Instance/Delay.lagda.md
diff --git a/MonadK.lagda.md b/src/MonadK.lagda.md
similarity index 100%
rename from MonadK.lagda.md
rename to src/MonadK.lagda.md
diff --git a/UniformIterationAlgebra.agda b/src/UniformIterationAlgebra.agda
similarity index 100%
rename from UniformIterationAlgebra.agda
rename to src/UniformIterationAlgebra.agda
diff --git a/UniformIterationAlgebras.agda b/src/UniformIterationAlgebras.agda
similarity index 100%
rename from UniformIterationAlgebras.agda
rename to src/UniformIterationAlgebras.agda