move around stuff in build system
rejigger build system some more