Transitioned code to a more modular build.