diff --git a/ansible/ansible-base/playbook.yml b/ansible/ansible-base/playbook.yml
deleted file mode 100644
index 07e993a..0000000
--- a/ansible/ansible-base/playbook.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
- - hosts: localhost
-   connection: local
-   become: true
-   roles:
-      - packages
-      - configs
-
diff --git a/ansible/ansible-base/roles/configs/files/bashrc b/ansible/ansible-base/roles/configs/files/bashrc
deleted file mode 100644
index 351fb59..0000000
--- a/ansible/ansible-base/roles/configs/files/bashrc
+++ /dev/null
@@ -1,118 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-        # We have color support; assume it's compliant with Ecma-48
-        # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-        # a case would tend to support setf rather than setaf.)
-        color_prompt=yes
-    else
-        color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
diff --git a/ansible/ansible-base/roles/configs/tasks/main.yml b/ansible/ansible-base/roles/configs/tasks/main.yml
deleted file mode 100644
index 726c896..0000000
--- a/ansible/ansible-base/roles/configs/tasks/main.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-
- - name: Put htop config
-   template:
-     src: files/htoprc
-     dest: /etc/htoprc
- - name: Put mc config
-   template:
-     src: files/mcrc
-     dest: /etc/mc/mc.ini
- - name: Put vim config
-   template:
-     src: files/vimrc
-     dest: /etc/vimrc
- - name: Put screen config
-   template:
-     src: files/screenrc
-     dest: /etc/screenrc
-
- - name: Check for OMB
-   stat:
-     path: "{{ ansible_user_dir }}/.oh-my-bash"
-   register: omb_flag
-
- - debug:
-     msg: 'OMB is not installed, run: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"'
-   when: not omb_flag.stat.exists 
-
- - name: Put simple bashrc config
-   template:
-     src: files/bashrc
-     dest: "{{ ansible_user_dir }}/.bashrc"
-   when: not omb_flag.stat.exists
-
-   # - name: Put omb config
-   #template:
-   #  src: files/omb-bashrc
-   #  dest: "{{ ansible_user_dir }}/.bashrc"
-   #when: omb_flag.stat.exists
-
-# FIXME: logout from shell
-# - name: Install OMB
-#   shell: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"
-#   when: not omb_flag.stat.exists
diff --git a/ansible/ansible-base/roles/packages/tasks/main.yml b/ansible/ansible-base/roles/packages/tasks/main.yml
deleted file mode 100644
index abba6df..0000000
--- a/ansible/ansible-base/roles/packages/tasks/main.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
- - name: Install Debian packages
-   apt:
-     name: ['mc', 'htop', 'vim', 'screen', 'tmux', 'curl', 'wget', 'bash-completion', 'tree']
-     state: present
-     update_cache: yes
-   when: ansible_facts['os_family'] == "Debian"
-
- - name: Install CentOS epel
-   yum:
-     name: 'epel-release'
-     update_cache: yes
-     state: present
-   when: ansible_facts['os_family'] == "RedHat"
-
- - name: Install RedHat packages
-   yum:
-     name: ['epel-release', 'mc', 'htop', 'vim', 'screen', 'tmux', 'curl', 'wget', 'bash-completion']
-     update_cache: yes
-     state: present
-   when: ansible_facts['os_family'] == "RedHat"
diff --git a/ansible/ansible-base/README b/ansible/base-system/README
similarity index 100%
rename from ansible/ansible-base/README
rename to ansible/base-system/README
diff --git a/ansible/base-system/playbook.yml b/ansible/base-system/playbook.yml
new file mode 100644
index 0000000..ea6b82e
--- /dev/null
+++ b/ansible/base-system/playbook.yml
@@ -0,0 +1,7 @@
+---
+- hosts: localhost
+  connection: local
+  roles:
+    - { role: packages, become: true}
+    - configs
+
diff --git a/ansible/ansible-base/roles/coding_vim/files/omb-bashrc b/ansible/base-system/roles/coding_vim/files/omb-bashrc
similarity index 100%
rename from ansible/ansible-base/roles/coding_vim/files/omb-bashrc
rename to ansible/base-system/roles/coding_vim/files/omb-bashrc
diff --git a/ansible/ansible-base/roles/coding_vim/files/vimrc b/ansible/base-system/roles/coding_vim/files/vimrc
similarity index 100%
rename from ansible/ansible-base/roles/coding_vim/files/vimrc
rename to ansible/base-system/roles/coding_vim/files/vimrc
diff --git a/ansible/ansible-base/roles/coding_vim/tasks/main.yml b/ansible/base-system/roles/coding_vim/tasks/main.yml
similarity index 100%
rename from ansible/ansible-base/roles/coding_vim/tasks/main.yml
rename to ansible/base-system/roles/coding_vim/tasks/main.yml
diff --git a/ansible/base-system/roles/configs/files/bashrc b/ansible/base-system/roles/configs/files/bashrc
new file mode 100644
index 0000000..ecb495b
--- /dev/null
+++ b/ansible/base-system/roles/configs/files/bashrc
@@ -0,0 +1,285 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+        # We have color support; assume it's compliant with Ecma-48
+        # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+        # a case would tend to support setf rather than setaf.)
+        color_prompt=yes
+    else
+        color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CFl'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+# custom aliases
+alias gc='git clone'
+alias g=git
+alias ga='git add'
+alias gaa='git add --all'
+alias gam='git am'
+alias gama='git am --abort'
+alias gamc='git am --continue'
+alias gams='git am --skip'
+alias gamscp='git am --show-current-patch'
+alias gap='git apply'
+alias gapa='git add --patch'
+alias gapt='git apply --3way'
+alias gau='git add --update'
+alias gav='git add --verbose'
+alias gb='git branch'
+alias gbD='git branch -D'
+alias gba='git branch -a'
+alias gbd='git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
+alias gbl='git blame -b -w'
+alias gbnm='git branch --no-merged'
+alias gbr='git branch --remote'
+alias gbs='git bisect'
+alias gbsb='git bisect bad'
+alias gbsg='git bisect good'
+alias gbsr='git bisect reset'
+alias gbss='git bisect start'
+alias gc='git commit -v'
+alias 'gc!'='git commit -v --amend'
+alias gca='git commit -v -a'
+alias 'gca!'='git commit -v -a --amend'
+alias gcam='git commit -a -m'
+alias 'gcan!'='git commit -v -a --no-edit --amend'
+alias 'gcans!'='git commit -v -a -s --no-edit --amend'
+alias gcas='git commit -a -s'
+alias gcasm='git commit -a -s -m'
+alias gcb='git checkout -b'
+alias gcd='git checkout $(git_develop_branch)'
+alias gcf='git config --list'
+alias gcl='git clone --recurse-submodules'
+alias gclean='git clean -id'
+alias gcm='git checkout $(git_main_branch)'
+alias gcmsg='git commit -m'
+alias 'gcn!'='git commit -v --no-edit --amend'
+alias gco='git checkout'
+alias gcor='git checkout --recurse-submodules'
+alias gcount='git shortlog -sn'
+alias gcp='git cherry-pick'
+alias gcpa='git cherry-pick --abort'
+alias gcpc='git cherry-pick --continue'
+alias gcs='git commit -S'
+alias gcsm='git commit -s -m'
+alias gcss='git commit -S -s'
+alias gcssm='git commit -S -s -m'
+alias gd='git diff'
+alias gdca='git diff --cached'
+alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
+alias gdcw='git diff --cached --word-diff'
+alias gds='git diff --staged'
+alias gdt='git diff-tree --no-commit-id --name-only -r'
+alias gdup='git diff @{upstream}'
+alias gdw='git diff --word-diff'
+alias gf='git fetch'
+alias gfa='git fetch --all --prune --jobs=10'
+alias gfg='git ls-files | grep'
+alias gfo='git fetch origin'
+alias gg='git gui citool'
+alias gga='git gui citool --amend'
+alias ggpull='git pull origin "$(git_current_branch)"'
+alias ggpush='git push origin "$(git_current_branch)"'
+alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
+alias ghh='git help'
+alias gignore='git update-index --assume-unchanged'
+alias gignored='git ls-files -v | grep "^[[:lower:]]"'
+alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
+alias gk='\gitk --all --branches &!'
+alias gke='\gitk --all $(git log -g --pretty=%h) &!'
+alias gl='git pull'
+alias glg='git log --stat'
+alias glgg='git log --graph'
+alias glgga='git log --graph --decorate --all'
+alias glgm='git log --graph --max-count=10'
+alias glgp='git log --stat -p'
+alias glo='git log --oneline --decorate'
+alias glod='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'\'
+alias glods='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'\'' --date=short'
+alias glog='git log --oneline --decorate --graph'
+alias gloga='git log --oneline --decorate --graph --all'
+alias glol='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'
+alias glola='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'' --all'
+alias glols='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'' --stat'
+alias glp=_git_log_prettily
+alias glum='git pull upstream $(git_main_branch)'
+alias gm='git merge'
+alias gma='git merge --abort'
+alias gmom='git merge origin/$(git_main_branch)'
+alias gmtl='git mergetool --no-prompt'
+alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
+alias gmum='git merge upstream/$(git_main_branch)'
+alias gp='git push'
+alias gpd='git push --dry-run'
+alias gpf='git push --force-with-lease'
+alias 'gpf!'='git push --force'
+alias gpoat='git push origin --all && git push origin --tags'
+alias gpr='git pull --rebase'
+alias gpristine='git reset --hard && git clean -dffx'
+alias gpsup='git push --set-upstream origin $(git_current_branch)'
+alias gpu='git push upstream'
+alias gpv='git push -v'
+alias gr='git remote'
+alias gra='git remote add'
+alias grb='git rebase'
+alias grba='git rebase --abort'
+alias grbc='git rebase --continue'
+alias grbd='git rebase $(git_develop_branch)'
+alias grbi='git rebase -i'
+alias grbm='git rebase $(git_main_branch)'
+alias grbo='git rebase --onto'
+alias grbom='git rebase origin/$(git_main_branch)'
+alias grbs='git rebase --skip'
+alias grep='grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}'
+alias grev='git revert'
+alias grh='git reset'
+alias grhh='git reset --hard'
+alias grm='git rm'
+alias grmc='git rm --cached'
+alias grmv='git remote rename'
+alias groh='git reset origin/$(git_current_branch) --hard'
+alias grrm='git remote remove'
+alias grs='git restore'
+alias grset='git remote set-url'
+alias grss='git restore --source'
+alias grst='git restore --staged'
+alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
+alias gru='git reset --'
+alias grup='git remote update'
+alias grv='git remote -v'
+alias gsb='git status -sb'
+alias gsd='git svn dcommit'
+alias gsh='git show'
+alias gsi='git submodule init'
+alias gsps='git show --pretty=short --show-signature'
+alias gsr='git svn rebase'
+alias gss='git status -s'
+alias gst='git status'
+alias gsta='git stash push'
+alias gstaa='git stash apply'
+alias gstall='git stash --all'
+alias gstc='git stash clear'
+alias gstd='git stash drop'
+alias gstl='git stash list'
+alias gstp='git stash pop'
+alias gsts='git stash show --text'
+alias gsu='git submodule update'
+alias gsw='git switch'
+alias gswc='git switch -c'
+alias gswd='git switch $(git_develop_branch)'
+alias gswm='git switch $(git_main_branch)'
+alias gtl='gtl(){ git tag --sort=-v:refname -n -l "${1}*" }; noglob gtl'
+alias gts='git tag -s'
+alias gtv='git tag | sort -V'
+alias gunignore='git update-index --no-assume-unchanged'
+alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
+alias gup='git pull --rebase'
+alias gupa='git pull --rebase --autostash'
+alias gupav='git pull --rebase --autostash -v'
+alias gupv='git pull --rebase -v'
+alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
+
diff --git a/ansible/ansible-base/roles/configs/files/htoprc b/ansible/base-system/roles/configs/files/htoprc
similarity index 100%
rename from ansible/ansible-base/roles/configs/files/htoprc
rename to ansible/base-system/roles/configs/files/htoprc
diff --git a/ansible/ansible-base/roles/configs/files/mcrc b/ansible/base-system/roles/configs/files/mcrc
similarity index 100%
rename from ansible/ansible-base/roles/configs/files/mcrc
rename to ansible/base-system/roles/configs/files/mcrc
diff --git a/ansible/ansible-base/roles/configs/files/screenrc b/ansible/base-system/roles/configs/files/screenrc
similarity index 100%
rename from ansible/ansible-base/roles/configs/files/screenrc
rename to ansible/base-system/roles/configs/files/screenrc
diff --git a/ansible/ansible-base/roles/configs/files/vimrc b/ansible/base-system/roles/configs/files/vimrc
similarity index 57%
rename from ansible/ansible-base/roles/configs/files/vimrc
rename to ansible/base-system/roles/configs/files/vimrc
index 23a9c84..ecefe96 100644
--- a/ansible/ansible-base/roles/configs/files/vimrc
+++ b/ansible/base-system/roles/configs/files/vimrc
@@ -2,3 +2,6 @@ set mouse=
 syntax on
 "colorscheme desert
 colorscheme zellner
