diff --git a/.xmonad/README.org b/.config/xmonad/README.org
similarity index 100%
rename from .xmonad/README.org
rename to .config/xmonad/README.org
diff --git a/.xmonad/pacman-hooks/recompile-xmonad.hook b/.config/xmonad/pacman-hooks/recompile-xmonad.hook
similarity index 100%
rename from .xmonad/pacman-hooks/recompile-xmonad.hook
rename to .config/xmonad/pacman-hooks/recompile-xmonad.hook
diff --git a/.xmonad/pacman-hooks/recompile-xmonadh.hook b/.config/xmonad/pacman-hooks/recompile-xmonadh.hook
similarity index 100%
rename from .xmonad/pacman-hooks/recompile-xmonadh.hook
rename to .config/xmonad/pacman-hooks/recompile-xmonadh.hook
diff --git a/.xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs
similarity index 100%
rename from .xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs
rename to .config/xmonad/xmonad-example-configs/xmonad-example-polybar-treeselect-workspaces.hs
diff --git a/.xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs
similarity index 100%
rename from .xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs
rename to .config/xmonad/xmonad-example-configs/xmonad-example-xmobar-clickable-workspaces.hs
diff --git a/.xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs
similarity index 100%
rename from .xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs
rename to .config/xmonad/xmonad-example-configs/xmonad-example-xmobar-non-clickable.hs
diff --git a/.xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs b/.config/xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs
similarity index 100%
rename from .xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs
rename to .config/xmonad/xmonad-example-configs/xmonad-example-xmobar-treeselect-workspaces.hs
diff --git a/.xmonad/xmonad.hs b/.config/xmonad/xmonad.hs
similarity index 100%
rename from .xmonad/xmonad.hs
rename to .config/xmonad/xmonad.hs
diff --git a/.xmonad/xmonadctl.hs b/.config/xmonad/xmonadctl.hs
similarity index 100%
rename from .xmonad/xmonadctl.hs
rename to .config/xmonad/xmonadctl.hs
diff --git a/.xmonad/xpm/calendar-clock-icon_20.xpm b/.config/xmonad/xpm/calendar-clock-icon_20.xpm
similarity index 100%
rename from .xmonad/xpm/calendar-clock-icon_20.xpm
rename to .config/xmonad/xpm/calendar-clock-icon_20.xpm
diff --git a/.xmonad/xpm/cpu_20.xpm b/.config/xmonad/xpm/cpu_20.xpm
similarity index 100%
rename from .xmonad/xpm/cpu_20.xpm
rename to .config/xmonad/xpm/cpu_20.xpm
diff --git a/.xmonad/xpm/harddisk-icon_20.xpm b/.config/xmonad/xpm/harddisk-icon_20.xpm
similarity index 100%
rename from .xmonad/xpm/harddisk-icon_20.xpm
rename to .config/xmonad/xpm/harddisk-icon_20.xpm
diff --git a/.xmonad/xpm/haskell_20.xpm b/.config/xmonad/xpm/haskell_20.xpm
similarity index 100%
rename from .xmonad/xpm/haskell_20.xpm
rename to .config/xmonad/xpm/haskell_20.xpm
diff --git a/.xmonad/xpm/memory-icon_20.xpm b/.config/xmonad/xpm/memory-icon_20.xpm
similarity index 100%
rename from .xmonad/xpm/memory-icon_20.xpm
rename to .config/xmonad/xpm/memory-icon_20.xpm
diff --git a/.xmonad/xpm/net_down_20.xpm b/.config/xmonad/xpm/net_down_20.xpm
similarity index 100%
rename from .xmonad/xpm/net_down_20.xpm
rename to .config/xmonad/xpm/net_down_20.xpm
diff --git a/.xmonad/xpm/net_up_20.xpm b/.config/xmonad/xpm/net_up_20.xpm
similarity index 100%
rename from .xmonad/xpm/net_up_20.xpm
rename to .config/xmonad/xpm/net_up_20.xpm
diff --git a/.local/share/xmonad/.gitkeep b/.local/share/xmonad/.gitkeep
new file mode 100644
index 0000000..e69de29