Restructured make/build environment to work with other idioms