From 0a780d5e3586c9116b7d8bacaee711853931367a Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Sat, 6 Jul 2019 00:33:50 +0200
Subject: [PATCH] tools/heretic2: move heretic2 stuff to its own directory

---
 Makefile                                      | 62 +++++++++----------
 tools/CMakeLists.txt                          |  2 +-
 .../CMakeLists.txt                            | 42 ++++++-------
 .../common/bspfile.c                          |  0
 .../common/bspfile.h                          |  0
 .../common/cmdlib.c                           |  0
 .../common/cmdlib.h                           |  0
 .../common/her2_threads.h                     |  0
 .../common/inout.c                            |  0
 .../common/inout.h                            |  0
 .../common/l3dslib.c                          |  0
 .../common/l3dslib.h                          |  0
 .../common/lbmlib.c                           |  0
 .../common/lbmlib.h                           |  0
 .../common/mathlib.c                          |  0
 .../common/mathlib.h                          |  0
 .../qdata_heretic2 => heretic2}/common/md4.c  |  0
 .../qdata_heretic2 => heretic2}/common/md4.h  |  0
 .../common/path_init.c                        |  0
 .../common/polylib.c                          |  0
 .../common/polylib.h                          |  0
 .../common/qfiles.c                           |  0
 .../common/qfiles.h                           |  0
 .../common/scriplib.c                         |  0
 .../common/scriplib.h                         |  0
 .../common/threads.c                          |  0
 .../common/token.c                            |  0
 .../common/token.h                            |  0
 .../common/trilib.c                           |  0
 .../common/trilib.h                           |  0
 .../h2data}/adpcm.h                           |  0
 .../h2data}/animcomp.c                        |  0
 .../h2data}/animcomp.h                        |  0
 .../h2data}/anorms.h                          |  0
 .../qdata_heretic2 => heretic2/h2data}/book.c |  0
 .../h2data}/fmodels.c                         |  0
 .../h2data}/h2data.rc                         |  0
 .../h2data}/images.c                          |  0
 .../h2data}/jointed.c                         |  0
 .../h2data}/jointed.h                         |  0
 .../h2data}/joints.h                          |  0
 .../h2data}/models.c                          |  0
 .../qdata_heretic2 => heretic2/h2data}/pics.c |  0
 .../h2data}/qd_fmodel.h                       |  0
 .../h2data}/qd_skeletons.c                    |  0
 .../h2data}/qd_skeletons.h                    |  0
 .../h2data}/qdata.c                           |  0
 .../h2data}/qdata.h                           |  0
 .../h2data}/resource.h                        |  0
 .../h2data}/sprites.c                         |  0
 .../h2data}/svdcmp.c                          |  0
 .../h2data}/tables.c                          |  0
 .../qdata_heretic2 => heretic2/h2data}/tmix.c |  0
 .../h2data}/video.c                           |  0
 .../qcommon/angles.h                          |  0
 .../qcommon/arrayedlist.h                     |  0
 .../qcommon/flex.h                            |  0
 .../qcommon/fmodel.h                          |  0
 .../qcommon/h2common.h                        |  0
 .../qcommon/placement.h                       |  0
 .../qcommon/q_typedef.h                       |  0
 .../qcommon/qfiles.h                          |  0
 .../qcommon/reference.c                       |  0
 .../qcommon/reference.h                       |  0
 .../qcommon/resourcemanager.c                 |  0
 .../qcommon/resourcemanager.h                 |  0
 .../qcommon/skeletons.c                       |  0
 .../qcommon/skeletons.h                       |  0
 68 files changed, 53 insertions(+), 53 deletions(-)
 rename tools/{quake2/qdata_heretic2 => heretic2}/CMakeLists.txt (69%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/bspfile.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/bspfile.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/cmdlib.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/cmdlib.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/her2_threads.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/inout.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/inout.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/l3dslib.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/l3dslib.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/lbmlib.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/lbmlib.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/mathlib.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/mathlib.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/md4.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/md4.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/path_init.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/polylib.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/polylib.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/qfiles.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/qfiles.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/scriplib.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/scriplib.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/threads.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/token.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/token.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/trilib.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/common/trilib.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/adpcm.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/animcomp.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/animcomp.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/anorms.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/book.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/fmodels.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/h2data.rc (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/images.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/jointed.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/jointed.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/joints.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/models.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/pics.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/qd_fmodel.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/qd_skeletons.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/qd_skeletons.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/qdata.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/qdata.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/resource.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/sprites.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/svdcmp.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/tables.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/tmix.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2/h2data}/video.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/angles.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/arrayedlist.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/flex.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/fmodel.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/h2common.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/placement.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/q_typedef.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/qfiles.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/reference.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/reference.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/resourcemanager.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/resourcemanager.h (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/skeletons.c (100%)
 rename tools/{quake2/qdata_heretic2 => heretic2}/qcommon/skeletons.h (100%)

diff --git a/Makefile b/Makefile
index 85049a8b..cdfbff0f 100644
--- a/Makefile
+++ b/Makefile
@@ -1019,38 +1019,38 @@ $(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): \
 	contrib/bkgrnd2d/plugin.o \
 
 $(INSTALLDIR)/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML)
-$(INSTALLDIR)/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/qdata_heretic2/common -Itools/quake2/qdata_heretic2/qcommon -Itools/quake2/qdata_heretic2 -Itools/quake2/common -Ilibs -Iinclude
+$(INSTALLDIR)/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/heretic2/common -Itools/heretic2/qcommon -Itools/heretic2/h2data -Itools/quake2/common -Ilibs -Iinclude
 $(INSTALLDIR)/heretic2/h2data.$(EXE): \
-	tools/quake2/qdata_heretic2/common/bspfile.o \
-	tools/quake2/qdata_heretic2/common/cmdlib.o \
-	tools/quake2/qdata_heretic2/common/inout.o \
-	tools/quake2/qdata_heretic2/common/l3dslib.o \
-	tools/quake2/qdata_heretic2/common/lbmlib.o \
-	tools/quake2/qdata_heretic2/common/mathlib.o \
-	tools/quake2/qdata_heretic2/common/md4.o \
-	tools/quake2/qdata_heretic2/common/path_init.o \
-	tools/quake2/qdata_heretic2/common/qfiles.o \
-	tools/quake2/qdata_heretic2/common/scriplib.o \
-	tools/quake2/qdata_heretic2/common/threads.o \
-	tools/quake2/qdata_heretic2/common/token.o \
-	tools/quake2/qdata_heretic2/common/trilib.o \
-	tools/quake2/qdata_heretic2/qcommon/reference.o \
-	tools/quake2/qdata_heretic2/qcommon/resourcemanager.o \
-	tools/quake2/qdata_heretic2/qcommon/skeletons.o \
-	tools/quake2/qdata_heretic2/animcomp.o \
-	tools/quake2/qdata_heretic2/book.o \
-	tools/quake2/qdata_heretic2/fmodels.o \
-	tools/quake2/qdata_heretic2/images.o \
-	tools/quake2/qdata_heretic2/jointed.o \
-	tools/quake2/qdata_heretic2/models.o \
-	tools/quake2/qdata_heretic2/pics.o \
-	tools/quake2/qdata_heretic2/qdata.o \
-	tools/quake2/qdata_heretic2/qd_skeletons.o \
-	tools/quake2/qdata_heretic2/sprites.o \
-	tools/quake2/qdata_heretic2/svdcmp.o \
-	tools/quake2/qdata_heretic2/tables.o \
-	tools/quake2/qdata_heretic2/tmix.o \
-	tools/quake2/qdata_heretic2/video.o \
+	tools/heretic2/common/bspfile.o \
+	tools/heretic2/common/cmdlib.o \
+	tools/heretic2/common/inout.o \
+	tools/heretic2/common/l3dslib.o \
+	tools/heretic2/common/lbmlib.o \
+	tools/heretic2/common/mathlib.o \
+	tools/heretic2/common/md4.o \
+	tools/heretic2/common/path_init.o \
+	tools/heretic2/common/qfiles.o \
+	tools/heretic2/common/scriplib.o \
+	tools/heretic2/common/threads.o \
+	tools/heretic2/common/token.o \
+	tools/heretic2/common/trilib.o \
+	tools/heretic2/qcommon/reference.o \
+	tools/heretic2/qcommon/resourcemanager.o \
+	tools/heretic2/qcommon/skeletons.o \
+	tools/heretic2/h2data/animcomp.o \
+	tools/heretic2/h2data/book.o \
+	tools/heretic2/h2data/fmodels.o \
+	tools/heretic2/h2data/images.o \
+	tools/heretic2/h2data/jointed.o \
+	tools/heretic2/h2data/models.o \
+	tools/heretic2/h2data/pics.o \
+	tools/heretic2/h2data/qdata.o \
+	tools/heretic2/h2data/qd_skeletons.o \
+	tools/heretic2/h2data/sprites.o \
+	tools/heretic2/h2data/svdcmp.o \
+	tools/heretic2/h2data/tables.o \
+	tools/heretic2/h2data/tmix.o \
+	tools/heretic2/h2data/video.o \
 	libl_net.$(A) \
 	$(if $(findstring $(OS),Win32),icons/h2data.o,) \
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b36bb6cf..b8f85654 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
 
 add_subdirectory(quake2)
-add_subdirectory(quake2/qdata_heretic2)
+add_subdirectory(heretic2)
 add_subdirectory(quake3)
 
 add_custom_target(tools)
diff --git a/tools/quake2/qdata_heretic2/CMakeLists.txt b/tools/heretic2/CMakeLists.txt
similarity index 69%
rename from tools/quake2/qdata_heretic2/CMakeLists.txt
rename to tools/heretic2/CMakeLists.txt
index 34131623..0cb9cb4d 100644
--- a/tools/quake2/qdata_heretic2/CMakeLists.txt
+++ b/tools/heretic2/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(BEFORE . common qcommon)
+include_directories(BEFORE h2data common qcommon)
 
 find_package(OpenGL REQUIRED)
 
@@ -6,7 +6,7 @@ find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 
 radiant_tool(h2data
-    h2data.rc
+    h2data/h2data.rc
 
     common/bspfile.c common/bspfile.h
     common/cmdlib.c common/cmdlib.h
@@ -35,25 +35,25 @@ radiant_tool(h2data
     qcommon/resourcemanager.c qcommon/resourcemanager.h
     qcommon/skeletons.c qcommon/skeletons.h
 
-    adpcm.h
-    animcomp.c animcomp.h 
-    anorms.h
-    book.c
-    fmodels.c qd_fmodel.h
-    images.c
-    jointed.c
-    jointed.h
-    joints.h
-    models.c
-    pics.c
-    qdata.c qdata.h
-    qd_skeletons.c qd_skeletons.h
-    resource.h
-    sprites.c
-    svdcmp.c
-    tables.c
-    tmix.c
-    video.c
+    h2data/adpcm.h
+    h2data/animcomp.c h2data/animcomp.h 
+    h2data/anorms.h
+    h2data/book.c
+    h2data/fmodels.c h2data/qd_fmodel.h
+    h2data/images.c
+    h2data/jointed.c
+    h2data/jointed.h
+    h2data/joints.h
+    h2data/models.c
+    h2data/pics.c
+    h2data/qdata.c h2data/qdata.h
+    h2data/qd_skeletons.c h2data/qd_skeletons.h
+    h2data/resource.h
+    h2data/sprites.c
+    h2data/svdcmp.c
+    h2data/tables.c
+    h2data/tmix.c
+    h2data/video.c
 )
 
 target_compile_definitions(h2data
diff --git a/tools/quake2/qdata_heretic2/common/bspfile.c b/tools/heretic2/common/bspfile.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/bspfile.c
rename to tools/heretic2/common/bspfile.c
diff --git a/tools/quake2/qdata_heretic2/common/bspfile.h b/tools/heretic2/common/bspfile.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/bspfile.h
rename to tools/heretic2/common/bspfile.h
diff --git a/tools/quake2/qdata_heretic2/common/cmdlib.c b/tools/heretic2/common/cmdlib.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/cmdlib.c
rename to tools/heretic2/common/cmdlib.c
diff --git a/tools/quake2/qdata_heretic2/common/cmdlib.h b/tools/heretic2/common/cmdlib.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/cmdlib.h
rename to tools/heretic2/common/cmdlib.h
diff --git a/tools/quake2/qdata_heretic2/common/her2_threads.h b/tools/heretic2/common/her2_threads.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/her2_threads.h
rename to tools/heretic2/common/her2_threads.h
diff --git a/tools/quake2/qdata_heretic2/common/inout.c b/tools/heretic2/common/inout.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/inout.c
rename to tools/heretic2/common/inout.c
diff --git a/tools/quake2/qdata_heretic2/common/inout.h b/tools/heretic2/common/inout.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/inout.h
rename to tools/heretic2/common/inout.h
diff --git a/tools/quake2/qdata_heretic2/common/l3dslib.c b/tools/heretic2/common/l3dslib.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/l3dslib.c
rename to tools/heretic2/common/l3dslib.c
diff --git a/tools/quake2/qdata_heretic2/common/l3dslib.h b/tools/heretic2/common/l3dslib.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/l3dslib.h
rename to tools/heretic2/common/l3dslib.h
diff --git a/tools/quake2/qdata_heretic2/common/lbmlib.c b/tools/heretic2/common/lbmlib.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/lbmlib.c
rename to tools/heretic2/common/lbmlib.c
diff --git a/tools/quake2/qdata_heretic2/common/lbmlib.h b/tools/heretic2/common/lbmlib.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/lbmlib.h
rename to tools/heretic2/common/lbmlib.h
diff --git a/tools/quake2/qdata_heretic2/common/mathlib.c b/tools/heretic2/common/mathlib.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/mathlib.c
rename to tools/heretic2/common/mathlib.c
diff --git a/tools/quake2/qdata_heretic2/common/mathlib.h b/tools/heretic2/common/mathlib.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/mathlib.h
rename to tools/heretic2/common/mathlib.h
diff --git a/tools/quake2/qdata_heretic2/common/md4.c b/tools/heretic2/common/md4.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/md4.c
rename to tools/heretic2/common/md4.c
diff --git a/tools/quake2/qdata_heretic2/common/md4.h b/tools/heretic2/common/md4.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/md4.h
rename to tools/heretic2/common/md4.h
diff --git a/tools/quake2/qdata_heretic2/common/path_init.c b/tools/heretic2/common/path_init.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/path_init.c
rename to tools/heretic2/common/path_init.c
diff --git a/tools/quake2/qdata_heretic2/common/polylib.c b/tools/heretic2/common/polylib.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/polylib.c
rename to tools/heretic2/common/polylib.c
diff --git a/tools/quake2/qdata_heretic2/common/polylib.h b/tools/heretic2/common/polylib.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/polylib.h
rename to tools/heretic2/common/polylib.h
diff --git a/tools/quake2/qdata_heretic2/common/qfiles.c b/tools/heretic2/common/qfiles.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/qfiles.c
rename to tools/heretic2/common/qfiles.c
diff --git a/tools/quake2/qdata_heretic2/common/qfiles.h b/tools/heretic2/common/qfiles.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/qfiles.h
rename to tools/heretic2/common/qfiles.h
diff --git a/tools/quake2/qdata_heretic2/common/scriplib.c b/tools/heretic2/common/scriplib.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/scriplib.c
rename to tools/heretic2/common/scriplib.c
diff --git a/tools/quake2/qdata_heretic2/common/scriplib.h b/tools/heretic2/common/scriplib.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/scriplib.h
rename to tools/heretic2/common/scriplib.h
diff --git a/tools/quake2/qdata_heretic2/common/threads.c b/tools/heretic2/common/threads.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/threads.c
rename to tools/heretic2/common/threads.c
diff --git a/tools/quake2/qdata_heretic2/common/token.c b/tools/heretic2/common/token.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/token.c
rename to tools/heretic2/common/token.c
diff --git a/tools/quake2/qdata_heretic2/common/token.h b/tools/heretic2/common/token.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/token.h
rename to tools/heretic2/common/token.h
diff --git a/tools/quake2/qdata_heretic2/common/trilib.c b/tools/heretic2/common/trilib.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/trilib.c
rename to tools/heretic2/common/trilib.c
diff --git a/tools/quake2/qdata_heretic2/common/trilib.h b/tools/heretic2/common/trilib.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/common/trilib.h
rename to tools/heretic2/common/trilib.h
diff --git a/tools/quake2/qdata_heretic2/adpcm.h b/tools/heretic2/h2data/adpcm.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/adpcm.h
rename to tools/heretic2/h2data/adpcm.h
diff --git a/tools/quake2/qdata_heretic2/animcomp.c b/tools/heretic2/h2data/animcomp.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/animcomp.c
rename to tools/heretic2/h2data/animcomp.c
diff --git a/tools/quake2/qdata_heretic2/animcomp.h b/tools/heretic2/h2data/animcomp.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/animcomp.h
rename to tools/heretic2/h2data/animcomp.h
diff --git a/tools/quake2/qdata_heretic2/anorms.h b/tools/heretic2/h2data/anorms.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/anorms.h
rename to tools/heretic2/h2data/anorms.h
diff --git a/tools/quake2/qdata_heretic2/book.c b/tools/heretic2/h2data/book.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/book.c
rename to tools/heretic2/h2data/book.c
diff --git a/tools/quake2/qdata_heretic2/fmodels.c b/tools/heretic2/h2data/fmodels.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/fmodels.c
rename to tools/heretic2/h2data/fmodels.c
diff --git a/tools/quake2/qdata_heretic2/h2data.rc b/tools/heretic2/h2data/h2data.rc
similarity index 100%
rename from tools/quake2/qdata_heretic2/h2data.rc
rename to tools/heretic2/h2data/h2data.rc
diff --git a/tools/quake2/qdata_heretic2/images.c b/tools/heretic2/h2data/images.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/images.c
rename to tools/heretic2/h2data/images.c
diff --git a/tools/quake2/qdata_heretic2/jointed.c b/tools/heretic2/h2data/jointed.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/jointed.c
rename to tools/heretic2/h2data/jointed.c
diff --git a/tools/quake2/qdata_heretic2/jointed.h b/tools/heretic2/h2data/jointed.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/jointed.h
rename to tools/heretic2/h2data/jointed.h
diff --git a/tools/quake2/qdata_heretic2/joints.h b/tools/heretic2/h2data/joints.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/joints.h
rename to tools/heretic2/h2data/joints.h
diff --git a/tools/quake2/qdata_heretic2/models.c b/tools/heretic2/h2data/models.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/models.c
rename to tools/heretic2/h2data/models.c
diff --git a/tools/quake2/qdata_heretic2/pics.c b/tools/heretic2/h2data/pics.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/pics.c
rename to tools/heretic2/h2data/pics.c
diff --git a/tools/quake2/qdata_heretic2/qd_fmodel.h b/tools/heretic2/h2data/qd_fmodel.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qd_fmodel.h
rename to tools/heretic2/h2data/qd_fmodel.h
diff --git a/tools/quake2/qdata_heretic2/qd_skeletons.c b/tools/heretic2/h2data/qd_skeletons.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/qd_skeletons.c
rename to tools/heretic2/h2data/qd_skeletons.c
diff --git a/tools/quake2/qdata_heretic2/qd_skeletons.h b/tools/heretic2/h2data/qd_skeletons.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qd_skeletons.h
rename to tools/heretic2/h2data/qd_skeletons.h
diff --git a/tools/quake2/qdata_heretic2/qdata.c b/tools/heretic2/h2data/qdata.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/qdata.c
rename to tools/heretic2/h2data/qdata.c
diff --git a/tools/quake2/qdata_heretic2/qdata.h b/tools/heretic2/h2data/qdata.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qdata.h
rename to tools/heretic2/h2data/qdata.h
diff --git a/tools/quake2/qdata_heretic2/resource.h b/tools/heretic2/h2data/resource.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/resource.h
rename to tools/heretic2/h2data/resource.h
diff --git a/tools/quake2/qdata_heretic2/sprites.c b/tools/heretic2/h2data/sprites.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/sprites.c
rename to tools/heretic2/h2data/sprites.c
diff --git a/tools/quake2/qdata_heretic2/svdcmp.c b/tools/heretic2/h2data/svdcmp.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/svdcmp.c
rename to tools/heretic2/h2data/svdcmp.c
diff --git a/tools/quake2/qdata_heretic2/tables.c b/tools/heretic2/h2data/tables.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/tables.c
rename to tools/heretic2/h2data/tables.c
diff --git a/tools/quake2/qdata_heretic2/tmix.c b/tools/heretic2/h2data/tmix.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/tmix.c
rename to tools/heretic2/h2data/tmix.c
diff --git a/tools/quake2/qdata_heretic2/video.c b/tools/heretic2/h2data/video.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/video.c
rename to tools/heretic2/h2data/video.c
diff --git a/tools/quake2/qdata_heretic2/qcommon/angles.h b/tools/heretic2/qcommon/angles.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/angles.h
rename to tools/heretic2/qcommon/angles.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/arrayedlist.h b/tools/heretic2/qcommon/arrayedlist.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/arrayedlist.h
rename to tools/heretic2/qcommon/arrayedlist.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/flex.h b/tools/heretic2/qcommon/flex.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/flex.h
rename to tools/heretic2/qcommon/flex.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/fmodel.h b/tools/heretic2/qcommon/fmodel.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/fmodel.h
rename to tools/heretic2/qcommon/fmodel.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/h2common.h b/tools/heretic2/qcommon/h2common.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/h2common.h
rename to tools/heretic2/qcommon/h2common.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/placement.h b/tools/heretic2/qcommon/placement.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/placement.h
rename to tools/heretic2/qcommon/placement.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/q_typedef.h b/tools/heretic2/qcommon/q_typedef.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/q_typedef.h
rename to tools/heretic2/qcommon/q_typedef.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/qfiles.h b/tools/heretic2/qcommon/qfiles.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/qfiles.h
rename to tools/heretic2/qcommon/qfiles.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/reference.c b/tools/heretic2/qcommon/reference.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/reference.c
rename to tools/heretic2/qcommon/reference.c
diff --git a/tools/quake2/qdata_heretic2/qcommon/reference.h b/tools/heretic2/qcommon/reference.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/reference.h
rename to tools/heretic2/qcommon/reference.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/resourcemanager.c b/tools/heretic2/qcommon/resourcemanager.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/resourcemanager.c
rename to tools/heretic2/qcommon/resourcemanager.c
diff --git a/tools/quake2/qdata_heretic2/qcommon/resourcemanager.h b/tools/heretic2/qcommon/resourcemanager.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/resourcemanager.h
rename to tools/heretic2/qcommon/resourcemanager.h
diff --git a/tools/quake2/qdata_heretic2/qcommon/skeletons.c b/tools/heretic2/qcommon/skeletons.c
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/skeletons.c
rename to tools/heretic2/qcommon/skeletons.c
diff --git a/tools/quake2/qdata_heretic2/qcommon/skeletons.h b/tools/heretic2/qcommon/skeletons.h
similarity index 100%
rename from tools/quake2/qdata_heretic2/qcommon/skeletons.h
rename to tools/heretic2/qcommon/skeletons.h
-- 
2.39.2