Renamed everything, using properly namespaced classes, etc...fresh start.