Cleaned some stuff up and moved to a more compliant and modular project setup internally.