diff --git a/go-form-plugin/export/mcmahon.php b/go-form-plugin/export/mcmahon.php
index ef588e9..5ba9873 100644
--- a/go-form-plugin/export/mcmahon.php
+++ b/go-form-plugin/export/mcmahon.php
@@ -21,7 +21,7 @@ fwrite($output, $mcmahonfirst);
 
 foreach ($entries as $i => $e) {
   $rank = $ranks[$e->rank];
-  $id = $e->i + 1;
+  $id = $i + 1;
   $egd = (strlen($e->egd_number) == 0) ? '0' : $e->egd_number;
   $out = "  <IndividualParticipant typeversion=\"1\">
     <Id>$id</Id>
diff --git a/go-form-plugin/go-form-plugin.php b/go-form-plugin/go-form-plugin.php
index b794c95..5d5b101 100644
--- a/go-form-plugin/go-form-plugin.php
+++ b/go-form-plugin/go-form-plugin.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Plugin Name: Go Form Plugin
- * Description: Form plugin for Go players
- * Version: 0.03
- * Author: Nikola Petrov
- */
 
 if (!defined('ABSPATH'))
   exit;
@@ -42,7 +36,6 @@ function go_form_activate()
         FOREIGN KEY (form_id) REFERENCES $forms(id) ON DELETE CASCADE
     ) $charset;");
 }
-register_activation_hook(__FILE__, 'go_form_activate');
 
 function go_form_uninstall()
 {
@@ -50,8 +43,6 @@ function go_form_uninstall()
   $wpdb->query("DROP TABLE IF EXISTS {$wpdb->prefix}go_form_entries");
   $wpdb->query("DROP TABLE IF EXISTS {$wpdb->prefix}go_form_forms");
 }
-register_uninstall_hook(__FILE__, 'go_form_uninstall');
-//register_deactivation_hook(__FILE__, 'go_form_uninstall');
 // ========== Helpers ==========
 $ranks = [
         0 => '30k', 1 => '29k', 2 => '28k', 3 => '27k', 4 => '26k',
diff --git a/main.php b/main.php
new file mode 100644
index 0000000..203eb21
--- /dev/null
+++ b/main.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Plugin Name: Go Form Plugin
+ * Description: Form plugin for Go players
+ * Version: 0.04
+ * Author: Nikola Petrov
+ */
+
+if (!defined('ABSPATH'))
+  exit;
+
+// Load plugin code
+require_once plugin_dir_path(__FILE__) . 'go-form-plugin/go-form-plugin.php';
+
+register_activation_hook(__FILE__, 'go_form_activate');
+
+register_uninstall_hook(__FILE__, 'go_form_uninstall');
+//register_deactivation_hook(__FILE__, 'go_form_uninstall');
\ No newline at end of file
diff --git a/scripts/zip.sh b/scripts/zip.sh
index 96ac148..134a1e1 100755
--- a/scripts/zip.sh
+++ b/scripts/zip.sh
@@ -1,2 +1,3 @@
+cd ..
 rm go-form-plugin.zip
-zip -r go-form-plugin.zip go-form-plugin/*
+zip -r go-form-plugin.zip go-form-plugin/* main.php