I general refactor of deployment and settings.