deploy_extra: Refactoring. Big changes.