cleanup, put modules in the right directory

You might need to drush rr, when moving modules paths
Add easysite_import.