diff --git a/config.h b/src/config.h
similarity index 100%
rename from config.h
rename to src/config.h
diff --git a/src/lib/crywl.h b/src/lib/crywl.h
index 3b5b89b..14942c6 100644
--- a/src/lib/crywl.h
+++ b/src/lib/crywl.h
@@ -2,7 +2,7 @@
 #ifndef CRYWL_H
 #define CRYWL_H
 
-#include "util.h"
+#include "../util.h"
 
 /* ===== Functional Declarations ===== */
 static void chvt(const Arg *arg);
diff --git a/src/main.c b/src/main.c
index 477c0ac..66ea8b8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,76 +4,72 @@
 #include <getopt.h>
 #include <libinput.h>
 #include <linux/input-event-codes.h>
-#include <math.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-core.h>
-#include <wlr/backend.h>
-#include <wlr/backend/libinput.h>
-#include <wlr/render/allocator.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_alpha_modifier_v1.h>
-#include <wlr/types/wlr_compositor.h>
-#include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_cursor_shape_v1.h>
-#include <wlr/types/wlr_data_control_v1.h>
-#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_drm.h>
-#include <wlr/types/wlr_export_dmabuf_v1.h>
-#include <wlr/types/wlr_fractional_scale_v1.h>
-#include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_idle_inhibit_v1.h>
-#include <wlr/types/wlr_idle_notify_v1.h>
-#include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_keyboard_group.h>
-#include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_linux_dmabuf_v1.h>
-#include <wlr/types/wlr_linux_drm_syncobj_v1.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_output_management_v1.h>
-#include <wlr/types/wlr_output_power_management_v1.h>
-#include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_pointer_constraints_v1.h>
-#include <wlr/types/wlr_presentation_time.h>
-#include <wlr/types/wlr_primary_selection.h>
-#include <wlr/types/wlr_primary_selection_v1.h>
-#include <wlr/types/wlr_relative_pointer_v1.h>
-#include <wlr/types/wlr_scene.h>
-#include <wlr/types/wlr_screencopy_v1.h>
-#include <wlr/types/wlr_seat.h>
-#include <wlr/types/wlr_server_decoration.h>
-#include <wlr/types/wlr_session_lock_v1.h>
-#include <wlr/types/wlr_single_pixel_buffer_v1.h>
-#include <wlr/types/wlr_subcompositor.h>
-#include <wlr/types/wlr_viewporter.h>
-#include <wlr/types/wlr_virtual_keyboard_v1.h>
-#include <wlr/types/wlr_virtual_pointer_v1.h>
-#include <wlr/types/wlr_xcursor_manager.h>
-#include <wlr/types/wlr_xdg_activation_v1.h>
-#include <wlr/types/wlr_xdg_decoration_v1.h>
-#include <wlr/types/wlr_xdg_output_v1.h>
-#include <wlr/types/wlr_xdg_shell.h>
+// #include <wayland-server-core.h>
+// #include <wlr/backend.h>
+// #include <wlr/backend/libinput.h>
+// #include <wlr/render/allocator.h>
+// #include <wlr/render/wlr_renderer.h>
+// #include <wlr/types/wlr_alpha_modifier_v1.h>
+// #include <wlr/types/wlr_compositor.h>
+// #include <wlr/types/wlr_cursor.h>
+// #include <wlr/types/wlr_cursor_shape_v1.h>
+// #include <wlr/types/wlr_data_control_v1.h>
+// #include <wlr/types/wlr_data_device.h>
+// #include <wlr/types/wlr_drm.h>
+// #include <wlr/types/wlr_export_dmabuf_v1.h>
+// #include <wlr/types/wlr_fractional_scale_v1.h>
+// #include <wlr/types/wlr_gamma_control_v1.h>
+// #include <wlr/types/wlr_idle_inhibit_v1.h>
+// #include <wlr/types/wlr_idle_notify_v1.h>
+// #include <wlr/types/wlr_input_device.h>
+// #include <wlr/types/wlr_keyboard.h>
+// #include <wlr/types/wlr_keyboard_group.h>
+// #include <wlr/types/wlr_layer_shell_v1.h>
+// #include <wlr/types/wlr_linux_dmabuf_v1.h>
+// #include <wlr/types/wlr_linux_drm_syncobj_v1.h>
+// #include <wlr/types/wlr_output.h>
+// #include <wlr/types/wlr_output_layout.h>
+// #include <wlr/types/wlr_output_management_v1.h>
+// #include <wlr/types/wlr_output_power_management_v1.h>
+// #include <wlr/types/wlr_pointer.h>
+// #include <wlr/types/wlr_pointer_constraints_v1.h>
+// #include <wlr/types/wlr_presentation_time.h>
+// #include <wlr/types/wlr_primary_selection.h>
+// #include <wlr/types/wlr_primary_selection_v1.h>
+// #include <wlr/types/wlr_relative_pointer_v1.h>
+// #include <wlr/types/wlr_scene.h>
+// #include <wlr/types/wlr_screencopy_v1.h>
+// #include <wlr/types/wlr_seat.h>
+// #include <wlr/types/wlr_server_decoration.h>
+// #include <wlr/types/wlr_session_lock_v1.h>
+// #include <wlr/types/wlr_single_pixel_buffer_v1.h>
+// #include <wlr/types/wlr_subcompositor.h>
+// #include <wlr/types/wlr_viewporter.h>
+// #include <wlr/types/wlr_virtual_keyboard_v1.h>
+// #include <wlr/types/wlr_virtual_pointer_v1.h>
+// #include <wlr/types/wlr_xcursor_manager.h>
+// #include <wlr/types/wlr_xdg_activation_v1.h>
+// #include <wlr/types/wlr_xdg_decoration_v1.h>
+// #include <wlr/types/wlr_xdg_output_v1.h>
+// #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
-#include <wlr/util/region.h>
-#include <xkbcommon/xkbcommon.h>
-#ifdef XWAYLAND
-#include <wlr/xwayland.h>
-#include <xcb/xcb.h>
-#include <xcb/xcb_icccm.h>
-#endif
+// #include <wlr/util/region.h>
+// #include <xkbcommon/xkbcommon.h>
+// #ifdef XWAYLAND
+// #include <wlr/xwayland.h>
+// #include <xcb/xcb.h>
+// #include <xcb/xcb_icccm.h>
+// #endif
+
+#include "lib/crywl.h"
 
 #include "util.h"
 
-/* global event handlers */
-static struct wl_listener new_xdg_toplevel = {.notify = createnotify};
-static struct wl_listener request_activate = {.notify = urgent};
-
 /* configuration, allows nested code to access above variables */
 #include "config.h"