Issue #51: Reorganize drush build