Move app state out of sub-namespace