Subdir objects

Update to use subdir-ojects in the build system and remove some old unused cruft too.