+set shiftwidth=2
+set tabstop=2
+set expandtab
diff --git a/ansible/base-system/roles/configs/tasks/main.yml b/ansible/base-system/roles/configs/tasks/main.yml
new file mode 100644
index 0000000..320bf53
--- /dev/null
+++ b/ansible/base-system/roles/configs/tasks/main.yml
@@ -0,0 +1,32 @@
+---
+- name: Do root tasks
+  import_tasks: root.yml
+  become: true
+
+- name: Check for OMB
+  stat:
+    path: "{{ ansible_user_dir }}/.oh-my-bash"
+  register: omb_flag
+
+- debug:
+    msg: 'OMB is not installed, run: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"'
+  when: not omb_flag.stat.exists 
+
+- name: Put simple bashrc config
+  template:
+    src: files/bashrc
+    dest: "{{ ansible_user_dir }}/.bashrc"
+  when: not omb_flag.stat.exists
+
+   # - name: Put omb config
+   #template:
+   #  src: files/omb-bashrc
+   #  dest: "{{ ansible_user_dir }}/.bashrc"
+   #when: omb_flag.stat.exists
+
+# FIXME: logout from shell
+# - name: Install OMB
+#   shell: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"
+#   when: not omb_flag.stat.exists
+
+
diff --git a/ansible/base-system/roles/configs/tasks/root.yml b/ansible/base-system/roles/configs/tasks/root.yml
new file mode 100644
index 0000000..394c1f8
--- /dev/null
+++ b/ansible/base-system/roles/configs/tasks/root.yml
@@ -0,0 +1,36 @@
+---
+- name: Create wheel group
+  group:
+    name: wheel
+    state: present
+- name: Create losted user
+  user:
+    name: losted
+    state: present
+    group: wheel
+    shell: /bin/bash
+    
+- name: Set NOPASSWORD in sudoers
+  lineinfile:
+    dest: /etc/sudoers
+    state: present
+    regexp: '^%sudo'
+    line: '%sudo ALL=(ALL) NOPASSWD: ALL'
+    validate: 'visudo -cf %s'
+
+- name: Put htop config
+  template:
+    src: files/htoprc
+    dest: /etc/htoprc
+- name: Put mc config
+  template:
+    src: files/mcrc
+    dest: /etc/mc/mc.ini
+- name: Put vim config
+  template:
+    src: files/vimrc
+    dest: /etc/vimrc
+- name: Put screen config
+  template:
+    src: files/screenrc
+    dest: /etc/screenrc
diff --git a/ansible/base-system/roles/packages/tasks/main.yml b/ansible/base-system/roles/packages/tasks/main.yml
new file mode 100644
index 0000000..58764fa
--- /dev/null
+++ b/ansible/base-system/roles/packages/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: Install Debian packages
+  apt:
+    name: ['mc', 'htop', 'vim', 'screen', 'tmux', 'curl', 'wget', 'bash-completion', 'tree']
+    state: present
+    update_cache: yes
+  when: ansible_facts['os_family'] == "Debian"
+
+- name: Install CentOS epel
+  yum:
+    name: 'epel-release'
+    update_cache: yes
+    state: present
+  when: ansible_facts['os_family'] == "RedHat"
+
+- name: Install RedHat packages
+  yum:
+    name: ['epel-release', 'mc', 'htop', 'vim', 'screen', 'tmux', 'curl', 'wget', 'bash-completion']
+    update_cache: yes
+    state: present
+  when: ansible_facts['os_family'] == "RedHat"
diff --git a/ansible/ansible-base/roles/ssh/files/auth_keys b/ansible/base-system/roles/ssh/files/auth_keys
similarity index 100%
rename from ansible/ansible-base/roles/ssh/files/auth_keys
rename to ansible/base-system/roles/ssh/files/auth_keys
diff --git a/ansible/ansible-base/roles/ssh/files/sshd_config b/ansible/base-system/roles/ssh/files/sshd_config
similarity index 100%
rename from ansible/ansible-base/roles/ssh/files/sshd_config
rename to ansible/base-system/roles/ssh/files/sshd_config
diff --git a/ansible/ansible-base/roles/ssh/tasks/main.yml b/ansible/base-system/roles/ssh/tasks/main.yml
similarity index 100%
rename from ansible/ansible-base/roles/ssh/tasks/main.yml
rename to ansible/base-system/roles/ssh/tasks/main.yml
diff --git a/ansible/ansible-iptables-passthru/main.yml b/ansible/trash/ansible-iptables-passthru/main.yml
similarity index 100%
rename from ansible/ansible-iptables-passthru/main.yml
rename to ansible/trash/ansible-iptables-passthru/main.yml
diff --git a/ansible/drbd-ansible/global_common.conf b/ansible/trash/drbd-ansible/global_common.conf
similarity index 100%
rename from ansible/drbd-ansible/global_common.conf
rename to ansible/trash/drbd-ansible/global_common.conf
diff --git a/ansible/drbd-ansible/playme.yml b/ansible/trash/drbd-ansible/playme.yml
similarity index 100%
rename from ansible/drbd-ansible/playme.yml
rename to ansible/trash/drbd-ansible/playme.yml
diff --git a/ansible/gluster-ansible/bashrc b/ansible/trash/gluster-ansible/bashrc
similarity index 100%
rename from ansible/gluster-ansible/bashrc
rename to ansible/trash/gluster-ansible/bashrc
diff --git a/ansible/gluster-ansible/destroy.yml b/ansible/trash/gluster-ansible/destroy.yml
similarity index 100%
rename from ansible/gluster-ansible/destroy.yml
rename to ansible/trash/gluster-ansible/destroy.yml
diff --git a/ansible/gluster-ansible/hosts b/ansible/trash/gluster-ansible/hosts
similarity index 100%
rename from ansible/gluster-ansible/hosts
rename to ansible/trash/gluster-ansible/hosts
diff --git a/ansible/gluster-ansible/playme.yml b/ansible/trash/gluster-ansible/playme.yml
similarity index 100%
rename from ansible/gluster-ansible/playme.yml
rename to ansible/trash/gluster-ansible/playme.yml
diff --git a/ansible/gluster-ansible/sudoers b/ansible/trash/gluster-ansible/sudoers
similarity index 100%
rename from ansible/gluster-ansible/sudoers
rename to ansible/trash/gluster-ansible/sudoers