Cleaning up main; updating to new namespacing for enums
more namespace updates