diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile
index 34421b8f7a..38a5ac6117 100644
--- a/src/apps/haikudepot/Jamfile
+++ b/src/apps/haikudepot/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders interface shared package ;
 
 # source directories
 local sourceDirs =
-	textview
+	model textview ui
 ;
 
 local sourceDir ;
diff --git a/src/apps/haikudepot/DecisionProvider.cpp b/src/apps/haikudepot/model/DecisionProvider.cpp
similarity index 100%
rename from src/apps/haikudepot/DecisionProvider.cpp
rename to src/apps/haikudepot/model/DecisionProvider.cpp
diff --git a/src/apps/haikudepot/DecisionProvider.h b/src/apps/haikudepot/model/DecisionProvider.h
similarity index 100%
rename from src/apps/haikudepot/DecisionProvider.h
rename to src/apps/haikudepot/model/DecisionProvider.h
diff --git a/src/apps/haikudepot/JobStateListener.cpp b/src/apps/haikudepot/model/JobStateListener.cpp
similarity index 100%
rename from src/apps/haikudepot/JobStateListener.cpp
rename to src/apps/haikudepot/model/JobStateListener.cpp
diff --git a/src/apps/haikudepot/JobStateListener.h b/src/apps/haikudepot/model/JobStateListener.h
similarity index 100%
rename from src/apps/haikudepot/JobStateListener.h
rename to src/apps/haikudepot/model/JobStateListener.h
diff --git a/src/apps/haikudepot/Model.cpp b/src/apps/haikudepot/model/Model.cpp
similarity index 100%
rename from src/apps/haikudepot/Model.cpp
rename to src/apps/haikudepot/model/Model.cpp
diff --git a/src/apps/haikudepot/Model.h b/src/apps/haikudepot/model/Model.h
similarity index 100%
rename from src/apps/haikudepot/Model.h
rename to src/apps/haikudepot/model/Model.h
diff --git a/src/apps/haikudepot/PackageAction.cpp b/src/apps/haikudepot/model/PackageAction.cpp
similarity index 100%
rename from src/apps/haikudepot/PackageAction.cpp
rename to src/apps/haikudepot/model/PackageAction.cpp
diff --git a/src/apps/haikudepot/PackageAction.h b/src/apps/haikudepot/model/PackageAction.h
similarity index 100%
rename from src/apps/haikudepot/PackageAction.h
rename to src/apps/haikudepot/model/PackageAction.h
diff --git a/src/apps/haikudepot/PackageActionHandler.cpp b/src/apps/haikudepot/model/PackageActionHandler.cpp
similarity index 100%
rename from src/apps/haikudepot/PackageActionHandler.cpp
rename to src/apps/haikudepot/model/PackageActionHandler.cpp
diff --git a/src/apps/haikudepot/PackageActionHandler.h b/src/apps/haikudepot/model/PackageActionHandler.h
similarity index 100%
rename from src/apps/haikudepot/PackageActionHandler.h
rename to src/apps/haikudepot/model/PackageActionHandler.h
diff --git a/src/apps/haikudepot/PackageInfo.cpp b/src/apps/haikudepot/model/PackageInfo.cpp
similarity index 100%
rename from src/apps/haikudepot/PackageInfo.cpp
rename to src/apps/haikudepot/model/PackageInfo.cpp
diff --git a/src/apps/haikudepot/PackageInfo.h b/src/apps/haikudepot/model/PackageInfo.h
similarity index 100%
rename from src/apps/haikudepot/PackageInfo.h
rename to src/apps/haikudepot/model/PackageInfo.h
diff --git a/src/apps/haikudepot/PackageInfoListener.cpp b/src/apps/haikudepot/model/PackageInfoListener.cpp
similarity index 100%
rename from src/apps/haikudepot/PackageInfoListener.cpp
rename to src/apps/haikudepot/model/PackageInfoListener.cpp
diff --git a/src/apps/haikudepot/PackageInfoListener.h b/src/apps/haikudepot/model/PackageInfoListener.h
similarity index 100%
rename from src/apps/haikudepot/PackageInfoListener.h
rename to src/apps/haikudepot/model/PackageInfoListener.h
diff --git a/src/apps/haikudepot/WebAppInterface.cpp b/src/apps/haikudepot/model/WebAppInterface.cpp
similarity index 100%
rename from src/apps/haikudepot/WebAppInterface.cpp
rename to src/apps/haikudepot/model/WebAppInterface.cpp
diff --git a/src/apps/haikudepot/WebAppInterface.h b/src/apps/haikudepot/model/WebAppInterface.h
similarity index 100%
rename from src/apps/haikudepot/WebAppInterface.h
rename to src/apps/haikudepot/model/WebAppInterface.h
diff --git a/src/apps/haikudepot/App.cpp b/src/apps/haikudepot/ui/App.cpp
similarity index 100%
rename from src/apps/haikudepot/App.cpp
rename to src/apps/haikudepot/ui/App.cpp
diff --git a/src/apps/haikudepot/App.h b/src/apps/haikudepot/ui/App.h
similarity index 100%
rename from src/apps/haikudepot/App.h
rename to src/apps/haikudepot/ui/App.h
diff --git a/src/apps/haikudepot/BitmapButton.cpp b/src/apps/haikudepot/ui/BitmapButton.cpp
similarity index 100%
rename from src/apps/haikudepot/BitmapButton.cpp
rename to src/apps/haikudepot/ui/BitmapButton.cpp
diff --git a/src/apps/haikudepot/BitmapButton.h b/src/apps/haikudepot/ui/BitmapButton.h
similarity index 100%
rename from src/apps/haikudepot/BitmapButton.h
rename to src/apps/haikudepot/ui/BitmapButton.h
diff --git a/src/apps/haikudepot/BitmapView.cpp b/src/apps/haikudepot/ui/BitmapView.cpp
similarity index 100%
rename from src/apps/haikudepot/BitmapView.cpp
rename to src/apps/haikudepot/ui/BitmapView.cpp
diff --git a/src/apps/haikudepot/BitmapView.h b/src/apps/haikudepot/ui/BitmapView.h
similarity index 100%
rename from src/apps/haikudepot/BitmapView.h
rename to src/apps/haikudepot/ui/BitmapView.h
diff --git a/src/apps/haikudepot/FilterView.cpp b/src/apps/haikudepot/ui/FilterView.cpp
similarity index 100%
rename from src/apps/haikudepot/FilterView.cpp
rename to src/apps/haikudepot/ui/FilterView.cpp
diff --git a/src/apps/haikudepot/FilterView.h b/src/apps/haikudepot/ui/FilterView.h
similarity index 100%
rename from src/apps/haikudepot/FilterView.h
rename to src/apps/haikudepot/ui/FilterView.h
diff --git a/src/apps/haikudepot/MainWindow.cpp b/src/apps/haikudepot/ui/MainWindow.cpp
similarity index 100%
rename from src/apps/haikudepot/MainWindow.cpp
rename to src/apps/haikudepot/ui/MainWindow.cpp
diff --git a/src/apps/haikudepot/MainWindow.h b/src/apps/haikudepot/ui/MainWindow.h
similarity index 100%
rename from src/apps/haikudepot/MainWindow.h
rename to src/apps/haikudepot/ui/MainWindow.h
diff --git a/src/apps/haikudepot/PackageInfoView.cpp b/src/apps/haikudepot/ui/PackageInfoView.cpp
similarity index 100%
rename from src/apps/haikudepot/PackageInfoView.cpp
rename to src/apps/haikudepot/ui/PackageInfoView.cpp
diff --git a/src/apps/haikudepot/PackageInfoView.h b/src/apps/haikudepot/ui/PackageInfoView.h
similarity index 100%
rename from src/apps/haikudepot/PackageInfoView.h
rename to src/apps/haikudepot/ui/PackageInfoView.h
diff --git a/src/apps/haikudepot/PackageListView.cpp b/src/apps/haikudepot/ui/PackageListView.cpp
similarity index 100%
rename from src/apps/haikudepot/PackageListView.cpp
rename to src/apps/haikudepot/ui/PackageListView.cpp
diff --git a/src/apps/haikudepot/PackageListView.h b/src/apps/haikudepot/ui/PackageListView.h
similarity index 100%
rename from src/apps/haikudepot/PackageListView.h
rename to src/apps/haikudepot/ui/PackageListView.h
diff --git a/src/apps/haikudepot/PackageManager.cpp b/src/apps/haikudepot/ui/PackageManager.cpp
similarity index 100%
rename from src/apps/haikudepot/PackageManager.cpp
rename to src/apps/haikudepot/ui/PackageManager.cpp
diff --git a/src/apps/haikudepot/PackageManager.h b/src/apps/haikudepot/ui/PackageManager.h
similarity index 100%
rename from src/apps/haikudepot/PackageManager.h
rename to src/apps/haikudepot/ui/PackageManager.h
diff --git a/src/apps/haikudepot/RatePackageWindow.cpp b/src/apps/haikudepot/ui/RatePackageWindow.cpp
similarity index 100%
rename from src/apps/haikudepot/RatePackageWindow.cpp
rename to src/apps/haikudepot/ui/RatePackageWindow.cpp
diff --git a/src/apps/haikudepot/RatePackageWindow.h b/src/apps/haikudepot/ui/RatePackageWindow.h
similarity index 100%
rename from src/apps/haikudepot/RatePackageWindow.h
rename to src/apps/haikudepot/ui/RatePackageWindow.h
diff --git a/src/apps/haikudepot/RatingView.cpp b/src/apps/haikudepot/ui/RatingView.cpp
similarity index 100%
rename from src/apps/haikudepot/RatingView.cpp
rename to src/apps/haikudepot/ui/RatingView.cpp
diff --git a/src/apps/haikudepot/RatingView.h b/src/apps/haikudepot/ui/RatingView.h
similarity index 100%
rename from src/apps/haikudepot/RatingView.h
rename to src/apps/haikudepot/ui/RatingView.h
diff --git a/src/apps/haikudepot/SharedBitmap.cpp b/src/apps/haikudepot/ui/SharedBitmap.cpp
similarity index 100%
rename from src/apps/haikudepot/SharedBitmap.cpp
rename to src/apps/haikudepot/ui/SharedBitmap.cpp
diff --git a/src/apps/haikudepot/SharedBitmap.h b/src/apps/haikudepot/ui/SharedBitmap.h
similarity index 100%
rename from src/apps/haikudepot/SharedBitmap.h
rename to src/apps/haikudepot/ui/SharedBitmap.h
diff --git a/src/apps/haikudepot/UserLoginWindow.cpp b/src/apps/haikudepot/ui/UserLoginWindow.cpp
similarity index 100%
rename from src/apps/haikudepot/UserLoginWindow.cpp
rename to src/apps/haikudepot/ui/UserLoginWindow.cpp
diff --git a/src/apps/haikudepot/UserLoginWindow.h b/src/apps/haikudepot/ui/UserLoginWindow.h
similarity index 100%
rename from src/apps/haikudepot/UserLoginWindow.h
rename to src/apps/haikudepot/ui/UserLoginWindow.h
diff --git a/src/apps/haikudepot/support.cpp b/src/apps/haikudepot/ui/support.cpp
similarity index 100%
rename from src/apps/haikudepot/support.cpp
rename to src/apps/haikudepot/ui/support.cpp
diff --git a/src/apps/haikudepot/support.h b/src/apps/haikudepot/ui/support.h
similarity index 100%
rename from src/apps/haikudepot/support.h
rename to src/apps/haikudepot/ui/support.h