drush fixes.  xhprof fixes.  better dir structure