diff --git a/.config/i3blocks/blocks/bandwidth b/.config/i3/blocks/bandwidth
similarity index 100%
rename from .config/i3blocks/blocks/bandwidth
rename to .config/i3/blocks/bandwidth
diff --git a/.config/i3blocks/blocks/battery b/.config/i3/blocks/battery
similarity index 100%
rename from .config/i3blocks/blocks/battery
rename to .config/i3/blocks/battery
diff --git a/.config/i3blocks/blocks/clock b/.config/i3/blocks/clock
similarity index 100%
rename from .config/i3blocks/blocks/clock
rename to .config/i3/blocks/clock
diff --git a/.config/i3blocks/blocks/cpu_usage b/.config/i3/blocks/cpu_usage
similarity index 100%
rename from .config/i3blocks/blocks/cpu_usage
rename to .config/i3/blocks/cpu_usage
diff --git a/.config/i3blocks/blocks/disk b/.config/i3/blocks/disk
similarity index 100%
rename from .config/i3blocks/blocks/disk
rename to .config/i3/blocks/disk
diff --git a/.config/i3blocks/blocks/iface b/.config/i3/blocks/iface
similarity index 100%
rename from .config/i3blocks/blocks/iface
rename to .config/i3/blocks/iface
diff --git a/.config/i3blocks/blocks/keyindicator b/.config/i3/blocks/keyindicator
similarity index 100%
rename from .config/i3blocks/blocks/keyindicator
rename to .config/i3/blocks/keyindicator
diff --git a/.config/i3blocks/blocks/load_average b/.config/i3/blocks/load_average
similarity index 100%
rename from .config/i3blocks/blocks/load_average
rename to .config/i3/blocks/load_average
diff --git a/.config/i3blocks/blocks/mediaplayer b/.config/i3/blocks/mediaplayer
similarity index 100%
rename from .config/i3blocks/blocks/mediaplayer
rename to .config/i3/blocks/mediaplayer
diff --git a/.config/i3blocks/blocks/memory b/.config/i3/blocks/memory
similarity index 100%
rename from .config/i3blocks/blocks/memory
rename to .config/i3/blocks/memory
diff --git a/.config/i3blocks/blocks/openvpn b/.config/i3/blocks/openvpn
similarity index 100%
rename from .config/i3blocks/blocks/openvpn
rename to .config/i3/blocks/openvpn
diff --git a/.config/i3blocks/blocks/temperature b/.config/i3/blocks/temperature
similarity index 100%
rename from .config/i3blocks/blocks/temperature
rename to .config/i3/blocks/temperature
diff --git a/.config/i3blocks/blocks/toggleoutput.sh b/.config/i3/blocks/toggleoutput.sh
similarity index 100%
rename from .config/i3blocks/blocks/toggleoutput.sh
rename to .config/i3/blocks/toggleoutput.sh
diff --git a/.config/i3blocks/blocks/updates b/.config/i3/blocks/updates
similarity index 100%
rename from .config/i3blocks/blocks/updates
rename to .config/i3/blocks/updates
diff --git a/.config/i3blocks/blocks/volume b/.config/i3/blocks/volume
similarity index 100%
rename from .config/i3blocks/blocks/volume
rename to .config/i3/blocks/volume
diff --git a/.config/i3blocks/blocks/wifi b/.config/i3/blocks/wifi
similarity index 100%
rename from .config/i3blocks/blocks/wifi
rename to .config/i3/blocks/wifi
diff --git a/.config/i3blocks/config b/.config/i3/blocksconfig
similarity index 96%
rename from .config/i3blocks/config
rename to .config/i3/blocksconfig
index 3b530ea..8d724bb 100644
--- a/.config/i3blocks/config
+++ b/.config/i3/blocksconfig
@@ -24,7 +24,7 @@
 #
 # The top properties below are applied to every block, but can be overridden.
 # Each block command defaults to the script name to avoid boilerplate.
-command=~/.config/i3blocks/blocks/$BLOCK_NAME
+command=~/.config/i3/blocks/$BLOCK_NAME
 markup=none
 
 #full_text=
diff --git a/.config/i3/config b/.config/i3/config
index 6c7dc72..9190179 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -89,7 +89,7 @@ client.focused_inactive $inactive-bg-color  $inactive-bg-color $inactive-text-co
 client.urgent           $urgent-bg-color    $urgent-bg-color   $text-color          $bg-color
 
 bar {
-    status_command i3blocks -c ~/.config/i3blocks/config
+    status_command i3blocks -c ~/.config/i3/blocksconfig
 
     workspace_buttons yes
     strip_workspace_numbers yes
diff --git a/aliases b/aliases
index 6126d42..80c9ec0 100644
--- a/aliases
+++ b/aliases
@@ -97,7 +97,7 @@ alias xresources="$EDITOR ~/.Xresources ; xrdb merge ~/.Xresources"
 alias sshc="$EDITOR ~/.ssh/config"
 alias dotfiles="cd $DOTFILES"
 alias i3c="$EDITOR ~/.config/i3/config ; i3-msg restart"
-alias i3bc="$EDITOR ~/.config/i3blocks/config ; i3-msg restart"
+alias i3bc="$EDITOR ~/.config/i3/blocksconfig ; i3-msg restart"
 alias sf=screenfetch
 alias nf=neofetch