Move tools into their own folders