diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 63409da..f07feb3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,23 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="fdf707d7-9aae-43b8-800c-c36d81decacb" name="Default" comment="">
-      <change type="DELETED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Console\Command\CakeResqueShell.php" afterPath="" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Config\bootstrap.php" afterPath="$PROJECT_DIR$/src/Config/bootstrap.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Config\bootstrap_config.php" afterPath="$PROJECT_DIR$/src/Config/bootstrap_config.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Config\config.php" afterPath="$PROJECT_DIR$/src/Config/config.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Lib\CakeResque.php" afterPath="$PROJECT_DIR$/src/Lib/CakeResque.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Lib\CakeResqueBootstrap.php" afterPath="$PROJECT_DIR$/src/Lib/CakeResqueBootstrap.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Lib\Resque_Job_Creator.php" afterPath="$PROJECT_DIR$/src/Lib/Resque_Job_Creator.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Locale\cake_resque.pot" afterPath="$PROJECT_DIR$/src/Locale/cake_resque.pot" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Test\Case\AllCakeResqueTest.php" afterPath="$PROJECT_DIR$/src/Test/Case/AllCakeResqueTest.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Test\Case\Config\BootstrapTest.php" afterPath="$PROJECT_DIR$/src/Test/Case/Config/BootstrapTest.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Test\Case\Console\Command\CakeResqueShellTest.php" afterPath="$PROJECT_DIR$/src/Test/Case/Console/Command/CakeResqueShellTest.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Test\Case\Lib\CakeResqueTest.php" afterPath="$PROJECT_DIR$/src/Test/Case/Lib/CakeResqueTest.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Test\Case\Lib\Resque_Job_CreatorTest.php" afterPath="$PROJECT_DIR$/src/Test/Case/Lib/Resque_Job_CreatorTest.php" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Test\phpunit.xml" afterPath="$PROJECT_DIR$/src/Test/phpunit.xml" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\Test\tmp\empty" afterPath="$PROJECT_DIR$/src/Test/tmp/empty" />
-      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\tmp\empty" afterPath="$PROJECT_DIR$/src/tmp/empty" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.json" afterPath="$PROJECT_DIR$/composer.json" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Lib\CakeResque.php" afterPath="$PROJECT_DIR$/src/CakeResque.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Lib\CakeResqueBootstrap.php" afterPath="$PROJECT_DIR$/src/CakeResqueBootstrap.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Lib\Resque_Job_Creator.php" afterPath="$PROJECT_DIR$/src/Resque_Job_Creator.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Shell\Command\CakeResqueShell.php" afterPath="$PROJECT_DIR$/src/Shell/CakeResqueShell.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Test\Case\AllCakeResqueTest.php" afterPath="$PROJECT_DIR$/tests/TestCase/AllCakeResqueTest.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Test\Case\Config\BootstrapTest.php" afterPath="$PROJECT_DIR$/tests/TestCase/Config/BootstrapTest.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Test\Case\Console\Command\CakeResqueShellTest.php" afterPath="$PROJECT_DIR$/tests/TestCase/Console/Command/CakeResqueShellTest.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Test\Case\Lib\CakeResqueTest.php" afterPath="$PROJECT_DIR$/tests/TestCase/Lib/CakeResqueTest.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Test\Case\Lib\Resque_Job_CreatorTest.php" afterPath="$PROJECT_DIR$/tests/TestCase/Lib/Resque_Job_CreatorTest.php" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Test\phpunit.xml" afterPath="$PROJECT_DIR$/tests/phpunit.xml" />
+      <change type="MOVED" beforePath="C:\Users\hooman\Desktop\Cake-Resque\src\Test\tmp\empty" afterPath="$PROJECT_DIR$/tests/tmp/empty" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="Cake-Resque.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -59,11 +54,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bootstrap_config.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="bootstrap_config.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Config/bootstrap_config.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.46754676">
+              <caret line="34" column="7" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
               <folding />
             </state>
           </provider>
@@ -72,7 +67,7 @@
       <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Config/config.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="17.647058">
+            <state vertical-scroll-proportion="30.681818">
               <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
@@ -80,19 +75,19 @@
         </entry>
       </file>
       <file leaf-file-name="CakeResque.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Lib/CakeResque.php">
+        <entry file="file://$PROJECT_DIR$/src/CakeResque.php">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="-0.7352941">
-              <caret line="1" column="21" selection-start-line="1" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+              <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding>
-                <marker date="1436008055703" expanded="true" signature="550:708" placeholder="..." />
+                <element signature="e#546#570#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="CakeResqueBootstrap.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Lib/CakeResqueBootstrap.php">
+        <entry file="file://$PROJECT_DIR$/src/CakeResqueBootstrap.php">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="-0.0">
               <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" />
