Refactoring of drush.