diff --git a/kpimidentities/richtextbuilders/Mainpage.dox b/pimtextedit/richtextbuilders/Mainpage.dox
similarity index 100%
rename from kpimidentities/richtextbuilders/Mainpage.dox
rename to pimtextedit/richtextbuilders/Mainpage.dox
diff --git a/kpimidentities/richtextbuilders/bbcodebuilder.cpp b/pimtextedit/richtextbuilders/bbcodebuilder.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/bbcodebuilder.cpp
rename to pimtextedit/richtextbuilders/bbcodebuilder.cpp
diff --git a/kpimidentities/richtextbuilders/bbcodebuilder.h b/pimtextedit/richtextbuilders/bbcodebuilder.h
similarity index 100%
rename from kpimidentities/richtextbuilders/bbcodebuilder.h
rename to pimtextedit/richtextbuilders/bbcodebuilder.h
diff --git a/kpimidentities/richtextbuilders/kabstractmarkupbuilder.h b/pimtextedit/richtextbuilders/kabstractmarkupbuilder.h
similarity index 100%
rename from kpimidentities/richtextbuilders/kabstractmarkupbuilder.h
rename to pimtextedit/richtextbuilders/kabstractmarkupbuilder.h
diff --git a/kpimidentities/richtextbuilders/kmarkupdirector.cpp b/pimtextedit/richtextbuilders/kmarkupdirector.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/kmarkupdirector.cpp
rename to pimtextedit/richtextbuilders/kmarkupdirector.cpp
diff --git a/kpimidentities/richtextbuilders/kmarkupdirector.h b/pimtextedit/richtextbuilders/kmarkupdirector.h
similarity index 100%
rename from kpimidentities/richtextbuilders/kmarkupdirector.h
rename to pimtextedit/richtextbuilders/kmarkupdirector.h
diff --git a/kpimidentities/richtextbuilders/kmarkupdirector_p.cpp b/pimtextedit/richtextbuilders/kmarkupdirector_p.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/kmarkupdirector_p.cpp
rename to pimtextedit/richtextbuilders/kmarkupdirector_p.cpp
diff --git a/kpimidentities/richtextbuilders/kmarkupdirector_p.h b/pimtextedit/richtextbuilders/kmarkupdirector_p.h
similarity index 100%
rename from kpimidentities/richtextbuilders/kmarkupdirector_p.h
rename to pimtextedit/richtextbuilders/kmarkupdirector_p.h
diff --git a/kpimidentities/richtextbuilders/kplaintextmarkupbuilder.cpp b/pimtextedit/richtextbuilders/kplaintextmarkupbuilder.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/kplaintextmarkupbuilder.cpp
rename to pimtextedit/richtextbuilders/kplaintextmarkupbuilder.cpp
diff --git a/kpimidentities/richtextbuilders/kplaintextmarkupbuilder.h b/pimtextedit/richtextbuilders/kplaintextmarkupbuilder.h
similarity index 100%
rename from kpimidentities/richtextbuilders/kplaintextmarkupbuilder.h
rename to pimtextedit/richtextbuilders/kplaintextmarkupbuilder.h
diff --git a/kpimidentities/richtextbuilders/ktexthtmlbuilder.cpp b/pimtextedit/richtextbuilders/ktexthtmlbuilder.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/ktexthtmlbuilder.cpp
rename to pimtextedit/richtextbuilders/ktexthtmlbuilder.cpp
diff --git a/kpimidentities/richtextbuilders/ktexthtmlbuilder.h b/pimtextedit/richtextbuilders/ktexthtmlbuilder.h
similarity index 100%
rename from kpimidentities/richtextbuilders/ktexthtmlbuilder.h
rename to pimtextedit/richtextbuilders/ktexthtmlbuilder.h
diff --git a/kpimidentities/richtextbuilders/mediawikimarkupbuilder.cpp b/pimtextedit/richtextbuilders/mediawikimarkupbuilder.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/mediawikimarkupbuilder.cpp
rename to pimtextedit/richtextbuilders/mediawikimarkupbuilder.cpp
diff --git a/kpimidentities/richtextbuilders/mediawikimarkupbuilder.h b/pimtextedit/richtextbuilders/mediawikimarkupbuilder.h
similarity index 100%
rename from kpimidentities/richtextbuilders/mediawikimarkupbuilder.h
rename to pimtextedit/richtextbuilders/mediawikimarkupbuilder.h
diff --git a/kpimidentities/richtextbuilders/testapp/CMakeLists.txt b/pimtextedit/richtextbuilders/testapp/CMakeLists.txt
similarity index 100%
rename from kpimidentities/richtextbuilders/testapp/CMakeLists.txt
rename to pimtextedit/richtextbuilders/testapp/CMakeLists.txt
diff --git a/kpimidentities/richtextbuilders/testapp/krichtexteditor.cpp b/pimtextedit/richtextbuilders/testapp/krichtexteditor.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/testapp/krichtexteditor.cpp
rename to pimtextedit/richtextbuilders/testapp/krichtexteditor.cpp
diff --git a/kpimidentities/richtextbuilders/testapp/krichtexteditor.h b/pimtextedit/richtextbuilders/testapp/krichtexteditor.h
similarity index 100%
rename from kpimidentities/richtextbuilders/testapp/krichtexteditor.h
rename to pimtextedit/richtextbuilders/testapp/krichtexteditor.h
diff --git a/kpimidentities/richtextbuilders/testapp/krichtexteditorui.rc b/pimtextedit/richtextbuilders/testapp/krichtexteditorui.rc
similarity index 100%
rename from kpimidentities/richtextbuilders/testapp/krichtexteditorui.rc
rename to pimtextedit/richtextbuilders/testapp/krichtexteditorui.rc
diff --git a/kpimidentities/richtextbuilders/testapp/main.cpp b/pimtextedit/richtextbuilders/testapp/main.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/testapp/main.cpp
rename to pimtextedit/richtextbuilders/testapp/main.cpp
diff --git a/kpimidentities/richtextbuilders/tests/CMakeLists.txt b/pimtextedit/richtextbuilders/tests/CMakeLists.txt
similarity index 100%
rename from kpimidentities/richtextbuilders/tests/CMakeLists.txt
rename to pimtextedit/richtextbuilders/tests/CMakeLists.txt
diff --git a/kpimidentities/richtextbuilders/tests/htmlbuildertest.cpp b/pimtextedit/richtextbuilders/tests/htmlbuildertest.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/tests/htmlbuildertest.cpp
rename to pimtextedit/richtextbuilders/tests/htmlbuildertest.cpp
diff --git a/kpimidentities/richtextbuilders/tests/plainmarkupbuildertest.cpp b/pimtextedit/richtextbuilders/tests/plainmarkupbuildertest.cpp
similarity index 100%
rename from kpimidentities/richtextbuilders/tests/plainmarkupbuildertest.cpp
rename to pimtextedit/richtextbuilders/tests/plainmarkupbuildertest.cpp
diff --git a/kpimidentities/richtextbuilders/tests/richtest.html b/pimtextedit/richtextbuilders/tests/richtest.html
similarity index 100%
rename from kpimidentities/richtextbuilders/tests/richtest.html
rename to pimtextedit/richtextbuilders/tests/richtest.html