Move tools into their own area