Re-organizing Unite's config