diff --git a/.cat.sh b/.cat.sh
deleted file mode 100755
index 0ad9f7d4..00000000
--- a/.cat.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# Do not use this script unless you know what you are doing!
-cat bashrc > ~/.bashrc
-cat tmux.conf > ~/.tmux.conf
-cat zshrc > ~/.zshrc
-cat gitconfig > ~/.gitconfig
-cat vimrc > ~/.vimrc
-if [ ! -f ~/.oidentd.conf ]; then
-    cat oidentd.conf > ~/.oidentd.conf
-fi
-mkdir -p ~/.gnupg
-cat gpg.conf > ~/.gnupg/gpg.conf
-cat gpg-agent.conf > ~/.gnupg/gpg-agent.conf
-cat sks-keyservers.netCA.pem > ~/.gnupg/sks-keyservers.netCA.pem
-cat xsessionrc > ~/.xsessionrc
-cat xinitrc > ~/.xinitrc
-cat pastebinit.xml > ~/.pastebinit.xml
-cat Xdefaults > ~/.Xdefaults
-mkdir -p ~/.inxi
-cat inxi.conf > ~/.inxi/inxi.conf
-gpg --quiet --import .keys/0x4DB53CFE82A46728.asc&
-gpg --quiet --import .keys/0xDAA6CA08F2E96AC7.asc&
-gpg --quiet --import .keys/0x0C207F07B2F32B67.asc&
-mkdir -p ~/.ssh
-chmod a+xr chmod
-bash -x ./chmod& 2>/dev/null
-cat chmod > ~/chmod
-cat wwwuser > ~/wwwuser
-chmod a+xr ~/chmod
-chmod a+r ~/wwwuser
-# vim : set ft=sh :
-#chmod 700 $HOME -R
diff --git a/.install.MIKAELA_GREP.run b/.install.MIKAELA_GREP.run
deleted file mode 100755
index 1c786540..00000000
--- a/.install.MIKAELA_GREP.run
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# Do not use this script unless you know what you are doing!
-set -x
-cat .bash_aliases.MIKAELA_GREP > ~/.bash_aliases
-cat .zsh_aliases.MIKAELA_GREP > ~/.zsh_aliases
-cat .gitconfig.MIKAELA_GREP > ~/.gitconfig
-mkdir -p ~/.gnupg
-cat sks-keyservers.netCA.pem > ~/.gnupg/sks-keyservers.netCA.pem
-cat .gpg.conf.MIKAELA_GREP > ~/.gnupg/gpg.conf
-cat .pastebinit.xml.MIKAELA_GREP > ~/.pastebinit.xml
-cat .environment.MIKAELA_GREP > ~/.environment
-cat .gitconfig.MIKAELA_GREP > ~/.gitconfig
-mkdir -p ~/.ssh
-cat .keys/ssh > ~/.ssh/authorized_keys
-touch ~/.MIKAELA_GREP
-set +x
-# vim : set ft=sh :
diff --git a/.bash_aliases.MIKAELA_GREP b/.mikaela/bash_aliases
similarity index 100%
rename from .bash_aliases.MIKAELA_GREP
rename to .mikaela/bash_aliases
diff --git a/.environment.MIKAELA_GREP b/.mikaela/environment
similarity index 100%
rename from .environment.MIKAELA_GREP
rename to .mikaela/environment
diff --git a/.gitconfig.MIKAELA_GREP b/.mikaela/gitconfig
similarity index 100%
rename from .gitconfig.MIKAELA_GREP
rename to .mikaela/gitconfig
diff --git a/.gpg.conf.MIKAELA_GREP b/.mikaela/gpg.conf
similarity index 100%
rename from .gpg.conf.MIKAELA_GREP
rename to .mikaela/gpg.conf
diff --git a/.keys/0x0C207F07B2F32B67.asc b/.mikaela/keys/0x0C207F07B2F32B67.asc
similarity index 100%
rename from .keys/0x0C207F07B2F32B67.asc
rename to .mikaela/keys/0x0C207F07B2F32B67.asc
diff --git a/.keys/0x4DB53CFE82A46728.asc b/.mikaela/keys/0x4DB53CFE82A46728.asc
similarity index 100%
rename from .keys/0x4DB53CFE82A46728.asc
rename to .mikaela/keys/0x4DB53CFE82A46728.asc
diff --git a/.keys/0xDAA6CA08F2E96AC7.asc b/.mikaela/keys/0xDAA6CA08F2E96AC7.asc
similarity index 100%
rename from .keys/0xDAA6CA08F2E96AC7.asc
rename to .mikaela/keys/0xDAA6CA08F2E96AC7.asc
diff --git a/.keys/ssh b/.mikaela/keys/ssh
similarity index 100%
rename from .keys/ssh
rename to .mikaela/keys/ssh
diff --git a/.pastebinit.xml.MIKAELA_GREP b/.mikaela/pastebinit.xml
similarity index 100%
rename from .pastebinit.xml.MIKAELA_GREP
rename to .mikaela/pastebinit.xml
diff --git a/.zsh_aliases.MIKAELA_GREP b/.mikaela/zsh_aliases
similarity index 100%
rename from .zsh_aliases.MIKAELA_GREP
rename to .mikaela/zsh_aliases
diff --git a/.mikaela_install b/.mikaela_install
new file mode 100755
index 00000000..2ca33708
--- /dev/null
+++ b/.mikaela_install
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Do not use this script unless you know what you are doing!
+set -x
+cat .mikaela/bash_aliases> ~/.bash_aliases
+cat .mikaela/zsh_aliases > ~/.zsh_aliases
+cat .mikaela/gitconfig > ~/.gitconfig
+mkdir -p ~/.gnupg
+cat .mikaela/gpg.conf> ~/.gnupg/gpg.conf
+cat .mikaela/pastebinit.xml > ~/.pastebinit.xml
+cat .mikaela/environment > ~/.environment
+cat .mikaela/gitconfig > ~/.gitconfig
+mkdir -p ~/.ssh
+cat .mikaela/keys/ssh > ~/.ssh/authorized_keys
+touch ~/.MIKAELA_GREP
+set +x
+# vim : set ft=sh :
diff --git a/README.md b/README.md
index ad831023..8ebab4b8 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,2 @@
-## What is this?
-
-This repository has my rc-files other things that I want to have everywhere.
-### Where does the name "shell-things" come from? / History
-
-In the beginning this repository was only GitHub gist and contained only 
-two files, bashrc. 
-
-Then I moved to zsh and abandoned .bashrc. 
-
-Some time after that I got need for having both files so I merged them 
-into shell-things. At some point there came many other files from which 
-some aren't related to shells, but I don't want to rename it.
-
-And why would I rename this? shell-things name is more unique than dotfiles 
-and this has been shell-things for years.
-
-### How do I use this?
-
-
-#### How you should use this.
-
-The best way to use files things like this is to read them and copy-paste 
-the things that look useful to you to your own files.
-
-#### How you will most likely use this.
-
-If you are lazy or want to copy me as much as possible, you will install 
-git, curl and wget if you don't have them already and run
-
-```
-wget https://mikaela.github.io/shell-things/shell-things.bash
-source shell-things.bash
-shell-things
-source ~/.$(echo $SHELL|cut -d/ -f3)rc
-```
-
-To upgrade, simply run `shell-things`.
-
-##### How I use this.
-
-As I know everything that is in this repository, I simply do the above.
-
-I know everything that is in this file and how it affects my environment 
-and I want it, so I can do that.
+Config files that I wish to have everywhere. You could probably call this
+repository as dotfiles, but historical reasons...
diff --git a/chmod b/chmod
index 3ffbf659..282035b5 100755
--- a/chmod
+++ b/chmod
@@ -2,8 +2,6 @@
 # This script removes permissions from other people than the owner to 
 # files/folders that they don't have access to and where they don't need
 # access.
