move tools into core
adjust imports for folder rename