master: Completely rewrote the data namespace to be more flexiable to future endpoints and less code in the meantime.