diff --git a/src/Routes/Comments/AbstractCommentRoute.php b/src/Routes/Comments/AbstractCommentRoute.php
index 32448df9..2136fd3e 100644
--- a/src/Routes/Comments/AbstractCommentRoute.php
+++ b/src/Routes/Comments/AbstractCommentRoute.php
@@ -1,7 +1,7 @@
 <?php
 namespace Szurubooru\Routes\Comments;
 use Szurubooru\Routes\AbstractRoute;
-use Szurubooru\Controllers\ViewProxies\CommentViewProxy;
+use Szurubooru\ViewProxies\CommentViewProxy;
 
 abstract class AbstractCommentRoute extends AbstractRoute
 {
diff --git a/src/Routes/Comments/AddComment.php b/src/Routes/Comments/AddComment.php
index 99c38922..8cf76a65 100644
--- a/src/Routes/Comments/AddComment.php
+++ b/src/Routes/Comments/AddComment.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes\Comments;
-use Szurubooru\Controllers\ViewProxies\CommentViewProxy;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\CommentViewProxy;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class AddComment extends AbstractCommentRoute
 {
diff --git a/src/Routes/Comments/DeleteComment.php b/src/Routes/Comments/DeleteComment.php
index 70aa2d48..c17c3b1c 100644
--- a/src/Routes/Comments/DeleteComment.php
+++ b/src/Routes/Comments/DeleteComment.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes\Comments;
-use Szurubooru\Controllers\ViewProxies\CommentViewProxy;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\CommentViewProxy;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class DeleteComment extends AbstractCommentRoute
 {
diff --git a/src/Routes/Comments/EditComment.php b/src/Routes/Comments/EditComment.php
index f2a0b91d..26072180 100644
--- a/src/Routes/Comments/EditComment.php
+++ b/src/Routes/Comments/EditComment.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes\Comments;
-use Szurubooru\Controllers\ViewProxies\CommentViewProxy;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\CommentViewProxy;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class EditComment extends AbstractCommentRoute
 {
diff --git a/src/Routes/Comments/GetComments.php b/src/Routes/Comments/GetComments.php
index 441f0355..7458a312 100644
--- a/src/Routes/Comments/GetComments.php
+++ b/src/Routes/Comments/GetComments.php
@@ -1,7 +1,5 @@
 <?php
 namespace Szurubooru\Routes\Comments;
-use Szurubooru\Controllers\ViewProxies\CommentViewProxy;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\SearchServices\Filters\PostFilter;
@@ -10,6 +8,8 @@ use Szurubooru\SearchServices\Requirements\RequirementRangedValue;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\CommentViewProxy;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetComments extends AbstractCommentRoute
 {
diff --git a/src/Routes/Comments/GetPostComments.php b/src/Routes/Comments/GetPostComments.php
index 1fd15f44..df635931 100644
--- a/src/Routes/Comments/GetPostComments.php
+++ b/src/Routes/Comments/GetPostComments.php
@@ -1,7 +1,5 @@
 <?php
 namespace Szurubooru\Routes\Comments;
-use Szurubooru\Controllers\ViewProxies\CommentViewProxy;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\SearchServices\Filters\CommentFilter;
@@ -10,6 +8,8 @@ use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\CommentViewProxy;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetPostComments extends AbstractCommentRoute
 {
diff --git a/src/Routes/Favorites/AddToFavorites.php b/src/Routes/Favorites/AddToFavorites.php
index 8272be2f..a1527f53 100644
--- a/src/Routes/Favorites/AddToFavorites.php
+++ b/src/Routes/Favorites/AddToFavorites.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Favorites;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\Routes\AbstractRoute;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\FavoritesService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class AddToFavorites extends AbstractRoute
 {
diff --git a/src/Routes/Favorites/GetFavoriteUsers.php b/src/Routes/Favorites/GetFavoriteUsers.php
index bec5eac4..5eacd75e 100644
--- a/src/Routes/Favorites/GetFavoriteUsers.php
+++ b/src/Routes/Favorites/GetFavoriteUsers.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Favorites;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\Routes\AbstractRoute;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\FavoritesService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetFavoriteUsers extends AbstractRoute
 {
diff --git a/src/Routes/Favorites/RemoveFromFavorites.php b/src/Routes/Favorites/RemoveFromFavorites.php
index 8196ccfe..7754edca 100644
--- a/src/Routes/Favorites/RemoveFromFavorites.php
+++ b/src/Routes/Favorites/RemoveFromFavorites.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Favorites;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\Routes\AbstractRoute;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\FavoritesService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class RemoveFromFavorites extends AbstractRoute
 {
diff --git a/src/Routes/GetHistory.php b/src/Routes/GetHistory.php
index 0356b293..95357470 100644
--- a/src/Routes/GetHistory.php
+++ b/src/Routes/GetHistory.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes;
-use Szurubooru\Controllers\ViewProxies\SnapshotViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Routes\AbstractRoute;
 use Szurubooru\SearchServices\Parsers\SnapshotSearchParser;
 use Szurubooru\Services\HistoryService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\SnapshotViewProxy;
 
 class GetHistory extends AbstractRoute
 {
diff --git a/src/Routes/Login.php b/src/Routes/Login.php
index 28b0b606..5fac1b85 100644
--- a/src/Routes/Login.php
+++ b/src/Routes/Login.php
@@ -1,7 +1,5 @@
 <?php
 namespace Szurubooru\Routes;
-use Szurubooru\Controllers\ViewProxies\TokenViewProxy;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\FormData\LoginFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Router;
@@ -9,6 +7,8 @@ use Szurubooru\Services\AuthService;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TokenService;
 use Szurubooru\Services\UserService;
+use Szurubooru\ViewProxies\TokenViewProxy;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class Login extends AbstractRoute
 {
diff --git a/src/Routes/Posts/AbstractPostRoute.php b/src/Routes/Posts/AbstractPostRoute.php
index 5fd627ba..7b97bd3f 100644
--- a/src/Routes/Posts/AbstractPostRoute.php
+++ b/src/Routes/Posts/AbstractPostRoute.php
@@ -1,7 +1,7 @@
 <?php
 namespace Szurubooru\Routes\Posts;
 use Szurubooru\Routes\AbstractRoute;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 abstract class AbstractPostRoute extends AbstractRoute
 {
diff --git a/src/Routes/Posts/CreatePost.php b/src/Routes/Posts/CreatePost.php
index bdea7351..d7f12406 100644
--- a/src/Routes/Posts/CreatePost.php
+++ b/src/Routes/Posts/CreatePost.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Posts;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\FormData\UploadFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class CreatePost extends AbstractPostRoute
 {
diff --git a/src/Routes/Posts/GetFeaturedPost.php b/src/Routes/Posts/GetFeaturedPost.php
index 35c2575e..de55755f 100644
--- a/src/Routes/Posts/GetFeaturedPost.php
+++ b/src/Routes/Posts/GetFeaturedPost.php
@@ -1,9 +1,9 @@
 <?php
 namespace Szurubooru\Routes\Posts;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\Entities\Post;
 use Szurubooru\Services\PostFeatureService;
+use Szurubooru\ViewProxies\PostViewProxy;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetFeaturedPost extends AbstractPostRoute
 {
diff --git a/src/Routes/Posts/GetPost.php b/src/Routes/Posts/GetPost.php
index 1928ec7c..502aafe5 100644
--- a/src/Routes/Posts/GetPost.php
+++ b/src/Routes/Posts/GetPost.php
@@ -1,9 +1,9 @@
 <?php
 namespace Szurubooru\Routes\Posts;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetPost extends AbstractPostRoute
 {
diff --git a/src/Routes/Posts/GetPosts.php b/src/Routes/Posts/GetPosts.php
index 1e886c00..0c4b65d0 100644
--- a/src/Routes/Posts/GetPosts.php
+++ b/src/Routes/Posts/GetPosts.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes\Posts;
 use Szurubooru\Config;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\SearchServices\Parsers\PostSearchParser;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetPosts extends AbstractPostRoute
 {
diff --git a/src/Routes/Posts/Notes/AddPostNote.php b/src/Routes/Posts/Notes/AddPostNote.php
index 4ffdad2c..3df5a7aa 100644
--- a/src/Routes/Posts/Notes/AddPostNote.php
+++ b/src/Routes/Posts/Notes/AddPostNote.php
@@ -1,6 +1,5 @@
 <?php
 namespace Szurubooru\Routes\Posts\Notes;
-use Szurubooru\Controllers\ViewProxies\PostNoteViewProxy;
 use Szurubooru\FormData\PostNoteFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
@@ -8,6 +7,7 @@ use Szurubooru\Routes\Posts\AbstractPostRoute;
 use Szurubooru\Services\PostNotesService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\PostNoteViewProxy;
 
 class AddPostNote extends AbstractPostRoute
 {
diff --git a/src/Routes/Posts/Notes/GetPostNotes.php b/src/Routes/Posts/Notes/GetPostNotes.php
index e2849651..5ef988fd 100644
--- a/src/Routes/Posts/Notes/GetPostNotes.php
+++ b/src/Routes/Posts/Notes/GetPostNotes.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes\Posts\Notes;
-use Szurubooru\Controllers\ViewProxies\PostNoteViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Routes\Posts\AbstractPostRoute;
 use Szurubooru\Services\PostNotesService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\PostNoteViewProxy;
 
 class GetPostNotes extends AbstractPostRoute
 {
diff --git a/src/Routes/Posts/Notes/UpdatePostNote.php b/src/Routes/Posts/Notes/UpdatePostNote.php
index 09d68b6c..76fa2656 100644
--- a/src/Routes/Posts/Notes/UpdatePostNote.php
+++ b/src/Routes/Posts/Notes/UpdatePostNote.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes\Posts\Notes;
-use Szurubooru\Controllers\ViewProxies\PostNoteViewProxy;
 use Szurubooru\FormData\PostNoteFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Routes\Posts\AbstractPostRoute;
 use Szurubooru\Services\PostNotesService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\PostNoteViewProxy;
 
 class UpdatePostNote extends AbstractPostRoute
 {
diff --git a/src/Routes/Posts/UpdatePost.php b/src/Routes/Posts/UpdatePost.php
index c5c20c22..475dc1ef 100644
--- a/src/Routes/Posts/UpdatePost.php
+++ b/src/Routes/Posts/UpdatePost.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Posts;
-use Szurubooru\Controllers\ViewProxies\PostViewProxy;
 use Szurubooru\FormData\PostEditFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
+use Szurubooru\ViewProxies\PostViewProxy;
 
 class UpdatePost extends AbstractPostRoute
 {
diff --git a/src/Routes/Tags/AbstractTagRoute.php b/src/Routes/Tags/AbstractTagRoute.php
index c06f4cfc..ed64d7bf 100644
--- a/src/Routes/Tags/AbstractTagRoute.php
+++ b/src/Routes/Tags/AbstractTagRoute.php
@@ -1,7 +1,7 @@
 <?php
 namespace Szurubooru\Routes\Tags;
 use Szurubooru\Routes\AbstractRoute;
-use Szurubooru\Controllers\ViewProxies\TagViewProxy;
+use Szurubooru\ViewProxies\TagViewProxy;
 
 abstract class AbstractTagRoute extends AbstractRoute
 {
diff --git a/src/Routes/Tags/GetTag.php b/src/Routes/Tags/GetTag.php
index 3d0a3a84..00bb3217 100644
--- a/src/Routes/Tags/GetTag.php
+++ b/src/Routes/Tags/GetTag.php
@@ -1,9 +1,9 @@
 <?php
 namespace Szurubooru\Routes\Tags;
-use Szurubooru\Controllers\ViewProxies\TagViewProxy;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TagService;
+use Szurubooru\ViewProxies\TagViewProxy;
 
 class GetTag extends AbstractTagRoute
 {
diff --git a/src/Routes/Tags/GetTagSiblings.php b/src/Routes/Tags/GetTagSiblings.php
index 3f4ac8ff..e6ffcfa2 100644
--- a/src/Routes/Tags/GetTagSiblings.php
+++ b/src/Routes/Tags/GetTagSiblings.php
@@ -1,9 +1,9 @@
 <?php
 namespace Szurubooru\Routes\Tags;
-use Szurubooru\Controllers\ViewProxies\TagViewProxy;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TagService;
+use Szurubooru\ViewProxies\TagViewProxy;
 
 class GetTagSiblings extends AbstractTagRoute
 {
diff --git a/src/Routes/Tags/GetTags.php b/src/Routes/Tags/GetTags.php
index 5d000b52..79e9da20 100644
--- a/src/Routes/Tags/GetTags.php
+++ b/src/Routes/Tags/GetTags.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Tags;
-use Szurubooru\Controllers\ViewProxies\TagViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\SearchServices\Parsers\TagSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TagService;
+use Szurubooru\ViewProxies\TagViewProxy;
 
 class GetTags extends AbstractTagRoute
 {
diff --git a/src/Routes/Tags/UpdateTag.php b/src/Routes/Tags/UpdateTag.php
index f66f6c38..eb1c1c49 100644
--- a/src/Routes/Tags/UpdateTag.php
+++ b/src/Routes/Tags/UpdateTag.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Tags;
-use Szurubooru\Controllers\ViewProxies\TagViewProxy;
 use Szurubooru\FormData\TagEditFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TagService;
+use Szurubooru\ViewProxies\TagViewProxy;
 
 class UpdateTag extends AbstractTagRoute
 {
diff --git a/src/Routes/Users/CreateUser.php b/src/Routes/Users/CreateUser.php
index 64a54ab5..6fdafb12 100644
--- a/src/Routes/Users/CreateUser.php
+++ b/src/Routes/Users/CreateUser.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Users;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\FormData\RegistrationFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class CreateUser extends AbstractUserRoute
 {
diff --git a/src/Routes/Users/GetUser.php b/src/Routes/Users/GetUser.php
index ed715aaa..35890e23 100644
--- a/src/Routes/Users/GetUser.php
+++ b/src/Routes/Users/GetUser.php
@@ -1,10 +1,10 @@
 <?php
 namespace Szurubooru\Routes\Users;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\Privilege;
 use Szurubooru\SearchServices\Parsers\UserSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetUser extends AbstractUserRoute
 {
diff --git a/src/Routes/Users/GetUsers.php b/src/Routes/Users/GetUsers.php
index 85fc6805..d5ee55c6 100644
--- a/src/Routes/Users/GetUsers.php
+++ b/src/Routes/Users/GetUsers.php
@@ -1,12 +1,12 @@
 <?php
 namespace Szurubooru\Routes\Users;
 use Szurubooru\Config;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\SearchServices\Parsers\UserSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetUsers extends AbstractUserRoute
 {
diff --git a/src/Routes/Users/UpdateUser.php b/src/Routes/Users/UpdateUser.php
index 872e4954..9d9d4775 100644
--- a/src/Routes/Users/UpdateUser.php
+++ b/src/Routes/Users/UpdateUser.php
@@ -1,11 +1,11 @@
 <?php
 namespace Szurubooru\Routes\Users;
-use Szurubooru\Controllers\ViewProxies\UserViewProxy;
 use Szurubooru\FormData\UserEditFormData;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
+use Szurubooru\ViewProxies\UserViewProxy;
 
 class UpdateUser extends AbstractUserRoute
 {
diff --git a/src/Controllers/ViewProxies/AbstractViewProxy.php b/src/ViewProxies/AbstractViewProxy.php
similarity index 87%
rename from src/Controllers/ViewProxies/AbstractViewProxy.php
rename to src/ViewProxies/AbstractViewProxy.php
index b59e6a2f..3cb4cbde 100644
--- a/src/Controllers/ViewProxies/AbstractViewProxy.php
+++ b/src/ViewProxies/AbstractViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 
 abstract class AbstractViewProxy
 {
diff --git a/src/Controllers/ViewProxies/CommentViewProxy.php b/src/ViewProxies/CommentViewProxy.php
similarity index 96%
rename from src/Controllers/ViewProxies/CommentViewProxy.php
rename to src/ViewProxies/CommentViewProxy.php
index 442c3365..ca63562e 100644
--- a/src/Controllers/ViewProxies/CommentViewProxy.php
+++ b/src/ViewProxies/CommentViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\ScoreService;
 
diff --git a/src/Controllers/ViewProxies/PostNoteViewProxy.php b/src/ViewProxies/PostNoteViewProxy.php
similarity index 91%
rename from src/Controllers/ViewProxies/PostNoteViewProxy.php
rename to src/ViewProxies/PostNoteViewProxy.php
index 5c5e7398..c1b335e2 100644
--- a/src/Controllers/ViewProxies/PostNoteViewProxy.php
+++ b/src/ViewProxies/PostNoteViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 
 class PostNoteViewProxy extends AbstractViewProxy
 {
diff --git a/src/Controllers/ViewProxies/PostViewProxy.php b/src/ViewProxies/PostViewProxy.php
similarity index 98%
rename from src/Controllers/ViewProxies/PostViewProxy.php
rename to src/ViewProxies/PostViewProxy.php
index 5be84d06..31e7445b 100644
--- a/src/Controllers/ViewProxies/PostViewProxy.php
+++ b/src/ViewProxies/PostViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 use Szurubooru\Entities\Post;
 use Szurubooru\Helpers\EnumHelper;
 use Szurubooru\Helpers\MimeHelper;
diff --git a/src/Controllers/ViewProxies/SnapshotViewProxy.php b/src/ViewProxies/SnapshotViewProxy.php
similarity index 93%
rename from src/Controllers/ViewProxies/SnapshotViewProxy.php
rename to src/ViewProxies/SnapshotViewProxy.php
index dc82f825..bea7f202 100644
--- a/src/Controllers/ViewProxies/SnapshotViewProxy.php
+++ b/src/ViewProxies/SnapshotViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 
 class SnapshotViewProxy extends AbstractViewProxy
 {
diff --git a/src/Controllers/ViewProxies/TagViewProxy.php b/src/ViewProxies/TagViewProxy.php
similarity index 96%
rename from src/Controllers/ViewProxies/TagViewProxy.php
rename to src/ViewProxies/TagViewProxy.php
index baf2f8c6..67a7c389 100644
--- a/src/Controllers/ViewProxies/TagViewProxy.php
+++ b/src/ViewProxies/TagViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TagHistoryService;
diff --git a/src/Controllers/ViewProxies/TokenViewProxy.php b/src/ViewProxies/TokenViewProxy.php
similarity index 85%
rename from src/Controllers/ViewProxies/TokenViewProxy.php
rename to src/ViewProxies/TokenViewProxy.php
index 71d76023..6555fb35 100644
--- a/src/Controllers/ViewProxies/TokenViewProxy.php
+++ b/src/ViewProxies/TokenViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 
 class TokenViewProxy extends AbstractViewProxy
 {
diff --git a/src/Controllers/ViewProxies/UserViewProxy.php b/src/ViewProxies/UserViewProxy.php
similarity index 96%
rename from src/Controllers/ViewProxies/UserViewProxy.php
rename to src/ViewProxies/UserViewProxy.php
index 7b0c4ec5..5c272897 100644
--- a/src/Controllers/ViewProxies/UserViewProxy.php
+++ b/src/ViewProxies/UserViewProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers\ViewProxies;
+namespace Szurubooru\ViewProxies;
 use Szurubooru\Helpers\EnumHelper;
 use Szurubooru\Privilege;
 use Szurubooru\Services\PrivilegeService;