diff --git a/base/init.sls b/base/init.sls
index a59719a..c2d3840 100644
--- a/base/init.sls
+++ b/base/init.sls
@@ -5,7 +5,7 @@
 include:
   - base.services
   - base.hardware
-  - base.sys
   - base.hostconfig
+  - base.sysctl
   - saltmine
   - prometheus.node_exporter
diff --git a/base/sys/init.sls b/base/sys/init.sls
deleted file mode 100644
index 049ed76..0000000
--- a/base/sys/init.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-include:
-  - .sysctl
-  - .cp15_barrier
diff --git a/base/sys/cp15_barrier.sls b/base/sysctl/cp15_barrier.sls
similarity index 100%
rename from base/sys/cp15_barrier.sls
rename to base/sysctl/cp15_barrier.sls
diff --git a/base/sysctl/init.sls b/base/sysctl/init.sls
new file mode 100644
index 0000000..84c102a
--- /dev/null
+++ b/base/sysctl/init.sls
@@ -0,0 +1,4 @@
+include:
+  - base.sysctl.system
+  - base.sysctl.net_params
+  - base.sysctl.cp15_barrier
diff --git a/base/sys/sysctl.sls b/base/sysctl/net_params.sls
similarity index 82%
rename from base/sys/sysctl.sls
rename to base/sysctl/net_params.sls
index 66c3aaf..3e1b9c8 100644
--- a/base/sys/sysctl.sls
+++ b/base/sysctl/net_params.sls
@@ -1,13 +1,10 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
----
-
 sysctl:
   lookup:
     config:
-      location: '/etc/sysctl.d'
+      location: /etc/sysctl.d
   params:
-    vm.swappiness: 10
     net.ipv4.ip_forward: 1
     net.core.rmem_max:
       value: 16777216
@@ -18,7 +15,7 @@ sysctl:
     net.ipv4.tcp_rmem:
       value: 4096 87380 16777216
     net.ipv4.tcp_wmem:
-      value: 4096 65536 16777216 
+      value: 4096 65536 16777216
     net.ipv4.tcp_mtu_probing:
       value: 2
     net.ipv4.tcp_fin_timeout:
@@ -26,5 +23,4 @@ sysctl:
     net.ipv4.tcp_keepalive_intvl:
       value: 30
     net.ipv4.tcp_keepalive_probes:
-      value: 5
-
+      value: 5
\ No newline at end of file
diff --git a/base/sysctl/system.sls b/base/sysctl/system.sls
new file mode 100644
index 0000000..1728cdf
--- /dev/null
+++ b/base/sysctl/system.sls
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+sysctl:
+  lookup:
+    config:
+      location: /etc/sysctl.d
+  params:
+    vm.swappiness: 10
\ No newline at end of file