Major reshuffling of callow using the factory template.