diff --git a/State/CreateOrder.php b/State/CreateOrder.php
new file mode 100644
index 0000000..eb494cc
--- /dev/null
+++ b/State/CreateOrder.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class CreateOrder
+ */
+class CreateOrder implements OrderInterface
+{
+    /**
+     * @var array
+     */
+    private $order;
+
+    /**
+     * @param array $order
+     *
+     * @throws \Exception
+     */
+    public function __construct(array $order)
+    {
+        if (empty($order)) {
+            throw new \Exception('Order can not be empty!');
+        }
+        $this->order = $order;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function shipOrder()
+    {
+        $this->order['status'] = 'shipping';
+        $this->order['updatedTime'] = time();
+
+        // Setting the new order status into database;
+        return $this->updateOrder($order);
+    }
+
+    /**
+     * @return mixed|void
+     * @throws \Exception
+     */
+    public function completeOrder()
+    {
+        //Can not complete the order which status is created, throw exception;
+        throw new \Exception('Can not complete the order which status is created!');
+    }
+}
diff --git a/State/OrderController.php b/State/OrderController.php
new file mode 100644
index 0000000..a9690b4
--- /dev/null
+++ b/State/OrderController.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class OrderController
+ */
+class OrderController
+{
+    /**
+     * @param int $id
+     */
+    public function shipAction($id)
+    {
+        $order = OrderFactory::getOrder($id);
+        try {
+            $order->shipOrder($id);
+        } catch (Exception $e) {
+            //handle error!
+        }
+        // response to browser
+    }
+
+    /**
+     * @param int $id
+     */
+    public function completeAction($id)
+    {
+        $order = OrderFactory::getOrder($id);
+        try {
+            $order->completeOrder($id);
+        } catch (Exception $e) {
+            //handle error!
+        }
+        // response to browser
+    }
+}
diff --git a/State/OrderFactory.php b/State/OrderFactory.php
new file mode 100644
index 0000000..55c7d80
--- /dev/null
+++ b/State/OrderFactory.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class OrderFactory
+ */
+class OrderFactory
+{
+    private function __construct()
+    {
+        throw Exception('Can not instance the OrderFactory class!');
+    }
+
+    /**
+     * @param int $id
+     *
+     * @return CreateOrder|ShippingOrder
+     * @throws \Exception
+     */
+    public static function getOrder($id)
+    {
+        $order = 'Get Order From Database';
+
+        switch ($order['status']) {
+            case 'created':
+                return new CreateOrder($order);
+            case 'shipping':
+                return new ShippingOrder($order);
+            default:
+                throw new \Exception('Order status error!');
+                break;
+        }
+    }
+}
\ No newline at end of file
diff --git a/State/OrderInterface.php b/State/OrderInterface.php
new file mode 100644
index 0000000..35c92e4
--- /dev/null
+++ b/State/OrderInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class OrderInterface
+ */
+interface OrderInterface
+{
+    /**
+     * @return mixed
+     */
+    public function shipOrder();
+
+    /**
+     * @return mixed
+     */
+    public function completeOrder();
+}
diff --git a/State/ShippingOrder.php b/State/ShippingOrder.php
new file mode 100644
index 0000000..cbd8f93
--- /dev/null
+++ b/State/ShippingOrder.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class ShippingOrder
+ */
+class ShippingOrder implements OrderInterface
+{
+    /**
+     * @var array
+     */
+    private $order;
+
+    /**
+     * @param array $order
+     *
+     * @throws \Exception
+     */
+    public function __construct(array $order)
+    {
+        if (empty($order)) {
+            throw new \Exception('Order can not be empty!');
+        }
+        $this->order = $order;
+    }
+
+    /**
+     * @return mixed|void
+     * @throws \Exception
+     */
+    public function shipOrder()
+    {
+        //Can not ship the order which status is shipping, throw exception;
+        throw new \Exception('Can not ship the order which status is shipping!');
+    }
+
+    /**
+     * @return mixed
+     */
+    public function completeOrder()
+    {
+        $this->order['status'] = 'completed';
+        $this->order['updatedTime'] = time();
+
+        // Setting the new order status into database;
+        return $this->updateOrder($order);
+    }
+}
diff --git a/State/State.php b/State/State.php
deleted file mode 100644
index 6182812..0000000
--- a/State/State.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace DesignPatterns\Status;
-
-/**
- * The order has two status: created, shipping, completed.
- * When the order's status is created, what can do is just 'shipping' handle;
- * When the order's status is shipping, what can do is just 'completed' handle;
- *
- */
-interface OrderInterface
-{
-    /**
-     * @return mixed
-     */
-    public function shipOrder();
-
-    /**
-     * @return mixed
-     */
-    public function completeOrder();
-}
-
-/**
- * Class CreateOrder
- */
-class CreateOrder implements OrderInterface
-{
-    /**
-     * @var array
-     */
-    private $order;
-
-    /**
-     * @param array $order
-     */
-    public function __construct(array $order)
-    {
-        if (empty($order)) {
-            throw new \Exception('Order can not be empty!');
-        }
-        $this->order = $order;
-    }
-
-    public function shipOrder()
-    {
-        $this->order['status'] = 'shipping';
-        $this->order['updatedTime'] = time();
-
-        // Setting the new order status into database;
-        return $this->updateOrder($order);
-    }
-
-    public function completeOrder()
-    {
-        //Can not complete the order which status is created, throw exception;
-        throw new \Exception('Can not complete the order which status is created!');
-    }
-}
-
-class ShippingOrder implements OrderInterface
-{
-
-    private $order;
-
-    public function __construct(array $order)
-    {
-        if (empty($order)) {
-            throw new \Exception('Order can not be empty!');
-        }
-        $this->order = $order;
-    }
-
-    public function shipOrder()
-    {
-        //Can not ship the order which status is shipping, throw exception;
-        throw new \Exception('Can not ship the order which status is shipping!');
-    }
-
-    public function completeOrder()
-    {
-        $this->order['status'] = 'completed';
-        $this->order['updatedTime'] = time();
-
-        // Setting the new order status into database;
-        return $this->updateOrder($order);
-    }
-}
-
-class OrderFactory
-{
-
-    private function __construct()
-    {
-        throw Exception('Can not instance the OrderFactory class!');
-    }
-
-    public static function getOrder($id)
-    {
-        $order = 'Get Order From Database';
-
-        switch ($order['status']) {
-            case 'created':
-                return new CreateOrder($order);
-            case 'shipping':
-                return new ShippingOrder($order);
-            default:
-                throw new \Exception('Order status error!');
-                break;
-        }
-    }
-}
-
-
-// Client
-
-class OrderController
-{
-    /**
-     * @param int $id
-     */
-    public function shipAction($id)
-    {
-        $order = OrderFactory::getOrder($id);
-        try {
-            $order->shipOrder($id);
-        } catch (Exception $e) {
-            //handle error!
-        }
-        // response to browser
-    }
-
-    public function completeAction($id)
-    {
-        $order = OrderFactory::getOrder($id);
-        try {
-            $order->completeOrder($id);
-        } catch (Exception $e) {
-            //handle error!
-        }
-        // response to browser
-    }
-}