diff --git a/plugin-name/trunk/includes/class-plugin-name-activate.php b/plugin-name/trunk/includes/class-plugin-name-activate.php
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin-name/trunk/includes/class-plugin-name-activator.php b/plugin-name/trunk/includes/class-plugin-name-activator.php
new file mode 100644
index 0000000..0a7cb31
--- /dev/null
+++ b/plugin-name/trunk/includes/class-plugin-name-activator.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @TODO: Short description (no period for file headers)
+ *
+ * @TODO: Long description.
+ *
+ * @package   Plugin_Name
+ * @author    Your Name <email@example.com>
+ * @license   GPL-2.0+
+ * @link      http://example.com
+ * @copyright 2014 Your Name or Company Name
+ */
+class Plugin_Name_Activator {
+
+	/**
+	 * @TODO: Short description. (use period)
+	 *
+	 * @TODO: Long description.
+	 *
+	 * @since x.x.x
+	 *
+	 * @param type $var Description.
+	 * @param array $args {
+	 *     Short description about this hash.
+	 *
+	 *     @type type $var Description.
+	 *     @type type $var Description.
+	 * }
+	 * @param type $var Description.
+	 */
+	public static function activate() {
+
+	}
+
+}
\ No newline at end of file
diff --git a/plugin-name/trunk/includes/class-plugin-name-deactivate.php b/plugin-name/trunk/includes/class-plugin-name-deactivate.php
deleted file mode 100644
index e69de29..0000000
diff --git a/plugin-name/trunk/includes/class-plugin-name-deactivator.php b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
new file mode 100644
index 0000000..d9d8a06
--- /dev/null
+++ b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @TODO: Short description (no period for file headers)
+ *
+ * @TODO: Long description.
+ *
+ * @package   Plugin_Name
+ * @author    Your Name <email@example.com>
+ * @license   GPL-2.0+
+ * @link      http://example.com
+ * @copyright 2014 Your Name or Company Name
+ */
+class Plugin_Name_Deactivator {
+
+	/**
+	 * @TODO: Short description. (use period)
+	 *
+	 * @TODO: Long description.
+	 *
+	 * @since x.x.x
+	 *
+	 * @param type $var Description.
+	 * @param array $args {
+	 *     Short description about this hash.
+	 *
+	 *     @type type $var Description.
+	 *     @type type $var Description.
+	 * }
+	 * @param type $var Description.
+	 */
+	public static function deactivate() {
+
+	}
+
+}
\ No newline at end of file