diff --git a/src/Shell/BakeShell.php b/src/Shell/BakeShell.php
index 530d9424c..b3d4a0540 100644
--- a/src/Shell/BakeShell.php
+++ b/src/Shell/BakeShell.php
@@ -14,6 +14,7 @@
  */
 namespace Bake\Shell;
 
+use Bake\Utility\CommonOptionsTrait;
 use Cake\Cache\Cache;
 use Cake\Console\Shell;
 use Cake\Core\Configure;
diff --git a/src/Shell/Task/BakeTask.php b/src/Shell/Task/BakeTask.php
index 77fe19616..57bfacdd4 100644
--- a/src/Shell/Task/BakeTask.php
+++ b/src/Shell/Task/BakeTask.php
@@ -14,7 +14,7 @@
  */
 namespace Bake\Shell\Task;
 
-use Bake\Shell\CommonOptionsTrait;
+use Bake\Utility\CommonOptionsTrait;
 use Cake\Cache\Cache;
 use Cake\Console\Shell;
 use Cake\Core\Configure;
diff --git a/src/Shell/CommonOptionsTrait.php b/src/Utility/CommonOptionsTrait.php
similarity index 98%
rename from src/Shell/CommonOptionsTrait.php
rename to src/Utility/CommonOptionsTrait.php
index a89362e15..739d5ad15 100644
--- a/src/Shell/CommonOptionsTrait.php
+++ b/src/Utility/CommonOptionsTrait.php
@@ -12,7 +12,7 @@
  * @since         1.4.3
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Bake\Shell;
+namespace Bake\Utility;
 
 use Cake\Core\Configure;
 use Cake\Core\Plugin;