Changed classes around. Improved zero downtime deployment.