Move traits under respective namespaces.

src/Console/Command/Task/TemplateTask.php

@@ -18,7 +18,7 @@ use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Utility\ConventionsTrait;
 use Cake\Utility\Folder;
-use Cake\Utility\ViewVarsTrait;
+use Cake\View\ViewVarsTrait;
 
 /**
  * Template Task can generate templated output Used in other Tasks.

src/Console/Shell.php

@@ -19,11 +19,11 @@ use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Object;
 use Cake\Core\Plugin;
+use Cake\Model\ModelAwareTrait;
 use Cake\Utility\ConventionsTrait;
 use Cake\Utility\File;
 use Cake\Utility\Inflector;
 use Cake\Utility\MergeVariablesTrait;
-use Cake\Utility\ModelAwareTrait;
 use Cake\Utility\String;
 
 /**

src/Controller/Controller.php

@@ -22,17 +22,17 @@ use Cake\Error\Exception;
 use Cake\Event\Event;
 use Cake\Event\EventListener;
 use Cake\Event\EventManager;
+use Cake\Model\ModelAwareTrait;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\ORM\TableRegistry;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
-use Cake\Utility\CellTrait;
 use Cake\Utility\Inflector;
 use Cake\Utility\MergeVariablesTrait;
-use Cake\Utility\ModelAwareTrait;
-use Cake\Utility\ViewVarsTrait;
+use Cake\View\CellTrait;
 use Cake\View\View;
+use Cake\View\ViewVarsTrait;
 
 /**
  * Application controller class for organization of business logic.

src/Utility/ModelAwareTrait.php

@@ -12,9 +12,9 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Utility;
+namespace Cake\Model;
 
-use Cake\Error;
+use Cake\Error\Exception;
 use Cake\Utility\Inflector;
 
 /**
@@ -70,7 +70,7 @@ trait ModelAwareTrait {
  * @param string $type The type of repository to load. Defaults to 'Table' which
  *   delegates to Cake\ORM\TableRegistry.
  * @return bool True when single repository found and instance created.
- * @throws \Cake\Error\MissingModelException if the model class cannot be found.
+ * @throws \Cake\Model\Error\MissingModelException if the model class cannot be found.
  * @throws \Cake\Error\Exception When using a type that has not been registered.
  */
 	public function loadModel($modelClass = null, $type = 'Table') {
@@ -85,7 +85,7 @@ trait ModelAwareTrait {
 		list($plugin, $modelClass) = pluginSplit($modelClass, true);
 
 		if (!isset($this->_modelFactories[$type])) {
-			throw new Error\Exception(sprintf(
+			throw new Exception(sprintf(
 				'Unknown repository type "%s". Make sure you register a type before trying to use it.',
 				$type
 			));

src/View/Cell.php

@@ -16,11 +16,11 @@ namespace Cake\View;
 
 use Cake\Core\App;
 use Cake\Event\EventManager;
+use Cake\Model\ModelAwareTrait;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\Utility\Inflector;
-use Cake\Utility\ModelAwareTrait;
-use Cake\Utility\ViewVarsTrait;
+use Cake\View\ViewVarsTrait;
 
 /**
  * Cell base.

src/Utility/CellTrait.php

@@ -12,11 +12,10 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Utility;
+namespace Cake\View;
 
 use Cake\Core\App;
 use Cake\Utility\Inflector;
-use Cake\View\Error;
 
 /**
  * Provides cell() method for usage in Controller and View classes.

src/View/View.php

@@ -27,9 +27,9 @@ use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
-use Cake\Utility\CellTrait;
 use Cake\Utility\Inflector;
-use Cake\Utility\ViewVarsTrait;
+use Cake\View\CellTrait;
+use Cake\View\ViewVarsTrait;
 
 /**
  * View, the V in the MVC triad. View interacts with Helpers and view variables passed

src/Utility/ViewVarsTrait.php

@@ -11,7 +11,7 @@
  * @since         3.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-namespace Cake\Utility;
+namespace Cake\View;
 
 use Cake\Core\App;
 

tests/TestCase/Utility/ModelAwareTraitTest.php

@@ -11,10 +11,10 @@
  * @since         3.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-namespace Cake\Test\TestCase\Utility;
+namespace Cake\Test\TestCase\Model;
 
+use Cake\Model\ModelAwareTrait;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\ModelAwareTrait;
 
 /**
  * Testing stub.

tests/TestCase/View/CellTest.php

@@ -19,8 +19,8 @@ use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Event\EventManager;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\CellTrait;
 use Cake\View\Cell;
+use Cake\View\CellTrait;
 
 /**
  * CellTest class.

tests/TestCase/Utility/ViewVarsTraitTest.php

@@ -11,10 +11,10 @@
  * @since         3.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-namespace Cake\Test\TestCase\Utility;
+namespace Cake\Test\TestCase\View;
 
 use Cake\TestSuite\TestCase;
-use Cake\Utility\ViewVarsTrait;
+use Cake\View\ViewVarsTrait;
 
 /**
  * ViewVarsTrait test case
@@ -30,7 +30,7 @@ class ViewVarsTraitTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->subject = $this->getObjectForTrait('Cake\Utility\ViewVarsTrait');
+		$this->subject = $this->getObjectForTrait('Cake\View\ViewVarsTrait');
 	}
 
 /**