refactor packages and use CuratorConfiguration