clean up/unifiy build-system