diff --git a/src/Views/comment-add.phtml b/src/Views/comment/comment-add.phtml
similarity index 100%
rename from src/Views/comment-add.phtml
rename to src/Views/comment/comment-add.phtml
diff --git a/src/Views/comment-edit.phtml b/src/Views/comment/comment-edit.phtml
similarity index 100%
rename from src/Views/comment-edit.phtml
rename to src/Views/comment/comment-edit.phtml
diff --git a/src/Views/comment-list.phtml b/src/Views/comment/comment-list.phtml
similarity index 100%
rename from src/Views/comment-list.phtml
rename to src/Views/comment/comment-list.phtml
diff --git a/src/Views/comment-small.phtml b/src/Views/comment/comment-small.phtml
similarity index 94%
rename from src/Views/comment-small.phtml
rename to src/Views/comment/comment-small.phtml
index 5c1f0a84..fd06df56 100644
--- a/src/Views/comment-small.phtml
+++ b/src/Views/comment/comment-small.phtml
@@ -1,7 +1,7 @@
 <?php
-Assets::addStylesheet('comment-small.css');
-Assets::addStylesheet('comment-edit.css');
-Assets::addScript('comment-edit.js');
+	Assets::addStylesheet('comment-small.css');
+	Assets::addStylesheet('comment-edit.css');
+	Assets::addScript('comment-edit.js');
 ?>
 
 <div class="comment">
diff --git a/src/Views/log-list.phtml b/src/Views/log/log-list.phtml
similarity index 100%
rename from src/Views/log-list.phtml
rename to src/Views/log/log-list.phtml
diff --git a/src/Views/log-view.phtml b/src/Views/log/log-view.phtml
similarity index 100%
rename from src/Views/log-view.phtml
rename to src/Views/log/log-view.phtml
diff --git a/src/Views/post-edit.phtml b/src/Views/post/post-edit.phtml
similarity index 100%
rename from src/Views/post-edit.phtml
rename to src/Views/post/post-edit.phtml
diff --git a/src/Views/post-file-render.phtml b/src/Views/post/post-file-render.phtml
similarity index 100%
rename from src/Views/post-file-render.phtml
rename to src/Views/post/post-file-render.phtml
diff --git a/src/Views/post-list-wrapper.phtml b/src/Views/post/post-list-wrapper.phtml
similarity index 100%
rename from src/Views/post-list-wrapper.phtml
rename to src/Views/post/post-list-wrapper.phtml
diff --git a/src/Views/post-list.phtml b/src/Views/post/post-list.phtml
similarity index 80%
rename from src/Views/post-list.phtml
rename to src/Views/post/post-list.phtml
index 8893d0f3..b8f838ee 100644
--- a/src/Views/post-list.phtml
+++ b/src/Views/post/post-list.phtml
@@ -1,16 +1,14 @@
 <?php
 Assets::addStylesheet('post-list.css');
 Assets::addScript('post-list.js');
-?>
 
-<?php if (isset($this->context->source)
+if (isset($this->context->source)
 	and $this->context->source == 'mass-tag'
-	and Access::check(new Privilege(Privilege::MassTag))): ?>
-
-	<?php \Chibi\View::render('tag-mass-tag', $this->context) ?>
-
-<?php endif ?>
-
+	and Access::check(new Privilege(Privilege::MassTag)))
+{
+	\Chibi\View::render('tag-mass-tag', $this->context);
+}
+?>
 
 <?php if (!empty($this->context->transport->message)): ?>
 	<?php \Chibi\View::render('message', $this->context) ?>
diff --git a/src/Views/post-small.phtml b/src/Views/post/post-small.phtml
similarity index 99%
rename from src/Views/post-small.phtml
rename to src/Views/post/post-small.phtml
index 5e8086eb..bc041f2f 100644
--- a/src/Views/post-small.phtml
+++ b/src/Views/post/post-small.phtml
@@ -26,6 +26,7 @@ if ($masstag)
 ?>
 
 <div class="<?= implode(' ', $classNames) ?>">
