Refactoring + features, e.g. help and init-script in deploy command