-## THIS SCRIPT HAS MOVED TO SHELL-THINGS AS "chmod"!
-## https://raw.github.com/Mikaela/shell-things/master/chmod
 set -x
 
 chmod g-rwx,o-rwx $HOME -R
@@ -25,8 +23,4 @@ chmod a+r-wx,u+rw ~/.face
 chmod a+r-wx,u+rw ~/.forward
 chmod 600 ~/.netrc
 
-if [ -f chmod.2 ]; then
-    ./chmod.2
-fi
-
 set +x
diff --git a/Xdefaults b/conf/Xdefaults
similarity index 100%
rename from Xdefaults
rename to conf/Xdefaults
diff --git a/gitconfig b/conf/gitconfig
similarity index 100%
rename from gitconfig
rename to conf/gitconfig
diff --git a/inxi.conf b/conf/inxi.conf
similarity index 100%
rename from inxi.conf
rename to conf/inxi.conf
diff --git a/oidentd.conf b/conf/oidentd.conf
similarity index 100%
rename from oidentd.conf
rename to conf/oidentd.conf
diff --git a/pastebinit.xml b/conf/pastebinit.xml
similarity index 100%
rename from pastebinit.xml
rename to conf/pastebinit.xml
diff --git a/tmux.conf b/conf/tmux.conf
similarity index 100%
rename from tmux.conf
rename to conf/tmux.conf
diff --git a/gpg-agent.conf b/gpg/gpg-agent.conf
similarity index 100%
rename from gpg-agent.conf
rename to gpg/gpg-agent.conf
diff --git a/gpg.conf b/gpg/gpg.conf
similarity index 100%
rename from gpg.conf
rename to gpg/gpg.conf
diff --git a/sks-keyservers.netCA.pem b/gpg/sks-keyservers.netCA.pem
similarity index 100%
rename from sks-keyservers.netCA.pem
rename to gpg/sks-keyservers.netCA.pem
diff --git a/install b/install
new file mode 100755
index 00000000..28aacc03
--- /dev/null
+++ b/install
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+# Do not use this script unless you know what you are doing!
+set -x
+
+export MIKAELA_GREP=$HOME/.MIKAELA_GREP
+
+cat rc/bashrc > ~/.bashrc
+cat conf/tmux.conf > ~/.tmux.conf
+cat rc/zshrc > ~/.zshrc
+cat conf/gitconfig > ~/.gitconfig
+cat rc/vimrc > ~/.vimrc
+if [ ! -f ~/.oidentd.conf ]; then
+    cat conf/oidentd.conf > ~/.oidentd.conf
+fi
+mkdir -p ~/.gnupg
+cat gpg/gpg.conf > ~/.gnupg/gpg.conf
+cat gpg/gpg-agent.conf > ~/.gnupg/gpg-agent.conf
+cat gpg/sks-keyservers.netCA.pem > ~/.gnupg/sks-keyservers.netCA.pem
+cat rc/xsessionrc > ~/.xsessionrc
+cat rc/xinitrc > ~/.xinitrc
+cat conf/pastebinit.xml > ~/.pastebinit.xml
+cat conf/Xdefaults > ~/.Xdefaults
+mkdir -p ~/.inxi
+cat conf/inxi.conf > ~/.inxi/inxi.conf
+gpg --quiet --import .keys/0x4DB53CFE82A46728.asc&
+gpg --quiet --import .keys/0xDAA6CA08F2E96AC7.asc&
+gpg --quiet --import .keys/0x0C207F07B2F32B67.asc&
+mkdir -p ~/.ssh
+chmod a+xr chmod
+bash -x ./chmod&
+
+if [ -f $HOME/.MIKAELAGREP ]
+then
+    mv $HOME/.MIKAELAGREP $MIKAELA_GREP
+fi
+
+if [ -f "$MIKAELA_GREP" ]
+then
+    bash -x .mikaela_install
+fi
+
+set +x
+# vim : set ft=sh :
+#chmod 700 $HOME -R
diff --git a/install.run b/install.run
deleted file mode 100755
index 1c6edd70..00000000
--- a/install.run
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-# Do not use this script unless you know what you are doing!
-set -x
-
-export MIKAELA_GREP=$HOME/.MIKAELA_GREP
-
-cat bashrc > ~/.bashrc
-cat tmux.conf > ~/.tmux.conf
-cat zshrc > ~/.zshrc
-cat gitconfig > ~/.gitconfig
-cat vimrc > ~/.vimrc
-if [ ! -f ~/.oidentd.conf ]; then
-    cat oidentd.conf > ~/.oidentd.conf
-fi
-mkdir -p ~/.gnupg
-cat gpg.conf > ~/.gnupg/gpg.conf
-cat gpg-agent.conf > ~/.gnupg/gpg-agent.conf
-cat sks-keyservers.netCA.pem > ~/.gnupg/sks-keyservers.netCA.pem
-cat xsessionrc > ~/.xsessionrc
-cat xinitrc > ~/.xinitrc
-cat pastebinit.xml > ~/.pastebinit.xml
-cat Xdefaults > ~/.Xdefaults
-mkdir -p ~/.inxi
-cat inxi.conf > ~/.inxi/inxi.conf
-gpg --quiet --import .keys/0x4DB53CFE82A46728.asc&
-gpg --quiet --import .keys/0xDAA6CA08F2E96AC7.asc&
-gpg --quiet --import .keys/0x0C207F07B2F32B67.asc&
-mkdir -p ~/.ssh
-chmod a+xr chmod
-bash -x ./chmod&
-cat chmod > ~/chmod
-chmod a+xr ~/chmod
-
-if [ -f $HOME/.MIKAELAGREP ]
-then
-    mv $HOME/.MIKAELAGREP $MIKAELA_GREP
-fi
-
-if [ -f "$MIKAELA_GREP" ]
-then
-    echo "MIKAELA_GREP has been used previously, Installing/Upgrading."
-    bash -x ./.install.MIKAELA_GREP.run
-fi
-
-set +x
-# vim : set ft=sh :
-#chmod 700 $HOME -R
diff --git a/bashrc b/rc/bashrc
similarity index 100%
rename from bashrc
rename to rc/bashrc
diff --git a/vimrc b/rc/vimrc
similarity index 100%
rename from vimrc
rename to rc/vimrc
diff --git a/xinitrc b/rc/xinitrc
similarity index 100%
rename from xinitrc
rename to rc/xinitrc
diff --git a/xsessionrc b/rc/xsessionrc
similarity index 100%
rename from xsessionrc
rename to rc/xsessionrc
diff --git a/zshrc b/rc/zshrc
similarity index 100%
rename from zshrc
rename to rc/zshrc