Refactored code to allow for multiple build environments

614efbf