18 files changed, 24 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index da2fc507f..62ba63ffd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1710,7 +1710,7 @@ SET(DYE_CMD_SRCS
     gui/color.h
     events/event.h
     gui/rect.h
-    dyetool/dyemain.cpp
+    progs/dyecmd/dyemain.cpp
     resources/sprite/animatedsprite.cpp
     resources/sprite/animatedsprite.h
     resources/sprite/animationdelayload.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 93cc93c07..f8b7cf8a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -155,7 +155,7 @@ manaplus_CXXFLAGS += -DENABLE_CILKPLUS -fcilkplus -lcilkrts
 endif
 
 dyecmd_CXXFLAGS += -DDYECMD
-dyecmd_SOURCES += dyetool/dyemain.cpp
+dyecmd_SOURCES += progs/dyecmd/dyemain.cpp
 
 if USE_MUMBLE
 manaplus_CXXFLAGS += -DUSE_MUMBLE
@@ -1996,19 +1996,19 @@ SRC += \
 	      mumblemanager.cpp \
 	      mumblemanager.h
 
-dyecmd_SOURCES += dyetool/gui/viewport.cpp \
-	      dyetool/gui/viewport.h \
-	      dyetool/client.cpp \
-	      dyetool/client.h \
-	      dyetool/actions/actions.cpp \
-	      dyetool/actions/chat.cpp \
-	      dyetool/actions/commands.cpp \
-	      dyetool/actions/move.cpp \
-	      dyetool/actions/pets.cpp \
-	      dyetool/actions/statusbar.cpp \
-	      dyetool/actions/tabs.cpp \
-	      dyetool/actions/target.cpp \
-	      dyetool/actions/windows.cpp
+dyecmd_SOURCES += progs/dyecmd/gui/viewport.cpp \
+	      progs/dyecmd/gui/viewport.h \
+	      progs/dyecmd/client.cpp \
+	      progs/dyecmd/client.h \
+	      progs/dyecmd/actions/actions.cpp \
+	      progs/dyecmd/actions/chat.cpp \
+	      progs/dyecmd/actions/commands.cpp \
+	      progs/dyecmd/actions/move.cpp \
+	      progs/dyecmd/actions/pets.cpp \
+	      progs/dyecmd/actions/statusbar.cpp \
+	      progs/dyecmd/actions/tabs.cpp \
+	      progs/dyecmd/actions/target.cpp \
+	      progs/dyecmd/actions/windows.cpp
 
 if ENABLE_MANAPLUSGAME
 manaplus_SOURCES += ${SRC}
diff --git a/src/client.h b/src/client.h
index 06e362a35..6c6888f52 100644
--- a/src/client.h
+++ b/src/client.h
@@ -24,7 +24,7 @@
 #define CLIENT_H
 
 #ifdef DYECMD
-#include "dyetool/client.h"
+#include "progs/dyecmd/client.h"
 
 #else  // DYECMD
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 3dad7c920..f4e3d26be 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -24,7 +24,7 @@
 #define GUI_VIEWPORT_H
 
 #ifdef DYECMD
-#include "dyetool/gui/viewport.h"
+#include "progs/dyecmd/gui/viewport.h"
 
 #else
 
diff --git a/src/dyetool/actions/actions.cpp b/src/progs/dyecmd/actions/actions.cpp
index 58353b699..58353b699 100644
--- a/src/dyetool/actions/actions.cpp
+++ b/src/progs/dyecmd/actions/actions.cpp
diff --git a/src/dyetool/actions/chat.cpp b/src/progs/dyecmd/actions/chat.cpp
index ece0e42b9..ece0e42b9 100644
--- a/src/dyetool/actions/chat.cpp
+++ b/src/progs/dyecmd/actions/chat.cpp
diff --git a/src/dyetool/actions/commands.cpp b/src/progs/dyecmd/actions/commands.cpp
index 7f50ab20c..7f50ab20c 100644
--- a/src/dyetool/actions/commands.cpp
+++ b/src/progs/dyecmd/actions/commands.cpp
diff --git a/src/dyetool/actions/move.cpp b/src/progs/dyecmd/actions/move.cpp
index c3f82cd3a..c3f82cd3a 100644
--- a/src/dyetool/actions/move.cpp
+++ b/src/progs/dyecmd/actions/move.cpp
diff --git a/src/dyetool/actions/pets.cpp b/src/progs/dyecmd/actions/pets.cpp
index 96a7e5393..96a7e5393 100644
--- a/src/dyetool/actions/pets.cpp
+++ b/src/progs/dyecmd/actions/pets.cpp
diff --git a/src/dyetool/actions/statusbar.cpp b/src/progs/dyecmd/actions/statusbar.cpp
index ed53ef8b0..ed53ef8b0 100644
--- a/src/dyetool/actions/statusbar.cpp
+++ b/src/progs/dyecmd/actions/statusbar.cpp
diff --git a/src/dyetool/actions/tabs.cpp b/src/progs/dyecmd/actions/tabs.cpp
index 3c795c2ab..3c795c2ab 100644
--- a/src/dyetool/actions/tabs.cpp
+++ b/src/progs/dyecmd/actions/tabs.cpp
diff --git a/src/dyetool/actions/target.cpp b/src/progs/dyecmd/actions/target.cpp
index 80b34a7fb..80b34a7fb 100644
--- a/src/dyetool/actions/target.cpp
+++ b/src/progs/dyecmd/actions/target.cpp
diff --git a/src/dyetool/actions/windows.cpp b/src/progs/dyecmd/actions/windows.cpp
index ce5c72ce2..ce5c72ce2 100644
--- a/src/dyetool/actions/windows.cpp
+++ b/src/progs/dyecmd/actions/windows.cpp
diff --git a/src/dyetool/client.cpp b/src/progs/dyecmd/client.cpp
index 42b570a6b..42b570a6b 100644
--- a/src/dyetool/client.cpp
+++ b/src/progs/dyecmd/client.cpp
diff --git a/src/dyetool/client.h b/src/progs/dyecmd/client.h
index 57f62c2b9..96d230c60 100644
--- a/src/dyetool/client.h
+++ b/src/progs/dyecmd/client.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DYETOOL_CLIENT_H
-#define DYETOOL_CLIENT_H
+#ifndef PROGS_DYECMD_CLIENT_H
+#define PROGS_DYECMD_CLIENT_H
 
 #include "enums/state.h"
 
@@ -116,4 +116,4 @@ extern Client *client;
 extern unsigned int mLastHost;
 extern unsigned long mSearchHash;
 
-#endif  // DYETOOL_CLIENT_H
+#endif  // PROGS_DYECMD_CLIENT_H
diff --git a/src/dyetool/dyemain.cpp b/src/progs/dyecmd/dyemain.cpp
index 2217508cc..2217508cc 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/progs/dyecmd/dyemain.cpp
diff --git a/src/dyetool/gui/viewport.cpp b/src/progs/dyecmd/gui/viewport.cpp
index 21719286f..30e89518e 100644
--- a/src/dyetool/gui/viewport.cpp
+++ b/src/progs/dyecmd/gui/viewport.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dyetool/gui/viewport.h"
+#include "progs/dyecmd/gui/viewport.h"
 
 #include "configuration.h"
 #include "sdlshared.h"
diff --git a/src/dyetool/gui/viewport.h b/src/progs/dyecmd/gui/viewport.h
index 7b1aa32c4..4b69a607c 100644
--- a/src/dyetool/gui/viewport.h
+++ b/src/progs/dyecmd/gui/viewport.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DYETOOL_GUI_VIEWPORT_H
-#define DYETOOL_GUI_VIEWPORT_H
+#ifndef PROGS_DYECMD_GUI_VIEWPORT_H
+#define PROGS_DYECMD_GUI_VIEWPORT_H
 
 #include "position.h"
 
@@ -210,4 +210,4 @@ class Viewport final : public WindowContainer,
 
 extern Viewport *viewport;           /**< The viewport. */
 
-#endif  // DYETOOL_GUI_VIEWPORT_H
+#endif  // PROGS_DYECMD_GUI_VIEWPORT_H