diff --git a/src/Makefile.am b/src/Makefile.am
index 126428a6..7ca925af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
 test_map_LDADD = libcommon.a
 test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image`
 
-editor_SOURCES = editor.cpp gtkvideo.cpp
+editor_SOURCES = gtk/editor.cpp gtk/gtkvideo.cpp
 editor_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image gtk+-2.0 gtkgl-2.0`
 editor_LDADD = libcommon.a
 editor_LDFLAGS = `pkg-config --libs sdl gl gtk+-2.0 gtkgl-2.0 SDL_image`
diff --git a/src/editor.cpp b/src/gtk/editor.cpp
similarity index 100%
rename from src/editor.cpp
rename to src/gtk/editor.cpp
diff --git a/src/gtkvideo.cpp b/src/gtk/gtkvideo.cpp
similarity index 100%
rename from src/gtkvideo.cpp
rename to src/gtk/gtkvideo.cpp
diff --git a/src/gtkvideo.h b/src/gtk/gtkvideo.h
similarity index 100%
rename from src/gtkvideo.h
rename to src/gtk/gtkvideo.h