Refactor Peristency, LocationDefaults modules.