More large refactoring.
Deployment setup.
Cleanup.