Cleanup: Rename Classes, Fix dependencies, etc.