@@ -103,23 +98,35 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CakeResqueShell.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/Shell/Command/CakeResqueShell.php">
+      <file leaf-file-name="CakeResqueShell.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Shell/CakeResqueShell.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-2.8882554">
-              <caret line="749" column="28" selection-start-line="749" selection-start-column="12" selection-end-line="749" selection-end-column="28" />
+            <state vertical-scroll-proportion="14.772727">
+              <caret line="3" column="22" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="22" />
               <folding>
-                <element signature="e#40#583#0#PHP" expanded="false" />
+                <element signature="e#56#599#0#PHP" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CakeResqueShellTest.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/TestCase/Console/Command/CakeResqueShellTest.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-3.409091">
+              <caret line="9" column="2" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="30" />
+              <folding>
+                <element signature="e#38#67#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="Resque_Job_Creator.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Lib/Resque_Job_Creator.php">
+        <entry file="file://$PROJECT_DIR$/src/Resque_Job_Creator.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-1.4705882">
-              <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+            <state vertical-scroll-proportion="-0.7352941">
+              <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -131,7 +138,7 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/src/Shell/Command/CakeResqueShell.php" root0="SKIP_HIGHLIGHTING" root1="SKIP_INSPECTION" />
+    <setting file="file://$PROJECT_DIR$/src/Shell/CakeResqueShell.php" root0="SKIP_HIGHLIGHTING" root1="SKIP_INSPECTION" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -145,6 +152,10 @@
         <option value="$PROJECT_DIR$/src/Lib/CakeResqueBootstrap.php" />
         <option value="$PROJECT_DIR$/src/shell/Command/CakeResqueShell.php" />
         <option value="$PROJECT_DIR$/src/Shell/Command/CakeResqueShell.php" />
+        <option value="$PROJECT_DIR$/src/Shell/CakeResqueShell.php" />
+        <option value="$PROJECT_DIR$/tests/TestCase/Console/Command/CakeResqueShellTest.php" />
+        <option value="$PROJECT_DIR$/src/CakeResque.php" />
+        <option value="$PROJECT_DIR$/src/Resque_Job_Creator.php" />
       </list>
     </option>
   </component>
@@ -236,46 +247,6 @@
               <option name="myItemId" value="Shell" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Command" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Cake-Resque" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Cake-Resque" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Locale" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Cake-Resque" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Cake-Resque" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -307,7 +278,9 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\hooman\Desktop\Cake-Resque" />
       <recent name="C:\Users\hooman\Desktop\Cake-Resque\src" />
+      <recent name="C:\Users\hooman\Desktop\Cake-Resque\src\Shell" />
       <recent name="C:\Users\hooman\Desktop\Cake-Resque\src\shell" />
     </key>
   </component>
@@ -345,9 +318,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1050" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Grunt " active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
@@ -392,65 +365,75 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Lib/CakeResque.php">
+    <entry file="file://$PROJECT_DIR$/tests/TestCase/Console/Command/CakeResqueShellTest.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.7352941">
-          <caret line="1" column="21" selection-start-line="1" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        <state vertical-scroll-proportion="-3.409091">
+          <caret line="9" column="2" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="30" />
           <folding>
-            <marker date="1436008055703" expanded="true" signature="550:708" placeholder="..." />
+            <element signature="e#38#67#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Config/bootstrap.php">
+    <entry file="file://$PROJECT_DIR$/src/Shell/CakeResqueShell.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.0">
-          <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" />
-          <folding />
+        <state vertical-scroll-proportion="14.772727">
+          <caret line="3" column="22" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="22" />
+          <folding>
+            <element signature="e#56#599#0#PHP" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Config/bootstrap_config.php">
+    <entry file="file://$PROJECT_DIR$/src/CakeResque.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.7352941">
+          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <folding>
+            <element signature="e#546#570#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/CakeResqueBootstrap.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+          <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" />
+          <folding>
+            <element signature="e#6#573#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Config/config.php">
+    <entry file="file://$PROJECT_DIR$/src/Resque_Job_Creator.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="17.647058">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.7352941">
+          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Lib/Resque_Job_Creator.php">
+    <entry file="file://$PROJECT_DIR$/src/Config/bootstrap.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.4705882">
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.0">
+          <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Lib/CakeResqueBootstrap.php">
+    <entry file="file://$PROJECT_DIR$/src/Config/config.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" />
-          <folding>
-            <element signature="e#6#573#0#PHP" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="30.681818">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Shell/Command/CakeResqueShell.php">
+    <entry file="file://$PROJECT_DIR$/src/Config/bootstrap_config.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.8882554">
-          <caret line="749" column="28" selection-start-line="749" selection-start-column="12" selection-end-line="749" selection-end-column="28" />
-          <folding>
-            <element signature="e#40#583#0#PHP" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.46754676">
+          <caret line="34" column="7" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/src/Lib/CakeResque.php b/src/CakeResque.php
similarity index 99%
rename from src/Lib/CakeResque.php
rename to src/CakeResque.php
index c8b3d2f..c391f53 100644
--- a/src/Lib/CakeResque.php
+++ b/src/CakeResque.php
@@ -1,5 +1,5 @@
 <?php
