Some more reshuffling of stuff