Reorganised to make more sense. Introduced new caching architecture for both nx objects and data. Preparing to break out metrics as individual API verbs