diff --git a/packages/medusa/src/api/routes/admin/auth/create-session.js b/packages/medusa/src/api/routes/admin/auth/create-session.js
index 93fabf701a..5114eba3a9 100644
--- a/packages/medusa/src/api/routes/admin/auth/create-session.js
+++ b/packages/medusa/src/api/routes/admin/auth/create-session.js
@@ -26,5 +26,5 @@ export default async (req, res) => {
     expiresIn: "24h",
   })
 
-  res.json(result.user)
+  res.json({ user: result.user })
 }
diff --git a/packages/medusa/src/api/routes/admin/discounts/add-region.js b/packages/medusa/src/api/routes/admin/discounts/add-region.js
index c32001800b..2140449eef 100644
--- a/packages/medusa/src/api/routes/admin/discounts/add-region.js
+++ b/packages/medusa/src/api/routes/admin/discounts/add-region.js
@@ -8,7 +8,7 @@ export default async (req, res) => {
     await discountService.addRegion(discount_id, region_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/discounts/add-valid-variant.js b/packages/medusa/src/api/routes/admin/discounts/add-valid-variant.js
index c924eb5b14..1cd829f4f8 100644
--- a/packages/medusa/src/api/routes/admin/discounts/add-valid-variant.js
+++ b/packages/medusa/src/api/routes/admin/discounts/add-valid-variant.js
@@ -8,7 +8,7 @@ export default async (req, res) => {
     await discountService.addValidVariant(discount_id, variant_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/discounts/create-discount.js b/packages/medusa/src/api/routes/admin/discounts/create-discount.js
index e6cc7044b7..39f9fa2f06 100644
--- a/packages/medusa/src/api/routes/admin/discounts/create-discount.js
+++ b/packages/medusa/src/api/routes/admin/discounts/create-discount.js
@@ -32,7 +32,7 @@ export default async (req, res) => {
     const discountService = req.scope.resolve("discountService")
     const data = await discountService.create(value)
 
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/discounts/get-discount.js b/packages/medusa/src/api/routes/admin/discounts/get-discount.js
index c589e94db3..af776f1ce1 100644
--- a/packages/medusa/src/api/routes/admin/discounts/get-discount.js
+++ b/packages/medusa/src/api/routes/admin/discounts/get-discount.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
     const discountService = req.scope.resolve("discountService")
     const data = await discountService.retrieve(discount_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/discounts/list-discounts.js b/packages/medusa/src/api/routes/admin/discounts/list-discounts.js
index a8801c3a61..0ec0587dc4 100644
--- a/packages/medusa/src/api/routes/admin/discounts/list-discounts.js
+++ b/packages/medusa/src/api/routes/admin/discounts/list-discounts.js
@@ -3,7 +3,7 @@ export default async (req, res) => {
     const discountService = req.scope.resolve("discountService")
     const data = await discountService.list()
 
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/discounts/remove-region.js b/packages/medusa/src/api/routes/admin/discounts/remove-region.js
index 2c27fafaac..3eb9c887b6 100644
--- a/packages/medusa/src/api/routes/admin/discounts/remove-region.js
+++ b/packages/medusa/src/api/routes/admin/discounts/remove-region.js
@@ -7,7 +7,7 @@ export default async (req, res) => {
     await discountService.removeRegion(discount_id, region_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/discounts/remove-valid-variant.js b/packages/medusa/src/api/routes/admin/discounts/remove-valid-variant.js
index 4d67d26795..2881eae241 100644
--- a/packages/medusa/src/api/routes/admin/discounts/remove-valid-variant.js
+++ b/packages/medusa/src/api/routes/admin/discounts/remove-valid-variant.js
@@ -7,7 +7,7 @@ export default async (req, res) => {
     await discountService.removeValidVariant(discount_id, variant_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/discounts/update-discount.js b/packages/medusa/src/api/routes/admin/discounts/update-discount.js
index 3a2075f448..4f90af00a7 100644
--- a/packages/medusa/src/api/routes/admin/discounts/update-discount.js
+++ b/packages/medusa/src/api/routes/admin/discounts/update-discount.js
@@ -21,7 +21,6 @@ export default async (req, res) => {
     regions: Validator.array()
       .items(Validator.string())
       .optional(),
-    metadata: Validator.object().optional(),
   })
 
   const { value, error } = schema.validate(req.body)
@@ -36,7 +35,7 @@ export default async (req, res) => {
 
     const data = await discountService.retrieve(discount_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/archive-order.js b/packages/medusa/src/api/routes/admin/orders/__tests__/archive-order.js
index 2e1a1aa006..7901bb45bc 100644
--- a/packages/medusa/src/api/routes/admin/orders/__tests__/archive-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/__tests__/archive-order.js
@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/archive", () => {
 
     it("returns order with status = archived", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("processed-order"))
-      expect(subject.body.status).toEqual("archived")
+      expect(subject.body.order._id).toEqual(IdMap.getId("processed-order"))
+      expect(subject.body.order.status).toEqual("archived")
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/cancel-order.js b/packages/medusa/src/api/routes/admin/orders/__tests__/cancel-order.js
index 2053e9470e..744e4fe0dd 100644
--- a/packages/medusa/src/api/routes/admin/orders/__tests__/cancel-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/__tests__/cancel-order.js
@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/cancel", () => {
 
     it("returns order with status = cancelled", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
-      expect(subject.body.status).toEqual("cancelled")
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order.status).toEqual("cancelled")
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/capture-payment.js b/packages/medusa/src/api/routes/admin/orders/__tests__/capture-payment.js
index b5d85cf114..416a4b88a1 100644
--- a/packages/medusa/src/api/routes/admin/orders/__tests__/capture-payment.js
+++ b/packages/medusa/src/api/routes/admin/orders/__tests__/capture-payment.js
@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/capture", () => {
 
     it("returns order with payment_status = captured", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
-      expect(subject.body.payment_status).toEqual("captured")
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order.payment_status).toEqual("captured")
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/create-fulfillment.js b/packages/medusa/src/api/routes/admin/orders/__tests__/create-fulfillment.js
index b4ff08d185..3c61e2aa1e 100644
--- a/packages/medusa/src/api/routes/admin/orders/__tests__/create-fulfillment.js
+++ b/packages/medusa/src/api/routes/admin/orders/__tests__/create-fulfillment.js
@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/fulfillment", () => {
 
     it("returns order with fulfillment_status = fulfilled", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
-      expect(subject.body.fulfillment_status).toEqual("fulfilled")
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order.fulfillment_status).toEqual("fulfilled")
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js
index 6acee42cd5..ee25953eb0 100644
--- a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js
@@ -33,7 +33,7 @@ describe("GET /admin/orders", () => {
 
     it("returns order", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/admin/orders/archive-order.js b/packages/medusa/src/api/routes/admin/orders/archive-order.js
index 9afaf1e7ef..78b9d6c721 100644
--- a/packages/medusa/src/api/routes/admin/orders/archive-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/archive-order.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.archive(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/cancel-order.js b/packages/medusa/src/api/routes/admin/orders/cancel-order.js
index 2fe6d7d01b..694f5bc236 100644
--- a/packages/medusa/src/api/routes/admin/orders/cancel-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/cancel-order.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.cancel(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/capture-payment.js b/packages/medusa/src/api/routes/admin/orders/capture-payment.js
index f6e5821a70..6a5baf5ad0 100644
--- a/packages/medusa/src/api/routes/admin/orders/capture-payment.js
+++ b/packages/medusa/src/api/routes/admin/orders/capture-payment.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.capturePayment(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/create-fulfillment.js b/packages/medusa/src/api/routes/admin/orders/create-fulfillment.js
index a4ca371889..7fc6952a61 100644
--- a/packages/medusa/src/api/routes/admin/orders/create-fulfillment.js
+++ b/packages/medusa/src/api/routes/admin/orders/create-fulfillment.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.createFulfillment(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/create-order.js b/packages/medusa/src/api/routes/admin/orders/create-order.js
index 0c2b1ea06b..cc0aaf5236 100644
--- a/packages/medusa/src/api/routes/admin/orders/create-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/create-order.js
@@ -39,7 +39,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.create(value)
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/get-order.js b/packages/medusa/src/api/routes/admin/orders/get-order.js
index 48e175c325..0eba81a217 100644
--- a/packages/medusa/src/api/routes/admin/orders/get-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/get-order.js
@@ -5,7 +5,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.retrieve(id)
 
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/index.js b/packages/medusa/src/api/routes/admin/orders/index.js
index 0d811aaa12..195674feb3 100644
--- a/packages/medusa/src/api/routes/admin/orders/index.js
+++ b/packages/medusa/src/api/routes/admin/orders/index.js
@@ -6,6 +6,7 @@ const route = Router()
 export default app => {
   app.use("/orders", route)
 
+  route.get("/", middlewares.wrap(require("./list-orders").default))
   route.get("/:id", middlewares.wrap(require("./get-order").default))
 
   route.post("/", middlewares.wrap(require("./create-order").default))
diff --git a/packages/medusa/src/api/routes/admin/orders/list-orders.js b/packages/medusa/src/api/routes/admin/orders/list-orders.js
new file mode 100644
index 0000000000..5173bad915
--- /dev/null
+++ b/packages/medusa/src/api/routes/admin/orders/list-orders.js
@@ -0,0 +1,12 @@
+export default async (req, res) => {
+  const selector = {}
+
+  try {
+    const orderService = req.scope.resolve("orderService")
+    const orders = await orderService.list(selector)
+
+    res.json({ orders })
+  } catch (error) {
+    throw error
+  }
+}
diff --git a/packages/medusa/src/api/routes/admin/orders/return-order.js b/packages/medusa/src/api/routes/admin/orders/return-order.js
index 55360951bf..0f7cc17b3b 100644
--- a/packages/medusa/src/api/routes/admin/orders/return-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/return-order.js
@@ -16,7 +16,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.return(id, value.items)
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/orders/update-order.js b/packages/medusa/src/api/routes/admin/orders/update-order.js
index 5e35229d1e..c92becb96f 100644
--- a/packages/medusa/src/api/routes/admin/orders/update-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/update-order.js
@@ -33,7 +33,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.update(id, value)
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/add-country.js b/packages/medusa/src/api/routes/admin/regions/add-country.js
index ee40e5c7c7..902302eba3 100644
--- a/packages/medusa/src/api/routes/admin/regions/add-country.js
+++ b/packages/medusa/src/api/routes/admin/regions/add-country.js
@@ -16,7 +16,7 @@ export default async (req, res) => {
     await regionService.addCountry(region_id, value.country_code)
 
     const data = await regionService.retrieve(region_id)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js b/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js
index 56da5089c9..aa56da1743 100644
--- a/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js
+++ b/packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js
@@ -16,7 +16,7 @@ export default async (req, res) => {
     await regionService.addFulfillmentProvider(region_id, value.provider_id)
 
     const data = await regionService.retrieve(region_id)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js b/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js
index a4d4ef1403..cda885ae63 100644
--- a/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js
+++ b/packages/medusa/src/api/routes/admin/regions/add-payment-provider.js
@@ -16,7 +16,7 @@ export default async (req, res) => {
     await regionService.addPaymentProvider(region_id, value.provider_id)
 
     const data = await regionService.retrieve(region_id)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/create-region.js b/packages/medusa/src/api/routes/admin/regions/create-region.js
index 364541c993..19426aea0a 100644
--- a/packages/medusa/src/api/routes/admin/regions/create-region.js
+++ b/packages/medusa/src/api/routes/admin/regions/create-region.js
@@ -18,7 +18,7 @@ export default async (req, res) => {
   try {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.create(value)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/get-region.js b/packages/medusa/src/api/routes/admin/regions/get-region.js
index c73087f7f1..184078ee8e 100644
--- a/packages/medusa/src/api/routes/admin/regions/get-region.js
+++ b/packages/medusa/src/api/routes/admin/regions/get-region.js
@@ -6,7 +6,7 @@ export default async (req, res) => {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.retrieve(region_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/list-regions.js b/packages/medusa/src/api/routes/admin/regions/list-regions.js
index f7bb5d4a7d..fae0d13772 100644
--- a/packages/medusa/src/api/routes/admin/regions/list-regions.js
+++ b/packages/medusa/src/api/routes/admin/regions/list-regions.js
@@ -5,7 +5,7 @@ export default async (req, res) => {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.list({})
 
-    res.status(200).json(data)
+    res.status(200).json({ regions: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/remove-country.js b/packages/medusa/src/api/routes/admin/regions/remove-country.js
index d4cfcd7605..b8585198ec 100644
--- a/packages/medusa/src/api/routes/admin/regions/remove-country.js
+++ b/packages/medusa/src/api/routes/admin/regions/remove-country.js
@@ -4,9 +4,9 @@ export default async (req, res) => {
   const { region_id, country_code } = req.params
   try {
     const regionService = req.scope.resolve("regionService")
-    await regionService.removeCountry(region_id, country_code)
+    const data = await regionService.removeCountry(region_id, country_code)
 
-    res.sendStatus(200)
+    res.json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js b/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js
index cc7ca7a706..0b0b2eb8a1 100644
--- a/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js
+++ b/packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js
@@ -4,9 +4,12 @@ export default async (req, res) => {
   const { region_id, provider_id } = req.params
   try {
     const regionService = req.scope.resolve("regionService")
-    await regionService.removeFulfillmentProvider(region_id, provider_id)
+    const data = await regionService.removeFulfillmentProvider(
+      region_id,
+      provider_id
+    )
 
-    res.sendStatus(200)
+    res.json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js b/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js
index 1799ea32d1..173b1b137e 100644
--- a/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js
+++ b/packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js
@@ -4,9 +4,12 @@ export default async (req, res) => {
   const { region_id, provider_id } = req.params
   try {
     const regionService = req.scope.resolve("regionService")
-    await regionService.removePaymentProvider(region_id, provider_id)
+    const data = await regionService.removePaymentProvider(
+      region_id,
+      provider_id
+    )
 
-    res.sendStatus(200)
+    res.json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/regions/update-region.js b/packages/medusa/src/api/routes/admin/regions/update-region.js
index 83f5ead386..012c1b2662 100644
--- a/packages/medusa/src/api/routes/admin/regions/update-region.js
+++ b/packages/medusa/src/api/routes/admin/regions/update-region.js
@@ -19,7 +19,7 @@ export default async (req, res) => {
   try {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.update(region_id, value)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js
index b1b3930512..ba8ad80466 100644
--- a/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js
+++ b/packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js
@@ -29,7 +29,7 @@ export default async (req, res) => {
     const optionService = req.scope.resolve("shippingOptionService")
     const data = await optionService.create(value)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_option: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js
index d73f44ecaf..8a2385057d 100644
--- a/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js
+++ b/packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js
@@ -1,13 +1,17 @@
 import { MedusaError, Validator } from "medusa-core-utils"
 
 export default async (req, res) => {
-  const { option_id} = req.params
+  const { option_id } = req.params
   try {
     const optionService = req.scope.resolve("shippingOptionService")
 
     await optionService.delete(option_id)
 
-    res.sendStatus(200)
+    res.json({
+      id: option_id,
+      object: "shipping-option",
+      deleted: true,
+    })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js
index e5bdc23ba7..665a5b7119 100644
--- a/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js
+++ b/packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
     const optionService = req.scope.resolve("shippingOptionService")
     const data = await optionService.retrieve(option_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_option: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js b/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js
index cea1dd1ff8..ccfc54c440 100644
--- a/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js
+++ b/packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
     const optionService = req.scope.resolve("shippingOptionService")
     const data = await optionService.list()
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_options: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js
index 69290a8fd8..1218aa41b4 100644
--- a/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js
+++ b/packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js
@@ -27,12 +27,8 @@ export default async (req, res) => {
 
   try {
     const optionService = req.scope.resolve("shippingOptionService")
-
-    await optionService.update(option_id, value)
-
-    const data = await optionService.retrieve(option_id)
-
-    res.status(200).json(data)
+    const data = await optionService.update(option_id, value)
+    res.status(200).json({ shipping_option: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-product.js b/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-product.js
index 60963eb3b6..58cf4a3851 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-product.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-product.js
@@ -29,10 +29,6 @@ describe("POST /admin/shipping-profiles/:profile_id/products", () => {
     })
 
     it("calls service retrieve", () => {
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledTimes(1)
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledWith(
-        IdMap.getId("validId")
-      )
       expect(ShippingProfileServiceMock.addProduct).toHaveBeenCalledTimes(1)
       expect(ShippingProfileServiceMock.addProduct).toHaveBeenCalledWith(
         IdMap.getId("validId"),
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-shipping-option.js
index 6a2acc31ca..334827e511 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-shipping-option.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-shipping-option.js
@@ -29,10 +29,6 @@ describe("POST /admin/shipping-profiles/:profile_id/products", () => {
     })
 
     it("calls service retrieve", () => {
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledTimes(1)
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledWith(
-        IdMap.getId("validId")
-      )
       expect(
         ShippingProfileServiceMock.addShippingOption
       ).toHaveBeenCalledTimes(1)
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/add-product.js b/packages/medusa/src/api/routes/admin/shipping-profiles/add-product.js
index 2f70ae24d1..db59ac30de 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/add-product.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/add-product.js
@@ -13,11 +13,8 @@ export default async (req, res) => {
 
   try {
     const profileService = req.scope.resolve("shippingProfileService")
-
-    await profileService.addProduct(profile_id, value.product_id)
-
-    const data = profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    const data = await profileService.addProduct(profile_id, value.product_id)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/add-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-profiles/add-shipping-option.js
index 63a8fc8151..41b3264f47 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/add-shipping-option.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/add-shipping-option.js
@@ -13,11 +13,11 @@ export default async (req, res) => {
 
   try {
     const profileService = req.scope.resolve("shippingProfileService")
-
-    await profileService.addShippingOption(profile_id, value.option_id)
-
-    const data = profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    const data = await profileService.addShippingOption(
+      profile_id,
+      value.option_id
+    )
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/create-shipping-profile.js b/packages/medusa/src/api/routes/admin/shipping-profiles/create-shipping-profile.js
index 23e24a9397..6aa0270236 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/create-shipping-profile.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/create-shipping-profile.js
@@ -14,7 +14,7 @@ export default async (req, res) => {
     const profileService = req.scope.resolve("shippingProfileService")
     const data = await profileService.create(value)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/get-shipping-profile.js b/packages/medusa/src/api/routes/admin/shipping-profiles/get-shipping-profile.js
index a87e133672..c0240442a1 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/get-shipping-profile.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/get-shipping-profile.js
@@ -5,7 +5,7 @@ export default async (req, res) => {
 
     const data = await profileService.retrieve(profile_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/list-shipping-profiles.js b/packages/medusa/src/api/routes/admin/shipping-profiles/list-shipping-profiles.js
index 398caa75d6..28120fa8e0 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/list-shipping-profiles.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/list-shipping-profiles.js
@@ -4,7 +4,7 @@ export default async (req, res) => {
 
     const data = await profileService.list()
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profiles: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/remove-product.js b/packages/medusa/src/api/routes/admin/shipping-profiles/remove-product.js
index 9f98cd9c80..29d93115fe 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/remove-product.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/remove-product.js
@@ -7,7 +7,7 @@ export default async (req, res) => {
     await profileService.removeProduct(profile_id, product_id)
 
     const data = profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/remove-shipping-option.js b/packages/medusa/src/api/routes/admin/shipping-profiles/remove-shipping-option.js
index f2cb91b861..2cc8107b45 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/remove-shipping-option.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/remove-shipping-option.js
@@ -7,7 +7,7 @@ export default async (req, res) => {
     await profileService.removeShippingOption(profile_id, option_id)
 
     const data = profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/shipping-profiles/update-shipping-profile.js b/packages/medusa/src/api/routes/admin/shipping-profiles/update-shipping-profile.js
index 153ce19ea6..a93b497fbc 100644
--- a/packages/medusa/src/api/routes/admin/shipping-profiles/update-shipping-profile.js
+++ b/packages/medusa/src/api/routes/admin/shipping-profiles/update-shipping-profile.js
@@ -20,7 +20,7 @@ export default async (req, res) => {
     await profileService.update(profile_id, value)
 
     const data = await profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/users/__tests__/create-user.js b/packages/medusa/src/api/routes/admin/users/__tests__/create-user.js
index 080d3ab6dc..c71154f1f3 100644
--- a/packages/medusa/src/api/routes/admin/users/__tests__/create-user.js
+++ b/packages/medusa/src/api/routes/admin/users/__tests__/create-user.js
@@ -39,7 +39,7 @@ describe("POST /admin/users", () => {
     })
 
     it("returns the user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-user"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("test-user"))
     })
   })
 
diff --git a/packages/medusa/src/api/routes/admin/users/__tests__/get-user.js b/packages/medusa/src/api/routes/admin/users/__tests__/get-user.js
index 0ebdee2b25..b48b4feb0e 100644
--- a/packages/medusa/src/api/routes/admin/users/__tests__/get-user.js
+++ b/packages/medusa/src/api/routes/admin/users/__tests__/get-user.js
@@ -36,7 +36,7 @@ describe("GET /admin/users/:id", () => {
     })
 
     it("returns the user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-user"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("test-user"))
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/admin/users/__tests__/reset-password.js b/packages/medusa/src/api/routes/admin/users/__tests__/reset-password.js
index 4d28a805d5..1f523c5f56 100644
--- a/packages/medusa/src/api/routes/admin/users/__tests__/reset-password.js
+++ b/packages/medusa/src/api/routes/admin/users/__tests__/reset-password.js
@@ -42,7 +42,7 @@ describe("POST /admin/users/reset-password", () => {
     })
 
     it("returns updated user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("vandijk"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("vandijk"))
     })
     it("returns 200", () => {
       expect(subject.status).toEqual(200)
diff --git a/packages/medusa/src/api/routes/admin/users/__tests__/set-password.js b/packages/medusa/src/api/routes/admin/users/__tests__/set-password.js
index 22c7cb8d8b..90d94f89a5 100644
--- a/packages/medusa/src/api/routes/admin/users/__tests__/set-password.js
+++ b/packages/medusa/src/api/routes/admin/users/__tests__/set-password.js
@@ -36,7 +36,7 @@ describe("POST /admin/users/:id/set-password", () => {
     })
 
     it("returns the user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-user"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("test-user"))
     })
 
     it("returns 200", () => {
diff --git a/packages/medusa/src/api/routes/admin/users/create-user.js b/packages/medusa/src/api/routes/admin/users/create-user.js
index a980d8d49a..76bd406bbe 100644
--- a/packages/medusa/src/api/routes/admin/users/create-user.js
+++ b/packages/medusa/src/api/routes/admin/users/create-user.js
@@ -21,7 +21,7 @@ export default async (req, res) => {
 
     const user = await userService.create(data, value.password)
 
-    res.status(200).json(user)
+    res.status(200).json({ user })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/users/get-user.js b/packages/medusa/src/api/routes/admin/users/get-user.js
index 34c8ba1df9..1287442c39 100644
--- a/packages/medusa/src/api/routes/admin/users/get-user.js
+++ b/packages/medusa/src/api/routes/admin/users/get-user.js
@@ -5,7 +5,7 @@ export default async (req, res) => {
     const userService = req.scope.resolve("userService")
 
     const user = await userService.retrieve(user_id)
-    res.json(user)
+    res.json({ user })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/users/list-users.js b/packages/medusa/src/api/routes/admin/users/list-users.js
index 2292481060..0cae57c936 100644
--- a/packages/medusa/src/api/routes/admin/users/list-users.js
+++ b/packages/medusa/src/api/routes/admin/users/list-users.js
@@ -3,7 +3,7 @@ export default async (req, res) => {
     const userService = req.scope.resolve("userService")
     const users = await userService.list({})
 
-    res.status(200).json(users)
+    res.status(200).json({ users })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/admin/users/reset-password-token.js b/packages/medusa/src/api/routes/admin/users/reset-password-token.js
index a1c24443fe..33f93ce052 100644
--- a/packages/medusa/src/api/routes/admin/users/reset-password-token.js
+++ b/packages/medusa/src/api/routes/admin/users/reset-password-token.js
@@ -16,6 +16,7 @@ export default async (req, res) => {
     const userService = req.scope.resolve("userService")
     const user = await userService.retrieveByEmail(value.email)
 
+    // Should call a email service provider that sends the token to the user
     await userService.generateResetPasswordToken(user._id)
 
     res.sendStatus(204)
diff --git a/packages/medusa/src/api/routes/admin/users/reset-password.js b/packages/medusa/src/api/routes/admin/users/reset-password.js
index c3867a9616..ea6db2623b 100644
--- a/packages/medusa/src/api/routes/admin/users/reset-password.js
+++ b/packages/medusa/src/api/routes/admin/users/reset-password.js
@@ -25,11 +25,9 @@ export default async (req, res) => {
       return
     }
 
-    await userService.setPassword(user._id, value.password)
+    const data = await userService.setPassword(user._id, value.password)
 
-    const updatedUser = await userService.retrieve(user._id)
-
-    res.status(200).json(updatedUser)
+    res.status(200).json({ user: data })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/users/set-password.js b/packages/medusa/src/api/routes/admin/users/set-password.js
index 6986ff30f7..beee27d33c 100644
--- a/packages/medusa/src/api/routes/admin/users/set-password.js
+++ b/packages/medusa/src/api/routes/admin/users/set-password.js
@@ -13,11 +13,8 @@ export default async (req, res) => {
 
   try {
     const userService = req.scope.resolve("userService")
-    await userService.setPassword(user_id, value.password)
-
-    const newUser = await userService.retrieve(user_id)
-
-    res.json(newUser)
+    const data = await userService.setPassword(user_id, value.password)
+    res.json({ user: data })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/admin/users/update-user.js b/packages/medusa/src/api/routes/admin/users/update-user.js
index aab92ecf7d..5d81d8e1c8 100644
--- a/packages/medusa/src/api/routes/admin/users/update-user.js
+++ b/packages/medusa/src/api/routes/admin/users/update-user.js
@@ -14,13 +14,9 @@ export default async (req, res) => {
 
   try {
     const userService = req.scope.resolve("userService")
-
-    await userService.update(user_id, value)
-    const user = await userService.retrieve(user_id)
-
-    res.status(200).json(user)
+    const data = await userService.update(user_id, value)
+    res.status(200).json({ user: data })
   } catch (err) {
-    console.log(err)
     throw err
   }
 }
diff --git a/packages/medusa/src/api/routes/store/auth/create-session.js b/packages/medusa/src/api/routes/store/auth/create-session.js
index 0ca21f9b07..23d7630baa 100644
--- a/packages/medusa/src/api/routes/store/auth/create-session.js
+++ b/packages/medusa/src/api/routes/store/auth/create-session.js
@@ -33,5 +33,5 @@ export default async (req, res) => {
     }
   )
 
-  res.json(result.customer)
+  res.json({ customer: result.customer })
 }
diff --git a/packages/medusa/src/api/routes/store/auth/index.js b/packages/medusa/src/api/routes/store/auth/index.js
new file mode 100644
index 0000000000..965b49c109
--- /dev/null
+++ b/packages/medusa/src/api/routes/store/auth/index.js
@@ -0,0 +1,10 @@
+import { Router } from "express"
+import middlewares from "../../../middlewares"
+
+const route = Router()
+
+export default app => {
+  app.use("/auth", route)
+  route.post("/", middlewares.wrap(require("./create-session").default))
+  return app
+}
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/add-shipping-method.js b/packages/medusa/src/api/routes/store/carts/__tests__/add-shipping-method.js
index 468bdecc85..5348ca2eae 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/add-shipping-method.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/add-shipping-method.js
@@ -37,8 +37,8 @@ describe("POST /store/carts/:id/shipping-methods", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("fr-cart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("fr-cart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
@@ -81,8 +81,8 @@ describe("POST /store/carts/:id/shipping-methods", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("fr-cart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("fr-cart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/create-cart.js b/packages/medusa/src/api/routes/store/carts/__tests__/create-cart.js
index bbee1f41e8..8174784d36 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/create-cart.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/create-cart.js
@@ -31,8 +31,8 @@ describe("POST /store/carts", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("regionCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("regionCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
@@ -117,8 +117,8 @@ describe("POST /store/carts", () => {
     })
 
     it("returns cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("regionCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("regionCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/create-line-item.js b/packages/medusa/src/api/routes/store/carts/__tests__/create-line-item.js
index dd4c8b6076..467257c4f3 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/create-line-item.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/create-line-item.js
@@ -42,8 +42,8 @@ describe("POST /store/carts/:id", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/create-payment-sessions.js b/packages/medusa/src/api/routes/store/carts/__tests__/create-payment-sessions.js
index fd7fbe288b..cecab8cd5f 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/create-payment-sessions.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/create-payment-sessions.js
@@ -26,8 +26,8 @@ describe("POST /store/carts/:id/payment-sessions", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/create-shipping-options.js b/packages/medusa/src/api/routes/store/carts/__tests__/create-shipping-options.js
index 85a220f8a9..0173d5e8e2 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/create-shipping-options.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/create-shipping-options.js
@@ -26,8 +26,8 @@ describe("POST /store/carts/:id/shipping-options", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/get-cart.js b/packages/medusa/src/api/routes/store/carts/__tests__/get-cart.js
index a3e37b7247..0e4b6c9656 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/get-cart.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/get-cart.js
@@ -22,8 +22,8 @@ describe("GET /store/carts", () => {
     })
 
     it("returns products", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/update-cart.js b/packages/medusa/src/api/routes/store/carts/__tests__/update-cart.js
index d51403620b..91be6d326c 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/update-cart.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/update-cart.js
@@ -85,8 +85,8 @@ describe("POST /store/carts/:id", () => {
     })
 
     it("returns cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/update-line-item.js b/packages/medusa/src/api/routes/store/carts/__tests__/update-line-item.js
index 417dcef2ae..77b7121509 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/update-line-item.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/update-line-item.js
@@ -44,8 +44,8 @@ describe("POST /store/carts/:id/line-items/:line_id", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/carts/__tests__/update-payment-method.js b/packages/medusa/src/api/routes/store/carts/__tests__/update-payment-method.js
index 1ac8f5b74b..d151cbc011 100644
--- a/packages/medusa/src/api/routes/store/carts/__tests__/update-payment-method.js
+++ b/packages/medusa/src/api/routes/store/carts/__tests__/update-payment-method.js
@@ -46,8 +46,8 @@ describe("POST /store/carts/:id/payment-method", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("cartWithPaySessions"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart._id).toEqual(IdMap.getId("cartWithPaySessions"))
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/carts/add-shipping-method.js b/packages/medusa/src/api/routes/store/carts/add-shipping-method.js
index abfad15274..3476e6f628 100644
--- a/packages/medusa/src/api/routes/store/carts/add-shipping-method.js
+++ b/packages/medusa/src/api/routes/store/carts/add-shipping-method.js
@@ -24,7 +24,7 @@ export default async (req, res) => {
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/create-cart.js b/packages/medusa/src/api/routes/store/carts/create-cart.js
index d82fd3437b..a091872287 100644
--- a/packages/medusa/src/api/routes/store/carts/create-cart.js
+++ b/packages/medusa/src/api/routes/store/carts/create-cart.js
@@ -36,7 +36,7 @@ export default async (req, res) => {
 
     cart = await cartService.retrieve(cart._id)
     cart = await cartService.decorate(cart)
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/create-line-item.js b/packages/medusa/src/api/routes/store/carts/create-line-item.js
index 9446a75606..1aaf5aeb82 100644
--- a/packages/medusa/src/api/routes/store/carts/create-line-item.js
+++ b/packages/medusa/src/api/routes/store/carts/create-line-item.js
@@ -28,7 +28,7 @@ export default async (req, res) => {
     cart = await cartService.retrieve(cart._id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/create-payment-sessions.js b/packages/medusa/src/api/routes/store/carts/create-payment-sessions.js
index 202d2a675f..58df527807 100644
--- a/packages/medusa/src/api/routes/store/carts/create-payment-sessions.js
+++ b/packages/medusa/src/api/routes/store/carts/create-payment-sessions.js
@@ -11,7 +11,7 @@ export default async (req, res) => {
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/create-shipping-options.js b/packages/medusa/src/api/routes/store/carts/create-shipping-options.js
index 7f1e74f1cd..e23c897f23 100644
--- a/packages/medusa/src/api/routes/store/carts/create-shipping-options.js
+++ b/packages/medusa/src/api/routes/store/carts/create-shipping-options.js
@@ -10,7 +10,7 @@ export default async (req, res) => {
     // return the updated cart
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/get-cart.js b/packages/medusa/src/api/routes/store/carts/get-cart.js
index 2611ccdd1a..5ed3e4b3b3 100644
--- a/packages/medusa/src/api/routes/store/carts/get-cart.js
+++ b/packages/medusa/src/api/routes/store/carts/get-cart.js
@@ -1,12 +1,10 @@
 export default async (req, res) => {
   const { id } = req.params
-
   try {
     const cartService = req.scope.resolve("cartService")
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
-
-    res.json(cart)
+    res.json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/update-cart.js b/packages/medusa/src/api/routes/store/carts/update-cart.js
index 756fa52655..61ee9b37b2 100644
--- a/packages/medusa/src/api/routes/store/carts/update-cart.js
+++ b/packages/medusa/src/api/routes/store/carts/update-cart.js
@@ -52,8 +52,8 @@ export default async (req, res) => {
     }
 
     let newCart = await cartService.retrieve(id)
-    newCart = await cartService.decorate(newCart)
-    res.json(newCart)
+    const data = await cartService.decorate(newCart)
+    res.json({ cart: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/update-line-item.js b/packages/medusa/src/api/routes/store/carts/update-line-item.js
index 152b6baf39..7602afb6cc 100644
--- a/packages/medusa/src/api/routes/store/carts/update-line-item.js
+++ b/packages/medusa/src/api/routes/store/carts/update-line-item.js
@@ -29,7 +29,7 @@ export default async (req, res) => {
     cart = await cartService.retrieve(cart._id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/carts/update-payment-method.js b/packages/medusa/src/api/routes/store/carts/update-payment-method.js
index dafa842164..fb4bf52dba 100644
--- a/packages/medusa/src/api/routes/store/carts/update-payment-method.js
+++ b/packages/medusa/src/api/routes/store/carts/update-payment-method.js
@@ -24,7 +24,7 @@ export default async (req, res) => {
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/customers/__tests__/create-customer.js b/packages/medusa/src/api/routes/store/customers/__tests__/create-customer.js
index e5896a6c99..d335b94bb6 100644
--- a/packages/medusa/src/api/routes/store/customers/__tests__/create-customer.js
+++ b/packages/medusa/src/api/routes/store/customers/__tests__/create-customer.js
@@ -30,8 +30,8 @@ describe("POST /store/customers", () => {
     })
 
     it("returns customer decorated", () => {
-      expect(subject.body.email).toEqual("lebron@james.com")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.email).toEqual("lebron@james.com")
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/customers/__tests__/reset-password.js b/packages/medusa/src/api/routes/store/customers/__tests__/reset-password.js
index 4761738174..a9f4220a8f 100644
--- a/packages/medusa/src/api/routes/store/customers/__tests__/reset-password.js
+++ b/packages/medusa/src/api/routes/store/customers/__tests__/reset-password.js
@@ -31,8 +31,8 @@ describe("POST /store/customers/password-reset", () => {
     })
 
     it("returns customer decorated", () => {
-      expect(subject.body.email).toEqual("lebron@james.com")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.email).toEqual("lebron@james.com")
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/customers/__tests__/update-customer.js b/packages/medusa/src/api/routes/store/customers/__tests__/update-customer.js
index c9c1401d1e..fbd503b457 100644
--- a/packages/medusa/src/api/routes/store/customers/__tests__/update-customer.js
+++ b/packages/medusa/src/api/routes/store/customers/__tests__/update-customer.js
@@ -39,8 +39,8 @@ describe("POST /store/customers/:id", () => {
     })
 
     it("returns product decorated", () => {
-      expect(subject.body.first_name).toEqual("LeBron")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.first_name).toEqual("LeBron")
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/customers/__tests__/update-password.js b/packages/medusa/src/api/routes/store/customers/__tests__/update-password.js
index 860a4cf061..0882ec89d0 100644
--- a/packages/medusa/src/api/routes/store/customers/__tests__/update-password.js
+++ b/packages/medusa/src/api/routes/store/customers/__tests__/update-password.js
@@ -37,8 +37,8 @@ describe("POST /store/customers/:id/password", () => {
     })
 
     it("returns product decorated", () => {
-      expect(subject.body.first_name).toEqual("LeBron")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.first_name).toEqual("LeBron")
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 
diff --git a/packages/medusa/src/api/routes/store/customers/create-customer.js b/packages/medusa/src/api/routes/store/customers/create-customer.js
index 49b883fe13..d8027b4833 100644
--- a/packages/medusa/src/api/routes/store/customers/create-customer.js
+++ b/packages/medusa/src/api/routes/store/customers/create-customer.js
@@ -17,9 +17,8 @@ export default async (req, res) => {
   try {
     const customerService = req.scope.resolve("customerService")
     const customer = await customerService.create(value)
-
     const data = await customerService.decorate(customer)
-    res.status(201).json(data)
+    res.status(201).json({ customer: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/customers/reset-password-token.js b/packages/medusa/src/api/routes/store/customers/reset-password-token.js
index 29d052d986..37c7555f6c 100644
--- a/packages/medusa/src/api/routes/store/customers/reset-password-token.js
+++ b/packages/medusa/src/api/routes/store/customers/reset-password-token.js
@@ -16,6 +16,7 @@ export default async (req, res) => {
     const customerService = req.scope.resolve("customerService")
     const customer = await customerService.retrieveByEmail(value.email)
 
+    // Will generate a token and send it to the customer via an email privder
     await customerService.generateResetPasswordToken(customer._id)
 
     res.sendStatus(204)
diff --git a/packages/medusa/src/api/routes/store/customers/reset-password.js b/packages/medusa/src/api/routes/store/customers/reset-password.js
index b0d2e7b33e..036c39783e 100644
--- a/packages/medusa/src/api/routes/store/customers/reset-password.js
+++ b/packages/medusa/src/api/routes/store/customers/reset-password.js
@@ -28,7 +28,7 @@ export default async (req, res) => {
 
     const updated = await customerService.retrieve(customer._id)
     const data = await customerService.decorate(customer)
-    res.status(200).json(data)
+    res.status(200).json({ customer: data })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/store/customers/update-customer.js b/packages/medusa/src/api/routes/store/customers/update-customer.js
index b8bf01d90b..bde5a7c3ce 100644
--- a/packages/medusa/src/api/routes/store/customers/update-customer.js
+++ b/packages/medusa/src/api/routes/store/customers/update-customer.js
@@ -20,7 +20,7 @@ export default async (req, res) => {
 
     const customer = await customerService.retrieve(id)
     const data = await customerService.decorate(customer)
-    res.status(200).json(data)
+    res.status(200).json({ customer: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/customers/update-password.js b/packages/medusa/src/api/routes/store/customers/update-password.js
index a452f31827..4def54a68b 100644
--- a/packages/medusa/src/api/routes/store/customers/update-password.js
+++ b/packages/medusa/src/api/routes/store/customers/update-password.js
@@ -19,7 +19,7 @@ export default async (req, res) => {
 
     const customer = await customerService.retrieve(id)
     const data = await customerService.decorate(customer)
-    res.status(200).json(data)
+    res.status(200).json({ customer: data })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/orders/__tests__/get-order.js b/packages/medusa/src/api/routes/store/orders/__tests__/get-order.js
index 9b2136a119..61cbe092e1 100644
--- a/packages/medusa/src/api/routes/store/orders/__tests__/get-order.js
+++ b/packages/medusa/src/api/routes/store/orders/__tests__/get-order.js
@@ -25,7 +25,7 @@ describe("GET /store/orders", () => {
     })
 
     it("returns order", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/store/orders/create-order.js b/packages/medusa/src/api/routes/store/orders/create-order.js
index 9a2cde41dd..bbba9da8fa 100644
--- a/packages/medusa/src/api/routes/store/orders/create-order.js
+++ b/packages/medusa/src/api/routes/store/orders/create-order.js
@@ -32,7 +32,7 @@ export default async (req, res) => {
       "metadata",
     ])
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/api/routes/store/orders/get-order.js b/packages/medusa/src/api/routes/store/orders/get-order.js
index d286cd0e6b..6a4b06202e 100644
--- a/packages/medusa/src/api/routes/store/orders/get-order.js
+++ b/packages/medusa/src/api/routes/store/orders/get-order.js
@@ -20,7 +20,7 @@ export default async (req, res) => {
       "metadata",
     ])
 
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/api/routes/store/products/__tests__/list-products.js b/packages/medusa/src/api/routes/store/products/__tests__/list-products.js
index a015d142e2..dc7d3b936f 100644
--- a/packages/medusa/src/api/routes/store/products/__tests__/list-products.js
+++ b/packages/medusa/src/api/routes/store/products/__tests__/list-products.js
@@ -20,8 +20,8 @@ describe("GET /store/products", () => {
     })
 
     it("returns products", () => {
-      expect(subject.body[0]._id).toEqual(IdMap.getId("product1"))
-      expect(subject.body[1]._id).toEqual(IdMap.getId("product2"))
+      expect(subject.body.products[0]._id).toEqual(IdMap.getId("product1"))
+      expect(subject.body.products[1]._id).toEqual(IdMap.getId("product2"))
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/store/products/get-product.js b/packages/medusa/src/api/routes/store/products/get-product.js
index 82b235010a..9b59cd95ce 100644
--- a/packages/medusa/src/api/routes/store/products/get-product.js
+++ b/packages/medusa/src/api/routes/store/products/get-product.js
@@ -28,5 +28,5 @@ export default async (req, res) => {
     ["variants"]
   )
 
-  res.json(product)
+  res.json({ product })
 }
diff --git a/packages/medusa/src/api/routes/store/products/list-products.js b/packages/medusa/src/api/routes/store/products/list-products.js
index f44805c72b..38c6d47a7f 100644
--- a/packages/medusa/src/api/routes/store/products/list-products.js
+++ b/packages/medusa/src/api/routes/store/products/list-products.js
@@ -24,6 +24,5 @@ export default async (req, res) => {
       )
     )
   )
-
-  res.json(data)
+  res.json({ products: data })
 }
diff --git a/packages/medusa/src/api/routes/store/shipping-options/__tests__/get-shipping-options.js b/packages/medusa/src/api/routes/store/shipping-options/__tests__/get-shipping-options.js
index 58d5338ce9..7544d70bf4 100644
--- a/packages/medusa/src/api/routes/store/shipping-options/__tests__/get-shipping-options.js
+++ b/packages/medusa/src/api/routes/store/shipping-options/__tests__/get-shipping-options.js
@@ -40,7 +40,9 @@ describe("GET /store/shipping-options", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body[0]._id).toEqual(IdMap.getId("cartShippingOption"))
+      expect(subject.body.shipping_options[0]._id).toEqual(
+        IdMap.getId("cartShippingOption")
+      )
     })
   })
 })
diff --git a/packages/medusa/src/api/routes/store/shipping-options/index.js b/packages/medusa/src/api/routes/store/shipping-options/index.js
index b432a4c58e..ea3cbc1cad 100644
--- a/packages/medusa/src/api/routes/store/shipping-options/index.js
+++ b/packages/medusa/src/api/routes/store/shipping-options/index.js
@@ -6,7 +6,7 @@ const route = Router()
 export default app => {
   app.use("/shipping-options", route)
 
-  route.get("/", middlewares.wrap(require("./get-shipping-options").default))
+  route.get("/", middlewares.wrap(require("./list-shipping-options").default))
 
   return app
 }
diff --git a/packages/medusa/src/api/routes/store/shipping-options/get-shipping-options.js b/packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js
similarity index 91%
rename from packages/medusa/src/api/routes/store/shipping-options/get-shipping-options.js
rename to packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js
index ad84515e18..e47a2f420a 100644
--- a/packages/medusa/src/api/routes/store/shipping-options/get-shipping-options.js
+++ b/packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js
@@ -17,7 +17,7 @@ export default async (req, res) => {
     const cart = await cartService.retrieve(value.cart_id)
     const options = await shippingProfileService.fetchCartOptions(cart)
 
-    res.status(200).json(options)
+    res.status(200).json({ shipping_options: options })
   } catch (err) {
     throw err
   }
diff --git a/packages/medusa/src/services/__mocks__/user.js b/packages/medusa/src/services/__mocks__/user.js
index dbf74989e0..6b5984fd72 100644
--- a/packages/medusa/src/services/__mocks__/user.js
+++ b/packages/medusa/src/services/__mocks__/user.js
@@ -58,7 +58,17 @@ export const UserServiceMock = {
     return Promise.resolve(undefined)
   }),
   setPassword: jest.fn().mockImplementation(userId => {
-    return Promise.resolve()
+    if (userId === IdMap.getId("test-user")) {
+      return Promise.resolve(users.testUser)
+    }
+    if (userId === IdMap.getId("vandijk")) {
+      return Promise.resolve(users.vanDijk)
+    }
+    // used for jwt token tests
+    if (userId === "test-user-id") {
+      return Promise.resolve(users.jwtUser)
+    }
+    return Promise.resolve(undefined)
   }),
   decorate: jest.fn().mockImplementation((user, fields) => {
     user.decorated = true