More refactoring.
Added more packages.
Added tmux.
Merge branch 'refactoring'