some structural reshuffling of Jekyll