-namespace Resque\Lib;
+namespace Resque;
 
 /**
  * CakeResque Lib File
diff --git a/src/Lib/CakeResqueBootstrap.php b/src/CakeResqueBootstrap.php
similarity index 100%
rename from src/Lib/CakeResqueBootstrap.php
rename to src/CakeResqueBootstrap.php
diff --git a/src/Lib/Resque_Job_Creator.php b/src/Resque_Job_Creator.php
similarity index 98%
rename from src/Lib/Resque_Job_Creator.php
rename to src/Resque_Job_Creator.php
index 61fa427..9e0e263 100644
--- a/src/Lib/Resque_Job_Creator.php
+++ b/src/Resque_Job_Creator.php
@@ -1,5 +1,5 @@
 <?php
-namespace Resque\Lib;
+namespace Resque;
 
 
 /**
diff --git a/src/Shell/Command/CakeResqueShell.php b/src/Shell/CakeResqueShell.php
similarity index 99%
rename from src/Shell/Command/CakeResqueShell.php
rename to src/Shell/CakeResqueShell.php
index 6ce9889..d2ec01e 100644
--- a/src/Shell/Command/CakeResqueShell.php
+++ b/src/Shell/CakeResqueShell.php
@@ -1,6 +1,7 @@
 <?php
-namespace Resque\shell\Command;
+namespace Resque\shell;
 
+use Cake\Console\Shell;
 
 /**
  * CakeResque Shell File
diff --git a/src/Test/Case/AllCakeResqueTest.php b/tests/TestCase/AllCakeResqueTest.php
similarity index 100%
rename from src/Test/Case/AllCakeResqueTest.php
rename to tests/TestCase/AllCakeResqueTest.php
diff --git a/src/Test/Case/Config/BootstrapTest.php b/tests/TestCase/Config/BootstrapTest.php
similarity index 100%
rename from src/Test/Case/Config/BootstrapTest.php
rename to tests/TestCase/Config/BootstrapTest.php
diff --git a/src/Test/Case/Console/Command/CakeResqueShellTest.php b/tests/TestCase/Console/Command/CakeResqueShellTest.php
similarity index 99%
rename from src/Test/Case/Console/Command/CakeResqueShellTest.php
rename to tests/TestCase/Console/Command/CakeResqueShellTest.php
index da94ca9..463bbf1 100644
--- a/src/Test/Case/Console/Command/CakeResqueShellTest.php
+++ b/tests/TestCase/Console/Command/CakeResqueShellTest.php
@@ -2,6 +2,7 @@
 
 // Used to mock the filesystem
 use org\bovigo\vfs\vfsStream;
+use Cake\TestSuite\TestCase;
 
 App::uses('ConsoleOutput', 'Console');
 App::uses('ConsoleInput', 'Console');
@@ -9,7 +10,7 @@
 App::uses('Shell', 'Console');
 App::uses('CakeResqueShell', 'CakeResque.Console/Command');
 
-class CakeResqueShellTest extends CakeTestCase
+class CakeResqueShellTest extends TestCase
 {
 
 	public function setUp()
diff --git a/src/Test/Case/Lib/CakeResqueTest.php b/tests/TestCase/Lib/CakeResqueTest.php
similarity index 100%
rename from src/Test/Case/Lib/CakeResqueTest.php
rename to tests/TestCase/Lib/CakeResqueTest.php
diff --git a/src/Test/Case/Lib/Resque_Job_CreatorTest.php b/tests/TestCase/Lib/Resque_Job_CreatorTest.php
similarity index 100%
rename from src/Test/Case/Lib/Resque_Job_CreatorTest.php
rename to tests/TestCase/Lib/Resque_Job_CreatorTest.php
diff --git a/src/Test/phpunit.xml b/tests/phpunit.xml
similarity index 100%
rename from src/Test/phpunit.xml
rename to tests/phpunit.xml
diff --git a/src/Test/tmp/empty b/tests/tmp/empty
similarity index 100%
rename from src/Test/tmp/empty
rename to tests/tmp/empty