diff --git a/app/setup/password-form.php b/app/setup/password-form.php
index fd773926..b5fc5b10 100644
--- a/app/setup/password-form.php
+++ b/app/setup/password-form.php
@@ -22,21 +22,7 @@ public function __construct() {
 	 */
 	public function password_form( $output ) {
 		ob_start();
-		?>
-		<form action="<?php echo esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ); ?>" class="post-password-form" method="post">
-			<p>
-				<?php esc_html_e( 'This content is password protected. To view it please enter your password below:', 'mimizuku' ); ?>
-			</p>
-			<div class="_c-input-group">
-				<div class="_c-input-group__addon">
-					<?php esc_html_e( 'Password:', 'mimizuku' ); ?>
-				</div>
-				<div class="_c-input-group__field">
-					<input class="_c-input-group__control" name="post_password" type="password" size="20" />
-				</div><input class="_c-input-group__btn" type="submit" name="Submit" value="<?php echo esc_attr_x( 'Enter', 'post password form', 'mimizuku' ); ?>" />
-			</div>
-		</form>
-		<?php
+		get_template_part( 'template-parts/password-form' );
 		$output = ob_get_clean();
 		$output = str_replace( [ "\n", "\r", "\n\r", "\t" ], '', $output );
 		return $output;
diff --git a/app/tags/get-template-part.php b/app/tags/get-template-part.php
index 5f8c0827..798402eb 100644
--- a/app/tags/get-template-part.php
+++ b/app/tags/get-template-part.php
@@ -15,7 +15,7 @@
  * @return void
  */
 function get_template_part( $template, $vars = [] ) {
-	$template_part = new \Mimizuku\Template_Part( $template );
+	$template_part = new \Mimizuku\App\Models\Template_Part( $template );
 	$template_part->set_vars( $vars );
 	$template_part->render();
 }
diff --git a/app/tags/the-comments.php b/app/tags/the-comments.php
index cbfe9df7..ec1b854d 100644
--- a/app/tags/the-comments.php
+++ b/app/tags/the-comments.php
@@ -18,46 +18,12 @@
 function the_comments( $comment, $args, $depth ) {
 	?>
 	<li <?php comment_class( [ '_p-comments__item' ] ); ?> id="li-comment-<?php comment_ID() ?>">
-		<div class="_p-comment" id="comment-<?php comment_ID(); ?>">
-			<div class="_p-comment__figure">
-				<?php echo get_avatar( $comment, '48' ); ?>
-			</div>
-			<div class="_p-comment__body">
-				<?php if ( 0 === $comment->comment_approved ) : ?>
-				<em><?php esc_html_e( 'Your comment is awaiting moderation.', 'mimizuku' ) ?></em>
-				<?php endif; ?>
-				<div class="_p-comment__meta">
-					<?php
-					$author = sprintf( '<cite>%s</cite>', get_comment_author_link() );
-					$date   = get_comment_date();
-					$time   = get_comment_time();
-					printf(
-						esc_html__( '%1$s said on %2$s at %3$s', 'mimizuku' ),
-						wp_kses_post( $author ),
-						wp_kses_post( $date ),
-						wp_kses_post( $time )
-					);
-					edit_comment_link( 'edit', '  ', '' );
-					?>
-				</div>
-
-				<div class="_p-comment__content">
-					<?php comment_text() ?>
-				</div>
-
-				<?php
-				$args = array_merge( $args, [
-					'depth'     => $depth,
-					'max_depth' => $args['max_depth'],
-				] );
-				?>
-
-				<?php if ( ! empty( get_comment_reply_link( $args ) ) ) : ?>
-				<div class="_p-comment__reply">
-					<?php comment_reply_link( $args ); ?>
-				</div>
-				<?php endif; ?>
-			</div>
-		</div>
+		<?php
+		\Mimizuku\App\Tags\get_template_part( 'template-parts/comment', [
+			'_comment' => $comment,
+			'_args'    => $args,
+			'_depth'   => $depth,
+		] );
+		?>
 	<?php
 }
diff --git a/app/tags/the-pings.php b/app/tags/the-pings.php
index 9feb4bc6..e365bbce 100644
--- a/app/tags/the-pings.php
+++ b/app/tags/the-pings.php
@@ -15,24 +15,6 @@
 function the_pings() {
 	?>
 	<li <?php comment_class( [ '_c-trackbacks__item' ] ); ?> id="li-comment-<?php comment_ID() ?>">
-		<dl class="_p-trackback" id="comment-<?php comment_ID(); ?>">
-			<dt class="_p-trackback__meta">
-				<?php
-				$author = sprintf( '<cite>%s</cite>', get_comment_author_link() );
-				$date   = get_comment_date();
-				$time   = get_comment_time();
-				printf(
-					esc_html__( '%1$s said on %2$s at %3$s', 'mimizuku' ),
-					wp_kses_post( $author ),
-					wp_kses_post( $date ),
-					wp_kses_post( $time )
-				);
-				edit_comment_link( 'edit', '  ', '' );
-				?>
-			</dt>
-			<dd class="_p-trackback__body">
-				<?php comment_text() ?>
-			</dd>
-		</dl>
+		<?php \Mimizuku\App\Tags\get_template_part( 'template-parts/trackback' ); ?>
 	<?php
 }
diff --git a/template-parts/comment.php b/template-parts/comment.php
new file mode 100644
index 00000000..dff24240
--- /dev/null
+++ b/template-parts/comment.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package mimizuku
+ * @author inc2734
+ * @license GPL-2.0+
+ */
+?>
+<div class="_p-comment" id="comment-<?php comment_ID(); ?>">
+	<div class="_p-comment__figure">
+		<?php echo get_avatar( $_comment, '48' ); ?>
+	</div>
+	<div class="_p-comment__body">
+		<?php if ( 0 === $_comment->comment_approved ) : ?>
+		<em><?php esc_html_e( 'Your comment is awaiting moderation.', 'mimizuku' ) ?></em>
+		<?php endif; ?>
+		<div class="_p-comment__meta">
+			<?php
+			$author = sprintf( '<cite>%s</cite>', get_comment_author_link() );
+			$date   = get_comment_date();
+			$time   = get_comment_time();
+			printf(
+				esc_html__( '%1$s said on %2$s at %3$s', 'mimizuku' ),
+				wp_kses_post( $author ),
+				wp_kses_post( $date ),
+				wp_kses_post( $time )
+			);
+			edit_comment_link( 'edit', '  ', '' );
+			?>
+		</div>
+
+		<div class="_p-comment__content">
+			<?php comment_text() ?>
+		</div>
+
+		<?php
+		$args = array_merge( $_args, [
+			'depth'     => $_depth,
+			'max_depth' => $_args['max_depth'],
+		] );
+		?>
+
+		<?php if ( ! empty( get_comment_reply_link( $args ) ) ) : ?>
+		<div class="_p-comment__reply">
+			<?php comment_reply_link( $args ); ?>
+		</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/template-parts/password-form.php b/template-parts/password-form.php
new file mode 100644
index 00000000..fbc1d3c6
--- /dev/null
+++ b/template-parts/password-form.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package mimizuku
+ * @author inc2734
+ * @license GPL-2.0+
+ */
+?>
+<form action="<?php echo esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ); ?>" class="post-password-form" method="post">
+	<p>
+		<?php esc_html_e( 'This content is password protected. To view it please enter your password below:', 'mimizuku' ); ?>
+	</p>
+	<div class="_c-input-group">
+		<div class="_c-input-group__addon">
+			<?php esc_html_e( 'Password:', 'mimizuku' ); ?>
+		</div>
+		<div class="_c-input-group__field">
+			<input class="_c-input-group__control" name="post_password" type="password" size="20" />
+		</div><input class="_c-input-group__btn" type="submit" name="Submit" value="<?php echo esc_attr_x( 'Enter', 'post password form', 'mimizuku' ); ?>" />
+	</div>
+</form>
diff --git a/template-parts/trackback.php b/template-parts/trackback.php
new file mode 100644
index 00000000..d854a2f7
--- /dev/null
+++ b/template-parts/trackback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package mimizuku
+ * @author inc2734
+ * @license GPL-2.0+
+ */
+?>
+<dl class="_p-trackback" id="comment-<?php comment_ID(); ?>">
+	<dt class="_p-trackback__meta">
+		<?php
+		$author = sprintf( '<cite>%s</cite>', get_comment_author_link() );
+		$date   = get_comment_date();
+		$time   = get_comment_time();
+		printf(
+			esc_html__( '%1$s said on %2$s at %3$s', 'mimizuku' ),
+			wp_kses_post( $author ),
+			wp_kses_post( $date ),
+			wp_kses_post( $time )
+		);
+		edit_comment_link( 'edit', '  ', '' );
+		?>
+	</dt>
+	<dd class="_p-trackback__body">
+		<?php comment_text() ?>
+	</dd>
+</dl>