Revert "Oh dear I pushed a broken commit"

This reverts commit 51e4b1221baefeb3ac17e1dcf9dcaa864348f5bf.
Moving stuff around