Cleaned up packages a bit.
Bash-completion still doesn't work, oh well.