diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85e7c1d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.idea/
diff --git a/class/class.cnv_protection_txt.php b/class/class.cnv_protection_txt.php
new file mode 100644
index 0000000..1dbcc83
--- /dev/null
+++ b/class/class.cnv_protection_txt.php
@@ -0,0 +1,80 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} // Exit if accessed directly
+
+if ( ! class_exists( 'cnv_protection_txt' ) ) {
+
+	class cnv_protection_txt {
+
+		public function __construct() {
+			add_action( 'admin_menu', array( $this, 'add_pages' ) );
+			add_filter( 'protected_title_format', array( $this, 'edit_protected_word' ) );
+			add_filter( 'the_password_form', array( $this, 'protect_password_form' ) );
+		}
+
+		public function add_pages() {
+			add_menu_page(
+				'アクセス権限ページ設定',
+				'アクセス権限ページ設定',
+				'level_8',
+				__FILE__,
+				array(
+					$this,
+					'show_text_option_page'
+				)
+			);
+		}
+
+		public function show_text_option_page() {
+			$update_option = filter_input( INPUT_POST, '_cnv_protect_options', FILTER_SANITIZE_STRING, FILTER_REQUIRE_ARRAY );
+			if ( ! empty( $update_option ) ) {
+				check_admin_referer( 'cnv_options' );
+				update_option( '_cnv_protect_options', $update_option );
+				include_once cnv_protection_txt_settings::TEMPLATE_DIR . 'success.php';
+			}
+			include_once cnv_protection_txt_settings::TEMPLATE_DIR . 'cnv_protection_txt_form.php';
+		}
+
+		public function edit_protected_word( $text ) {
+			$opt = get_option( '_cnv_protect_options' );
+			if ( isset( $opt['flag'] ) && $opt['flag'] == 2 ) {
+				return '%s';
+			}
+
+			return $text;
+		}
+
+		//パスワード保護時のメッセージ
+		public function protect_password_form( $form_text ): string {
+			$opt = get_option( '_cnv_protect_options' );
+			if ( isset( $opt['text'] ) && ! empty( $opt['text'] ) ) {
+				$alert_text = $opt['text'];
+			} else {
+				$alert_text = cnv_protection_txt_settings::ALERT_TEXT;
+			}
+			if ( isset( $opt['label'] ) && ! empty( $opt['label'] ) ) {
+				$btn_label = $opt['label'] . ' : ';
+			} else {
+				$btn_label = cnv_protection_txt_settings::BTN_LABEL . ' : ';
+			}
+			if ( isset( $opt['btn'] ) && ! empty( $opt['btn'] ) ) {
+				$btn_text = $opt['btn'];
+			} else {
+				$btn_text = cnv_protection_txt_settings::BTN_TEXT;
+			}
+
+			return '
+			<form action="' . wp_login_url() . '?action=postpass" class="post-password-form" method="post">
+			<p>' . nl2br( esc_html( $alert_text ) ) . '</p>
+			<p>
+				<label for="pwbox">' . esc_html( $btn_label ) .
+			       '<input name="post_password" id="pwbox" type="password" size="20">
+				</label>
+				<input type="submit" name="Submit" value="' . esc_attr( $btn_text ) . '">
+			</p>
+			</form>';
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/class/cnv_protection_txt_settings.php b/class/cnv_protection_txt_settings.php
new file mode 100644
index 0000000..7aa4309
--- /dev/null
+++ b/class/cnv_protection_txt_settings.php
@@ -0,0 +1,18 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} // Exit if accessed directly
+
+if ( ! class_exists( 'cnv_protection_txt_settings' ) ) {
+
+	class cnv_protection_txt_settings{
+
+		const ALERT_TEXT = 'このコンテンツはパスワードで保護されています。閲覧するには以下にパスワードを入力してください。';
+		const BTN_LABEL = 'パスワード';
+		const BTN_TEXT = '確定';
+		const TEMPLATE_DIR = __DIR__ . '/../template/';
+
+	}
+
+}
diff --git a/convert-protection-text.php b/convert-protection-text.php
index cc82204..7b6ba41 100644
--- a/convert-protection-text.php
+++ b/convert-protection-text.php
@@ -10,129 +10,7 @@ Author URI: http://URI_Of_The_Plugin_Author
 License: A "Slug" license name e.g. GPL2
 */
 
-class CNV_Protection_Text {
+include_once __DIR__ . '/class/cnv_protection_txt_settings.php';
+include_once __DIR__ . '/class/class.cnv_protection_txt.php';
 
-	const ALERT_TEXT = 'このコンテンツはパスワードで保護されています。閲覧するには以下にパスワードを入力してください。';
-	const BTN_LABEL = 'パスワード';
-	const BTN_TEXT = '確定';
-
-	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'add_pages' ) );
-		add_filter( 'protected_title_format', array( $this, 'edit_protected_word' ) );
-		add_filter( 'the_password_form', array( $this, 'my_password_form' ) );
-	}
-
-	public function add_pages() {
-		add_menu_page( 'アクセス権限ページ設定', 'アクセス権限ページ設定', 'level_8', __FILE__, array(
-			$this,
-			'show_text_option_page'
-		), '', 90 );
-	}
-
-	public function show_text_option_page() {
-		$update_option = filter_input( INPUT_POST, '_cnv_protect_options', FILTER_SANITIZE_STRING, FILTER_REQUIRE_ARRAY );
-		if ( ! empty( $update_option ) ) {
-			check_admin_referer( 'cnv_options' );
-			update_option( '_cnv_protect_options', $update_option );
-			?>
-            <div id="settings_updated" class="updated notice is-dismissible">
-                <p><strong>設定を保存しました</strong></p>
-            </div><?php
-		}
-		?>
-        <div class="wrap">
-            <div id="icon-options-general" class="icon32"><br/></div>
-            <h2>アクセス権限ページ設定</h2>
-            <form action="" method="post">
-				<?php
-				wp_nonce_field( 'cnv_options' );
-				$opt        = get_option( '_cnv_protect_options' );
-				$show_radio = $opt['flag'] ?? 1;
-				$show_text  = $opt['text'] ?? self::ALERT_TEXT;
-				$show_label = $opt['label'] ?? self::BTN_LABEL;
-				$show_btn   = $opt['btn'] ?? self::BTN_TEXT;
-				?>
-                <table class="form-table">
-                    <tr valign="top">
-                        <th scope="row"><label for="inputtext">保護中</label></th>
-                        <td>
-							<?php if ( $show_radio == 2 ) : ?>
-                                <label>
-                                    <input type="radio" name="_cnv_protect_options[flag]" value="1">表示
-                                </label>
-                                <label>
-                                    <input type="radio" name="_cnv_protect_options[flag]" value="2" checked>非表示
-                                </label>
-							<?php elseif ( $show_radio == 1 ): ?>
-                                <label>
-                                    <input type="radio" name="_cnv_protect_options[flag]" value="1" checked>表示
-                                </label>
-                                <label>
-                                    <input type="radio" name="_cnv_protect_options[flag]" value="2">非表示
-                                </label>
-							<?php endif; ?>
-                        </td>
-                    </tr>
-                    <tr valign="top">
-                        <th scope="row">メッセージ</th>
-                        <td>
-                            <textarea name="_cnv_protect_options[text]" rows="4"
-                                      cols="60"><?php echo esc_attr( $show_text ); ?></textarea>
-                        </td>
-                    </tr>
-                    <tr valign="top">
-                        <th scope="row">ボタンラベル</th>
-                        <td>
-                            <input type="text" name="_cnv_protect_options[label]"
-                                   value="<?php echo esc_attr( $show_label ); ?>">
-                        </td>
-                    </tr>
-                    <tr valign="top">
-                        <th scope="row">ボタン名</th>
-                        <td>
-                            <input type="text" name="_cnv_protect_options[btn]"
-                                   value="<?php echo esc_attr( $show_btn ); ?>">
-                        </td>
-                    </tr>
-                </table>
-                <p class="submit"><input type="submit" name="Submit" class="button-primary" value="変更を保存"/></p>
-            </form>
-            <!-- /.wrap --></div>
-		<?php
-	}
-
-	public function edit_protected_word( $text ) {
-		$opt = get_option( '_cnv_protect_options' );
-		if ( isset( $opt['flag'] ) && $opt['flag'] == 2 ) {
-			return '%s';
-		}
-
-		return $text;
-	}
-
-	//パスワード保護時のメッセージ
-	public function my_password_form( $form_text ): string {
-		$opt = get_option( '_cnv_protect_options' );
-		if ( isset( $opt['text'] ) && ! empty( $opt['text'] ) ) {
-			$alert_text = $opt['text'];
-		} else {
-			$alert_text = self::ALERT_TEXT;
-		}
-		if ( isset( $opt['label'] ) && ! empty( $opt['label'] ) ) {
-			$btn_label = $opt['label'] . ' : ';
-		} else {
-			$btn_label = self::BTN_LABEL . ' : ';
-		}
-		if ( isset( $opt['btn'] ) && ! empty( $opt['btn'] ) ) {
-			$btn_text = $opt['btn'];
-		} else {
-			$btn_text = self::BTN_TEXT;
-		}
-
-		return '<form action="' . home_url() . '/wp-login.php?action=postpass" class="post-password-form" method="post">
-<p>' . nl2br( esc_html( $alert_text ) ) . '</p>
-<p><label for="pwbox">' . esc_html( $btn_label ) . '<input name="post_password" id="pwbox" type="password" size="20"></label> <input type="submit" name="Submit" value="' . esc_attr( $btn_text ) . '"></p></form>';
-	}
-}
-
-new CNV_Protection_Text;
\ No newline at end of file
+new cnv_protection_txt;
\ No newline at end of file
diff --git a/template/cnv_protection_txt_form.php b/template/cnv_protection_txt_form.php
new file mode 100644
index 0000000..01e27d7
--- /dev/null
+++ b/template/cnv_protection_txt_form.php
@@ -0,0 +1,57 @@
+<div class="wrap">
+    <h2>アクセス権限ページ設定</h2>
+    <form action="" method="post">
+		<?php
+		wp_nonce_field( 'cnv_options' );
+		$opt        = get_option( '_cnv_protect_options' );
+		$show_radio = $opt['flag'] ?? 1;
+		$show_text  = $opt['text'] ?? cnv_protection_txt_settings::ALERT_TEXT;
+		$show_label = $opt['label'] ?? cnv_protection_txt_settings::BTN_LABEL;
+		$show_btn   = $opt['btn'] ?? cnv_protection_txt_settings::BTN_TEXT;
+		?>
+        <table class="form-table">
+            <tr valign="top">
+                <th scope="row"><label for="inputtext">保護中</label></th>
+                <td>
+					<?php if ( $show_radio == 2 ) : ?>
+                        <label>
+                            <input type="radio" name="_cnv_protect_options[flag]" value="1">表示
+                        </label>
+                        <label>
+                            <input type="radio" name="_cnv_protect_options[flag]" value="2" checked>非表示
+                        </label>
+					<?php elseif ( $show_radio == 1 ): ?>
+                        <label>
+                            <input type="radio" name="_cnv_protect_options[flag]" value="1" checked>表示
+                        </label>
+                        <label>
+                            <input type="radio" name="_cnv_protect_options[flag]" value="2">非表示
+                        </label>
+					<?php endif; ?>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">メッセージ</th>
+                <td>
+                    <textarea name="_cnv_protect_options[text]" rows="4"
+                              cols="60"><?php echo esc_attr( $show_text ); ?></textarea>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">ボタンラベル</th>
+                <td>
+                    <input type="text" name="_cnv_protect_options[label]"
+                           value="<?php echo esc_attr( $show_label ); ?>">
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">ボタン名</th>
+                <td>
+                    <input type="text" name="_cnv_protect_options[btn]"
+                           value="<?php echo esc_attr( $show_btn ); ?>">
+                </td>
+            </tr>
+        </table>
+        <p class="submit"><input type="submit" name="Submit" class="button-primary" value="変更を保存"/></p>
+    </form>
+</div>
\ No newline at end of file
diff --git a/template/success.php b/template/success.php
new file mode 100644
index 0000000..c91135f
--- /dev/null
+++ b/template/success.php
@@ -0,0 +1 @@
+<div id="settings_updated" class="updated notice is-dismissible"><p><strong>設定を保存しました</strong></p></div>