Build system / directory cleanups