Move documentation around to match the key order