New xmonad refactor

Removed un-necessary complexity.