Culled lots and lots of unused code and overhauled build to use subdirs