Mass revamp so work with drush si and most config goes to feature.