More formatting
Revert "Some reorganisation"

This reverts commit 9f973b6302a65e3d19631ec8f51a2cd6808dc293.

Conflicts:
	.vimrc