diff --git a/TODO b/TODO
index e1d6334f4..b8cfa0796 100644
--- a/TODO
+++ b/TODO
@@ -43,10 +43,6 @@ three only slighty differing implementations
 Separate frontend commands from supporting code.  Command files
 start with com_*. [PARTIAL]
 
-Move src/devices/disto into src/maths/partialderiv.  Partial
-derivatives are math functions and should be classified under that
-directory.
-
 
 Testability
 -----------
@@ -60,6 +56,9 @@ src/maths/sparse.
 Add tests for all functions in the polynomial library in
 src/maths/poly.
 
+Add tests for all functions in the derivative library in
+src/maths/deriv.
+
 Add more circuit tests into the tests directory.
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 7602f1382..93cf48eff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,27 +18,16 @@ DYNAMIC_DEVICELIBS = 			\
 	devices/bsim1/libbsim1.la	\
 	devices/bsim2/libbsim2.la	\
 	devices/bsim3/libbsim3.la	\
-	devices/bsim4/libbsim4.la	\
 	devices/bsim3v1/libbsim3v1.la	\
 	devices/bsim3v2/libbsim3v2.la	\
+	devices/bsim4/libbsim4.la	\
 	devices/cap/libcap.la		\
 	devices/cccs/libcccs.la		\
 	devices/ccvs/libccvs.la		\
-	devices/csw/libcsw.la		\
-	devices/devsup/libdevsup.la	\
-	devices/dio/libdio.la		\
-	devices/disto/libdisto.la	\
-	devices/ind/libind.la		\
-	devices/isrc/libisrc.la		\
-	devices/jfet/libjfet.la		\
-	devices/jfet2/libjfet2.la	\
-	devices/ltra/libltra.la		\
-	devices/cccs/libcccs.la		\
 	devices/ccvs/libccvs.la		\
 	devices/csw/libcsw.la		\
 	devices/devsup/libdevsup.la	\
 	devices/dio/libdio.la		\
-	devices/disto/libdisto.la	\
 	devices/ind/libind.la		\
 	devices/isrc/libisrc.la		\
 	devices/jfet/libjfet.la		\