diff --git a/hypr/environment.conf b/hypr/config/environment.conf
similarity index 100%
rename from hypr/environment.conf
rename to hypr/config/environment.conf
diff --git a/hypr/keybinds.conf b/hypr/config/keybinds.conf
similarity index 98%
rename from hypr/keybinds.conf
rename to hypr/config/keybinds.conf
index c5b818d..de089b7 100644
--- a/hypr/keybinds.conf
+++ b/hypr/config/keybinds.conf
@@ -9,6 +9,7 @@ bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 bind = $mainMod, L, exec, $lockScreen # hyprlock
+bind = $mainMod, ., exec, emote
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
diff --git a/hypr/nvidia.conf b/hypr/config/nvidia.conf
similarity index 100%
rename from hypr/nvidia.conf
rename to hypr/config/nvidia.conf
diff --git a/hypr/rules.conf b/hypr/config/rules.conf
similarity index 100%
rename from hypr/rules.conf
rename to hypr/config/rules.conf
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index dbe5c08..4243387 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -20,7 +20,7 @@ monitor=,preferred,auto,auto
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
 
-exec-once = waybar & hypridle
+exec-once = waybar & hypridle & emote
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -34,9 +34,10 @@ $lockScreen = hyprlock
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
-source = ~/.config/hypr/environment.conf
-source = ~/.config/hypr/keybinds.conf
-source = ~/.config/hypr/rules.conf
+source = ~/.config/hypr/config/environment.conf
+source = ~/.config/hypr/config/keybinds.conf
+source = ~/.config/hypr/config/rules.conf
+source = ~/.config/hypr/config/nvidia.conf
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {