diff --git a/modules/template-boilerplate-fix-me.nix b/modules/locale.nix
similarity index 58%
rename from modules/template-boilerplate-fix-me.nix
rename to modules/locale.nix
index c8d901a..c9d83dd 100644
--- a/modules/template-boilerplate-fix-me.nix
+++ b/modules/locale.nix
@@ -1,10 +1,6 @@
 {
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
-  # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
   i18n.extraLocaleSettings = {
@@ -18,12 +14,4 @@
     LC_TELEPHONE = "en_US.UTF-8";
     LC_TIME = "en_US.UTF-8";
   };
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-
-  services.openssh.enable = true;
 }
diff --git a/modules/ssh.nix b/modules/ssh.nix
new file mode 100644
index 0000000..8f0456f
--- /dev/null
+++ b/modules/ssh.nix
@@ -0,0 +1,3 @@
+{
+  services.openssh.enable = true;
+}
diff --git a/modules/xkb.nix b/modules/xkb.nix
new file mode 100644
index 0000000..80c1889
--- /dev/null
+++ b/modules/xkb.nix
@@ -0,0 +1,6 @@
+{
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+}