moving cli tools into main repository