diff --git a/doc/doc.pri b/doc/doc.pri
index 4207e364c76..bfcaaecf335 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -7,7 +7,7 @@ unix {
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
-QCH_FILE = $$OUT_PWD/doc/qtcreator.qch
+QCH_FILE = $$OUT_PWD/share/doc/qtcreator/qtcreator.qch
 
 unix {
 html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
diff --git a/bin/designer/templates.xml b/share/qtcreator/designer/templates.xml
similarity index 100%
rename from bin/designer/templates.xml
rename to share/qtcreator/designer/templates.xml
diff --git a/bin/designer/templates/Dialog_with_Buttons_Bottom.ui b/share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui
similarity index 100%
rename from bin/designer/templates/Dialog_with_Buttons_Bottom.ui
rename to share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui
diff --git a/bin/designer/templates/Dialog_with_Buttons_Right.ui b/share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui
similarity index 100%
rename from bin/designer/templates/Dialog_with_Buttons_Right.ui
rename to share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui
diff --git a/bin/designer/templates/Dialog_without_Buttons.ui b/share/qtcreator/designer/templates/Dialog_without_Buttons.ui
similarity index 100%
rename from bin/designer/templates/Dialog_without_Buttons.ui
rename to share/qtcreator/designer/templates/Dialog_without_Buttons.ui
diff --git a/bin/designer/templates/Main_Window.ui b/share/qtcreator/designer/templates/Main_Window.ui
similarity index 100%
rename from bin/designer/templates/Main_Window.ui
rename to share/qtcreator/designer/templates/Main_Window.ui
diff --git a/bin/designer/templates/Widget.ui b/share/qtcreator/designer/templates/Widget.ui
similarity index 100%
rename from bin/designer/templates/Widget.ui
rename to share/qtcreator/designer/templates/Widget.ui
diff --git a/bin/gdbmacros/GPL_EXCEPTION.TXT b/share/qtcreator/gdbmacros/GPL_EXCEPTION.TXT
similarity index 100%
rename from bin/gdbmacros/GPL_EXCEPTION.TXT
rename to share/qtcreator/gdbmacros/GPL_EXCEPTION.TXT
diff --git a/bin/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
similarity index 100%
rename from bin/gdbmacros/gdbmacros.cpp
rename to share/qtcreator/gdbmacros/gdbmacros.cpp
diff --git a/bin/gdbmacros/gdbmacros.pro b/share/qtcreator/gdbmacros/gdbmacros.pro
similarity index 100%
rename from bin/gdbmacros/gdbmacros.pro
rename to share/qtcreator/gdbmacros/gdbmacros.pro
diff --git a/bin/license.txt b/share/qtcreator/license.txt
similarity index 100%
rename from bin/license.txt
rename to share/qtcreator/license.txt
diff --git a/bin/runInTerminal.command b/share/qtcreator/runInTerminal.command
similarity index 100%
rename from bin/runInTerminal.command
rename to share/qtcreator/runInTerminal.command
diff --git a/bin/schemes/MS_Visual_C++.kms b/share/qtcreator/schemes/MS_Visual_C++.kms
similarity index 100%
rename from bin/schemes/MS_Visual_C++.kms
rename to share/qtcreator/schemes/MS_Visual_C++.kms
diff --git a/bin/schemes/Xcode.kms b/share/qtcreator/schemes/Xcode.kms
similarity index 100%
rename from bin/schemes/Xcode.kms
rename to share/qtcreator/schemes/Xcode.kms
diff --git a/bin/snippets/class_generic.snp b/share/qtcreator/snippets/class_generic.snp
similarity index 100%
rename from bin/snippets/class_generic.snp
rename to share/qtcreator/snippets/class_generic.snp
diff --git a/bin/snippets/class_qobject.snp b/share/qtcreator/snippets/class_qobject.snp
similarity index 100%
rename from bin/snippets/class_qobject.snp
rename to share/qtcreator/snippets/class_qobject.snp
diff --git a/bin/snippets/class_qwidget.snp b/share/qtcreator/snippets/class_qwidget.snp
similarity index 100%
rename from bin/snippets/class_qwidget.snp
rename to share/qtcreator/snippets/class_qwidget.snp
diff --git a/bin/snippets/comment.snp b/share/qtcreator/snippets/comment.snp
similarity index 100%
rename from bin/snippets/comment.snp
rename to share/qtcreator/snippets/comment.snp
diff --git a/bin/snippets/for.snp b/share/qtcreator/snippets/for.snp
similarity index 100%
rename from bin/snippets/for.snp
rename to share/qtcreator/snippets/for.snp
diff --git a/bin/snippets/foreach.snp b/share/qtcreator/snippets/foreach.snp
similarity index 100%
rename from bin/snippets/foreach.snp
rename to share/qtcreator/snippets/foreach.snp
diff --git a/bin/snippets/if.snp b/share/qtcreator/snippets/if.snp
similarity index 100%
rename from bin/snippets/if.snp
rename to share/qtcreator/snippets/if.snp
diff --git a/bin/snippets/ifelse.snp b/share/qtcreator/snippets/ifelse.snp
similarity index 100%
rename from bin/snippets/ifelse.snp
rename to share/qtcreator/snippets/ifelse.snp
diff --git a/bin/templates/qt4project/main.cpp b/share/templates/qt4project/main.cpp
similarity index 100%
rename from bin/templates/qt4project/main.cpp
rename to share/templates/qt4project/main.cpp
diff --git a/bin/templates/qt4project/mywidget.cpp b/share/templates/qt4project/mywidget.cpp
similarity index 100%
rename from bin/templates/qt4project/mywidget.cpp
rename to share/templates/qt4project/mywidget.cpp
diff --git a/bin/templates/qt4project/mywidget.h b/share/templates/qt4project/mywidget.h
similarity index 100%
rename from bin/templates/qt4project/mywidget.h
rename to share/templates/qt4project/mywidget.h
diff --git a/bin/templates/qt4project/mywidget_form.cpp b/share/templates/qt4project/mywidget_form.cpp
similarity index 100%
rename from bin/templates/qt4project/mywidget_form.cpp
rename to share/templates/qt4project/mywidget_form.cpp
diff --git a/bin/templates/qt4project/mywidget_form.h b/share/templates/qt4project/mywidget_form.h
similarity index 100%
rename from bin/templates/qt4project/mywidget_form.h
rename to share/templates/qt4project/mywidget_form.h
diff --git a/bin/templates/qt4project/widget.ui b/share/templates/qt4project/widget.ui
similarity index 100%
rename from bin/templates/qt4project/widget.ui
rename to share/templates/qt4project/widget.ui
diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp
index 9f8ec24b576..e9a3799d628 100644
--- a/src/plugins/coreplugin/coreimpl.cpp
+++ b/src/plugins/coreplugin/coreimpl.cpp
@@ -148,7 +148,7 @@ QString CoreImpl::resourcePath() const
 #if defined(Q_OS_MAC)
     return QDir::cleanPath(QCoreApplication::applicationDirPath()+QLatin1String("/../Resources"));
 #else
-    return QDir::cleanPath(QCoreApplication::applicationDirPath());
+    return QDir::cleanPath(QCoreApplication::applicationDirPath())+"/../share/qtcreator";
 #endif
 }