24 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml
index d447822430..80f90f5fe9 100644
--- a/examples/declarative/calculator/calculator.qml
+++ b/examples/declarative/calculator/calculator.qml
@@ -41,8 +41,8 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import "Core"
-import "Core/calculator.js" as CalcEngine
+import "content"
+import "content/calculator.js" as CalcEngine
 
 Rectangle {
     id: window
diff --git a/examples/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/content/Button.qml
index 2b4e2f5b0f..2b4e2f5b0f 100644
--- a/examples/declarative/calculator/Core/Button.qml
+++ b/examples/declarative/calculator/content/Button.qml
diff --git a/examples/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/content/Display.qml
index a3fa2e976a..a3fa2e976a 100644
--- a/examples/declarative/calculator/Core/Display.qml
+++ b/examples/declarative/calculator/content/Display.qml
diff --git a/examples/declarative/calculator/Core/calculator.js b/examples/declarative/calculator/content/calculator.js
index 7c363c7f30..7c363c7f30 100644
--- a/examples/declarative/calculator/Core/calculator.js
+++ b/examples/declarative/calculator/content/calculator.js
diff --git a/examples/declarative/calculator/Core/images/button-.png b/examples/declarative/calculator/content/images/button-.png
index 544e514536..544e514536 100644
--- a/examples/declarative/calculator/Core/images/button-.png
+++ b/examples/declarative/calculator/content/images/button-.png
diff --git a/examples/declarative/calculator/Core/images/button-blue.png b/examples/declarative/calculator/content/images/button-blue.png
index 5f92de32d0..5f92de32d0 100644
--- a/examples/declarative/calculator/Core/images/button-blue.png
+++ b/examples/declarative/calculator/content/images/button-blue.png
diff --git a/examples/declarative/calculator/Core/images/button-green.png b/examples/declarative/calculator/content/images/button-green.png
index 36c93914c7..36c93914c7 100644
--- a/examples/declarative/calculator/Core/images/button-green.png
+++ b/examples/declarative/calculator/content/images/button-green.png
diff --git a/examples/declarative/calculator/Core/images/button-purple.png b/examples/declarative/calculator/content/images/button-purple.png
index 347cbbea9d..347cbbea9d 100644
--- a/examples/declarative/calculator/Core/images/button-purple.png
+++ b/examples/declarative/calculator/content/images/button-purple.png
diff --git a/examples/declarative/calculator/Core/images/button-red.png b/examples/declarative/calculator/content/images/button-red.png
index 3b335891ae..3b335891ae 100644
--- a/examples/declarative/calculator/Core/images/button-red.png
+++ b/examples/declarative/calculator/content/images/button-red.png
diff --git a/examples/declarative/calculator/Core/images/display.png b/examples/declarative/calculator/content/images/display.png
index 9507f4382e..9507f4382e 100644
--- a/examples/declarative/calculator/Core/images/display.png
+++ b/examples/declarative/calculator/content/images/display.png
diff --git a/examples/declarative/calculator/Core/qmldir b/examples/declarative/calculator/content/qmldir
index a926b93fac..a926b93fac 100644
--- a/examples/declarative/calculator/Core/qmldir
+++ b/examples/declarative/calculator/content/qmldir
diff --git a/examples/declarative/samegame/SamegameCore/BoomBlock.qml b/examples/declarative/samegame/content/BoomBlock.qml
index 7bc0d31d6f..7bc0d31d6f 100644
--- a/examples/declarative/samegame/SamegameCore/BoomBlock.qml
+++ b/examples/declarative/samegame/content/BoomBlock.qml
diff --git a/examples/declarative/samegame/SamegameCore/Button.qml b/examples/declarative/samegame/content/Button.qml
index 5b64302c0f..5b64302c0f 100644
--- a/examples/declarative/samegame/SamegameCore/Button.qml
+++ b/examples/declarative/samegame/content/Button.qml
diff --git a/examples/declarative/samegame/SamegameCore/Dialog.qml b/examples/declarative/samegame/content/Dialog.qml
index b4d3e00b4f..b4d3e00b4f 100644
--- a/examples/declarative/samegame/SamegameCore/Dialog.qml
+++ b/examples/declarative/samegame/content/Dialog.qml
diff --git a/examples/declarative/samegame/SamegameCore/GameArea.qml b/examples/declarative/samegame/content/GameArea.qml
index 14c52e939c..14c52e939c 100644
--- a/examples/declarative/samegame/SamegameCore/GameArea.qml
+++ b/examples/declarative/samegame/content/GameArea.qml
diff --git a/examples/declarative/samegame/SamegameCore/NameInputDialog.qml b/examples/declarative/samegame/content/NameInputDialog.qml
index 05578e0ab6..05578e0ab6 100644
--- a/examples/declarative/samegame/SamegameCore/NameInputDialog.qml
+++ b/examples/declarative/samegame/content/NameInputDialog.qml
diff --git a/examples/declarative/samegame/SamegameCore/pics/background.png b/examples/declarative/samegame/content/pics/background.png
index 3734a27744..3734a27744 100644
--- a/examples/declarative/samegame/SamegameCore/pics/background.png
+++ b/examples/declarative/samegame/content/pics/background.png
diff --git a/examples/declarative/samegame/SamegameCore/pics/blueStone.png b/examples/declarative/samegame/content/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/examples/declarative/samegame/SamegameCore/pics/blueStone.png
+++ b/examples/declarative/samegame/content/pics/blueStone.png
diff --git a/examples/declarative/samegame/SamegameCore/pics/greenStone.png b/examples/declarative/samegame/content/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/examples/declarative/samegame/SamegameCore/pics/greenStone.png
+++ b/examples/declarative/samegame/content/pics/greenStone.png
diff --git a/examples/declarative/samegame/SamegameCore/pics/particle.png b/examples/declarative/samegame/content/pics/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/samegame/SamegameCore/pics/particle.png
+++ b/examples/declarative/samegame/content/pics/particle.png
diff --git a/examples/declarative/samegame/SamegameCore/pics/redStone.png b/examples/declarative/samegame/content/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/examples/declarative/samegame/SamegameCore/pics/redStone.png
+++ b/examples/declarative/samegame/content/pics/redStone.png
diff --git a/examples/declarative/samegame/SamegameCore/pics/yellowStone.png b/examples/declarative/samegame/content/pics/yellowStone.png
index b1ce76212c..b1ce76212c 100644
--- a/examples/declarative/samegame/SamegameCore/pics/yellowStone.png
+++ b/examples/declarative/samegame/content/pics/yellowStone.png
diff --git a/examples/declarative/samegame/SamegameCore/samegame.js b/examples/declarative/samegame/content/samegame.js
index 8c15af763a..8c15af763a 100755
--- a/examples/declarative/samegame/SamegameCore/samegame.js
+++ b/examples/declarative/samegame/content/samegame.js
diff --git a/examples/declarative/samegame/samegame.qml b/examples/declarative/samegame/samegame.qml
index 43e956b359..8617a6b168 100644
--- a/examples/declarative/samegame/samegame.qml
+++ b/examples/declarative/samegame/samegame.qml
@@ -41,8 +41,8 @@
 
 import QtQuick 2.0
 import QtQuick.Particles 2.0
-import "SamegameCore"
-import "SamegameCore/samegame.js" as Logic
+import "content"
+import "content/samegame.js" as Logic
 
 Rectangle {
     id: screen