+
 	<?php if ($masstag): ?>
 		<a class="toggle-tag"
 			href="<?= \Chibi\Router::linkTo(['PostController', 'toggleTagAction'], [
diff --git a/src/Views/post-upload.phtml b/src/Views/post/post-upload.phtml
similarity index 100%
rename from src/Views/post-upload.phtml
rename to src/Views/post/post-upload.phtml
diff --git a/src/Views/post-view.phtml b/src/Views/post/post-view.phtml
similarity index 99%
rename from src/Views/post-view.phtml
rename to src/Views/post/post-view.phtml
index 5e5e0c9f..2aef0a58 100644
--- a/src/Views/post-view.phtml
+++ b/src/Views/post/post-view.phtml
@@ -378,9 +378,10 @@ $canEditAnything = count(array_filter($editPostPrivileges)) > 0;
 	</div>
 
 	<?php
-	Assets::addStylesheet('comment-list.css');
-	Assets::addStylesheet('comment-small.css');
+		Assets::addStylesheet('comment-list.css');
+		Assets::addStylesheet('comment-small.css');
 	?>
+
 	<div class="comments-wrapper">
 		<?php if (!empty($this->context->transport->post->getComments())): ?>
 			<div class="unit comments">
diff --git a/src/Views/static-help.phtml b/src/Views/static/static-help.phtml
similarity index 100%
rename from src/Views/static-help.phtml
rename to src/Views/static/static-help.phtml
diff --git a/src/Views/static-main.phtml b/src/Views/static/static-main.phtml
similarity index 100%
rename from src/Views/static-main.phtml
rename to src/Views/static/static-main.phtml
diff --git a/src/Views/tag-list-wrapper.phtml b/src/Views/tag/tag-list-wrapper.phtml
similarity index 100%
rename from src/Views/tag-list-wrapper.phtml
rename to src/Views/tag/tag-list-wrapper.phtml
diff --git a/src/Views/tag-list.phtml b/src/Views/tag/tag-list.phtml
similarity index 100%
rename from src/Views/tag-list.phtml
rename to src/Views/tag/tag-list.phtml
diff --git a/src/Views/tag-mass-tag.phtml b/src/Views/tag/tag-mass-tag.phtml
similarity index 100%
rename from src/Views/tag-mass-tag.phtml
rename to src/Views/tag/tag-mass-tag.phtml
diff --git a/src/Views/tag-merge.phtml b/src/Views/tag/tag-merge.phtml
similarity index 100%
rename from src/Views/tag-merge.phtml
rename to src/Views/tag/tag-merge.phtml
diff --git a/src/Views/tag-rename.phtml b/src/Views/tag/tag-rename.phtml
similarity index 100%
rename from src/Views/tag-rename.phtml
rename to src/Views/tag/tag-rename.phtml
diff --git a/src/Views/user-delete.phtml b/src/Views/user/user-delete.phtml
similarity index 100%
rename from src/Views/user-delete.phtml
rename to src/Views/user/user-delete.phtml
diff --git a/src/Views/user-edit.phtml b/src/Views/user/user-edit.phtml
similarity index 100%
rename from src/Views/user-edit.phtml
rename to src/Views/user/user-edit.phtml
diff --git a/src/Views/user-list.phtml b/src/Views/user/user-list.phtml
similarity index 100%
rename from src/Views/user-list.phtml
rename to src/Views/user/user-list.phtml
diff --git a/src/Views/user-registration.phtml b/src/Views/user/user-registration.phtml
similarity index 100%
rename from src/Views/user-registration.phtml
rename to src/Views/user/user-registration.phtml
diff --git a/src/Views/user-select.phtml b/src/Views/user/user-select.phtml
similarity index 100%
rename from src/Views/user-select.phtml
rename to src/Views/user/user-select.phtml
diff --git a/src/Views/user-settings.phtml b/src/Views/user/user-settings.phtml
similarity index 100%
rename from src/Views/user-settings.phtml
rename to src/Views/user/user-settings.phtml
diff --git a/src/Views/user-view.phtml b/src/Views/user/user-view.phtml
similarity index 100%
rename from src/Views/user-view.phtml
rename to src/Views/user/user-view.phtml