Move modules around a bit.

Also removed the makefile for now as it won't function correctly.