diff --git a/Behavioral/Command/CommandInterface.php b/Behavioral/Command/CommandInterface.php
index ebdbb85..ad9117b 100644
--- a/Behavioral/Command/CommandInterface.php
+++ b/Behavioral/Command/CommandInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * class CommandInterface
diff --git a/Behavioral/Command/HelloCommand.php b/Behavioral/Command/HelloCommand.php
index 9bb0956..3dd55b1 100644
--- a/Behavioral/Command/HelloCommand.php
+++ b/Behavioral/Command/HelloCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * This concrete command calls "print" on the Receiver, but an external
diff --git a/Behavioral/Command/Invoker.php b/Behavioral/Command/Invoker.php
index 6f857ec..4461ee2 100644
--- a/Behavioral/Command/Invoker.php
+++ b/Behavioral/Command/Invoker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * Invoker is using the command given to it.
diff --git a/Behavioral/Command/Receiver.php b/Behavioral/Command/Receiver.php
index f52accb..9289369 100644
--- a/Behavioral/Command/Receiver.php
+++ b/Behavioral/Command/Receiver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Command;
+namespace DesignPatterns\Behavioral\Command;
 
 /**
  * Receiver is specific service with its own contract and can be only concrete
diff --git a/Behavioral/Command/Test/CommandTest.php b/Behavioral/Command/Tests/CommandTest.php
similarity index 65%
rename from Behavioral/Command/Test/CommandTest.php
rename to Behavioral/Command/Tests/CommandTest.php
index 7400139..abf7317 100644
--- a/Behavioral/Command/Test/CommandTest.php
+++ b/Behavioral/Command/Tests/CommandTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace DesignPatterns\Tests\Command;
+namespace DesignPatterns\Behavioral\Command\Tests;
 
-use DesignPatterns\Command\Invoker;
-use DesignPatterns\Command\Receiver;
-use DesignPatterns\Command\HelloCommand;
+use DesignPatterns\Behavioral\Command\Invoker;
+use DesignPatterns\Behavioral\Command\Receiver;
+use DesignPatterns\Behavioral\Command\HelloCommand;
 
 /**
  * CommandTest has the role of the Client in the Command Pattern
@@ -12,12 +12,18 @@ use DesignPatterns\Command\HelloCommand;
 class CommandTest extends \PHPUnit_Framework_TestCase
 {
 
+    /**
+     * @var Invoker
+     */
     protected $invoker;
+
+    /**
+     * @var Receiver
+     */
     protected $receiver;
 
     protected function setUp()
     {
-        // this is the context of the application
         $this->invoker = new Invoker();
         $this->receiver = new Receiver();
     }