diff --git a/lib/QuickNavigation/ApiFunction/MediaSearch.php b/lib/ApiFunction/MediaSearch.php
similarity index 100%
rename from lib/QuickNavigation/ApiFunction/MediaSearch.php
rename to lib/ApiFunction/MediaSearch.php
diff --git a/lib/QuickNavigation/ApiFunction/MenuRender.php b/lib/ApiFunction/MenuRender.php
similarity index 100%
rename from lib/QuickNavigation/ApiFunction/MenuRender.php
rename to lib/ApiFunction/MenuRender.php
diff --git a/lib/QuickNavigation/Button/ArticleHistoryButton.php b/lib/Button/ArticleHistoryButton.php
similarity index 100%
rename from lib/QuickNavigation/Button/ArticleHistoryButton.php
rename to lib/Button/ArticleHistoryButton.php
diff --git a/lib/QuickNavigation/Button/ArticleNavigationButton.php b/lib/Button/ArticleNavigationButton.php
similarity index 100%
rename from lib/QuickNavigation/Button/ArticleNavigationButton.php
rename to lib/Button/ArticleNavigationButton.php
diff --git a/lib/QuickNavigation/Button/ButtonInterface.php b/lib/Button/ButtonInterface.php
similarity index 100%
rename from lib/QuickNavigation/Button/ButtonInterface.php
rename to lib/Button/ButtonInterface.php
diff --git a/lib/QuickNavigation/Button/ButtonRegistry.php b/lib/Button/ButtonRegistry.php
similarity index 100%
rename from lib/QuickNavigation/Button/ButtonRegistry.php
rename to lib/Button/ButtonRegistry.php
diff --git a/lib/QuickNavigation/Button/CategoryButton.php b/lib/Button/CategoryButton.php
similarity index 100%
rename from lib/QuickNavigation/Button/CategoryButton.php
rename to lib/Button/CategoryButton.php
diff --git a/lib/QuickNavigation/Button/FavoriteButton.php b/lib/Button/FavoriteButton.php
similarity index 100%
rename from lib/QuickNavigation/Button/FavoriteButton.php
rename to lib/Button/FavoriteButton.php
diff --git a/lib/QuickNavigation/Button/WatsonButton.php b/lib/Button/WatsonButton.php
similarity index 100%
rename from lib/QuickNavigation/Button/WatsonButton.php
rename to lib/Button/WatsonButton.php
diff --git a/lib/QuickNavigation/Button/YformButton.php b/lib/Button/YformButton.php
similarity index 100%
rename from lib/QuickNavigation/Button/YformButton.php
rename to lib/Button/YformButton.php
diff --git a/lib/QuickNavigation/LinkMap/QuickNavigationLinkMap.php b/lib/LinkMap/QuickNavigationLinkMap.php
similarity index 100%
rename from lib/QuickNavigation/LinkMap/QuickNavigationLinkMap.php
rename to lib/LinkMap/QuickNavigationLinkMap.php
diff --git a/lib/QuickNavigation/Media/MediaSorter.php b/lib/Media/MediaSorter.php
similarity index 100%
rename from lib/QuickNavigation/Media/MediaSorter.php
rename to lib/Media/MediaSorter.php
diff --git a/lib/QuickNavigation/Media/QuickNavigationMedia.php b/lib/Media/QuickNavigationMedia.php
similarity index 100%
rename from lib/QuickNavigation/Media/QuickNavigationMedia.php
rename to lib/Media/QuickNavigationMedia.php
diff --git a/lib/QuickNavigation/Minibar/ArticleHistoryElement.php b/lib/Minibar/ArticleHistoryElement.php
similarity index 100%
rename from lib/QuickNavigation/Minibar/ArticleHistoryElement.php
rename to lib/Minibar/ArticleHistoryElement.php
diff --git a/lib/QuickNavigation/QuickNavigation.php b/lib/QuickNavigation.php
similarity index 100%
rename from lib/QuickNavigation/QuickNavigation.php
rename to lib/QuickNavigation.php
diff --git a/lib/QuickNavigation/QuickNavigationApi.php b/lib/QuickNavigationApi.php
similarity index 100%
rename from lib/QuickNavigation/QuickNavigationApi.php
rename to lib/QuickNavigationApi.php
diff --git a/lib/QuickNavigation/Utility/BuildNavigationArray.php b/lib/Utility/BuildNavigationArray.php
similarity index 100%
rename from lib/QuickNavigation/Utility/BuildNavigationArray.php
rename to lib/Utility/BuildNavigationArray.php
diff --git a/lib/QuickNavigation/rex_api_quicknavigation_render.php b/lib/rex_api_quicknavigation_render.php
similarity index 100%
rename from lib/QuickNavigation/rex_api_quicknavigation_render.php
rename to lib/rex_api_quicknavigation_render.php