diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile
index 38a5ac6117..e40c09c962 100644
--- a/src/apps/haikudepot/Jamfile
+++ b/src/apps/haikudepot/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders interface shared package ;
 
 # source directories
 local sourceDirs =
-	model textview ui
+	model textview ui ui_generic
 ;
 
 local sourceDir ;
diff --git a/src/apps/haikudepot/ui/PackageManager.cpp b/src/apps/haikudepot/model/PackageManager.cpp
similarity index 100%
rename from src/apps/haikudepot/ui/PackageManager.cpp
rename to src/apps/haikudepot/model/PackageManager.cpp
diff --git a/src/apps/haikudepot/ui/PackageManager.h b/src/apps/haikudepot/model/PackageManager.h
similarity index 100%
rename from src/apps/haikudepot/ui/PackageManager.h
rename to src/apps/haikudepot/model/PackageManager.h
diff --git a/src/apps/haikudepot/ui/BitmapButton.cpp b/src/apps/haikudepot/ui_generic/BitmapButton.cpp
similarity index 100%
rename from src/apps/haikudepot/ui/BitmapButton.cpp
rename to src/apps/haikudepot/ui_generic/BitmapButton.cpp
diff --git a/src/apps/haikudepot/ui/BitmapButton.h b/src/apps/haikudepot/ui_generic/BitmapButton.h
similarity index 100%
rename from src/apps/haikudepot/ui/BitmapButton.h
rename to src/apps/haikudepot/ui_generic/BitmapButton.h
diff --git a/src/apps/haikudepot/ui/BitmapView.cpp b/src/apps/haikudepot/ui_generic/BitmapView.cpp
similarity index 100%
rename from src/apps/haikudepot/ui/BitmapView.cpp
rename to src/apps/haikudepot/ui_generic/BitmapView.cpp
diff --git a/src/apps/haikudepot/ui/BitmapView.h b/src/apps/haikudepot/ui_generic/BitmapView.h
similarity index 100%
rename from src/apps/haikudepot/ui/BitmapView.h
rename to src/apps/haikudepot/ui_generic/BitmapView.h
diff --git a/src/apps/haikudepot/ui/RatingView.cpp b/src/apps/haikudepot/ui_generic/RatingView.cpp
similarity index 100%
rename from src/apps/haikudepot/ui/RatingView.cpp
rename to src/apps/haikudepot/ui_generic/RatingView.cpp
diff --git a/src/apps/haikudepot/ui/RatingView.h b/src/apps/haikudepot/ui_generic/RatingView.h
similarity index 100%
rename from src/apps/haikudepot/ui/RatingView.h
rename to src/apps/haikudepot/ui_generic/RatingView.h
diff --git a/src/apps/haikudepot/ui/SharedBitmap.cpp b/src/apps/haikudepot/ui_generic/SharedBitmap.cpp
similarity index 100%
rename from src/apps/haikudepot/ui/SharedBitmap.cpp
rename to src/apps/haikudepot/ui_generic/SharedBitmap.cpp
diff --git a/src/apps/haikudepot/ui/SharedBitmap.h b/src/apps/haikudepot/ui_generic/SharedBitmap.h
similarity index 100%
rename from src/apps/haikudepot/ui/SharedBitmap.h
rename to src/apps/haikudepot/ui_generic/SharedBitmap.h
diff --git a/src/apps/haikudepot/ui/support.cpp b/src/apps/haikudepot/ui_generic/support.cpp
similarity index 100%
rename from src/apps/haikudepot/ui/support.cpp
rename to src/apps/haikudepot/ui_generic/support.cpp
diff --git a/src/apps/haikudepot/ui/support.h b/src/apps/haikudepot/ui_generic/support.h
similarity index 100%
rename from src/apps/haikudepot/ui/support.h
rename to src/apps/haikudepot/ui_generic/support.h