Complete refactoring for the sake of using prezto!

Signed-off-by: Markus Hubig <mhubig@gmail.com>