diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaacf57..7d677cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,8 @@ aux_source_directory("gds-parser" PARSER_SOURCES)
 aux_source_directory("latex-output" LATEX_SOURCES)
 aux_source_directory("cairo-output" CAIRO_SOURCES)
 aux_source_directory("trigonometric" TRIG_SOURCES)
-set(SOURCE "main.c" "layer-selector.c" "layer-selector-dnd.c" "mapping-parser.c" "command-line.c" "main-window.c" "external-renderer.c")
+aux_source_directory("layer-selector" LAYER_SELECTOR_SOURCES)
+set(SOURCE "main.c" "mapping-parser.c" "command-line.c" "main-window.c" "external-renderer.c")
 
 set(SOURCE
   ${SOURCE}
@@ -30,6 +31,7 @@ set(SOURCE
   ${LATEX_SOURCES}
   ${CAIRO_SOURCES}
   ${TRIG_SOURCES}
+  ${LAYER_SELECTOR_SOURCES}
 )
 
 add_compile_options(-Wall)
diff --git a/cairo-output/cairo-output.h b/cairo-output/cairo-output.h
index 409e58a..cd2e8bd 100644
--- a/cairo-output/cairo-output.h
+++ b/cairo-output/cairo-output.h
@@ -24,7 +24,7 @@
 #ifndef __CAIRO_OUTPUT_H__
 #define __CAIRO_OUTPUT_H__
 
-#include "../layer-selector.h"
+#include "../layer-selector/layer-selector.h"
 #include "../gds-parser/gds-types.h"
 
 /** @addtogroup Cairo-Renderer
diff --git a/layer-selector-dnd.c b/layer-selector/layer-selector-dnd.c
similarity index 98%
rename from layer-selector-dnd.c
rename to layer-selector/layer-selector-dnd.c
index e581fc6..dccfd20 100644
--- a/layer-selector-dnd.c
+++ b/layer-selector/layer-selector-dnd.c
@@ -223,7 +223,7 @@ void layer_selector_list_box_setup_dnd(GtkListBox *box)
 	gtk_css_provider_load_from_data (provider, dnd_additional_css, -1, NULL);
 	gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (provider), 800);
 
-	gtk_drag_dest_set(box, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, entries, 1, GDK_ACTION_MOVE);
+	gtk_drag_dest_set(GTK_WIDGET(box), GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, entries, 1, GDK_ACTION_MOVE);
 	g_signal_connect(box, "drag-data-received", G_CALLBACK(layer_selector_drag_data_received), NULL);
 	g_signal_connect(box, "drag-motion", G_CALLBACK(layer_selector_drag_motion), NULL);
 	g_signal_connect(box, "drag-leave", G_CALLBACK(layer_selector_drag_leave), NULL);
diff --git a/layer-selector-dnd.h b/layer-selector/layer-selector-dnd.h
similarity index 100%
rename from layer-selector-dnd.h
rename to layer-selector/layer-selector-dnd.h
diff --git a/layer-selector.c b/layer-selector/layer-selector.c
similarity index 99%
rename from layer-selector.c
rename to layer-selector/layer-selector.c
index da3ac94..31f8e56 100644
--- a/layer-selector.c
+++ b/layer-selector/layer-selector.c
@@ -29,8 +29,8 @@
  */
 
 #include "layer-selector.h"
-#include "gds-parser/gds-parser.h"
-#include "widgets/layer-element.h"
+#include "../gds-parser/gds-parser.h"
+#include "../widgets/layer-element.h"
 #include <glib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/layer-selector.h b/layer-selector/layer-selector.h
similarity index 98%
rename from layer-selector.h
rename to layer-selector/layer-selector.h
index 7b5e414..5324186 100644
--- a/layer-selector.h
+++ b/layer-selector/layer-selector.h
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
-#include "mapping-parser.h"
+#include "../mapping-parser.h"
 
 /**
  * @brief Defines how to sort the layer selector list box.
diff --git a/main-window.c b/main-window.c
index 8279d32..7632e0f 100644
--- a/main-window.c
+++ b/main-window.c
@@ -31,7 +31,8 @@
 #include <stdio.h>
 #include "gds-parser/gds-parser.h"
 #include <gtk/gtk.h>
-#include "layer-selector.h"
+#include "layer-selector/layer-selector.h"
+#include "layer-selector/layer-selector-dnd.h"
 #include "tree-renderer/tree-store.h"
 #include "latex-output/latex-output.h"
 #include "widgets/conv-settings-dialog.h"
@@ -40,8 +41,6 @@
 #include "version/version.h"
 #include "tree-renderer/lib-cell-renderer.h"
 #include "gds-parser/gds-tree-checker.h"
-#include "layer-selector-dnd.h"
-
 /**
  * @brief User data supplied to callback function of the open button
  */