refactor(API): Wrap everything in data containers