Moved zone storage and manipulation into a repository.