diff --git a/wp-tipsy-payment-info/ReadMe.txt b/wordpress-plugin/tipsy-payments/readme.txt
similarity index 55%
rename from wp-tipsy-payment-info/ReadMe.txt
rename to wordpress-plugin/tipsy-payments/readme.txt
index 74d827b..d062160 100755
--- a/wp-tipsy-payment-info/ReadMe.txt
+++ b/wordpress-plugin/tipsy-payments/readme.txt
@@ -1,15 +1,15 @@
-=== Plugin Name ===
-Contributors: schilippe
-Tags: code insert, head tag, tipsy
+=== Tipsy Payment Info ===
+Contributors: schilippe, geekysoft
+Tags: tipsy, monetization, micropayments, paypal, dwolla
 Requires at least: 2.1
-Tested up to: 4
-Stable tag: 2.0
+Tested up to: 4.7.2
+Stable tag: 2.1
 
-Inserts Tipsy Payment Info into head tag of wordpress webpage
+Enables micropayments from visitors with the [Tipsy browser extension](http://tipsy.csail.mit.edu/).
 
 == Description ==
 
-This plugin makes it easy for content creators to include the necessary information in their page's source so that they can be paid by Tipsy users. It opens as a simple form under the Tools menu.
+This plugin makes it easy for content creators to include the necessary information in their page's source so that they can be paid by Tipsy users. Invisible metadata with payment information is added to your pages, so Tipsy works with any and all theme.
 
 
 == Installation ==
diff --git a/wordpress-plugin/tipsy-payments/tipsy-payments.php b/wordpress-plugin/tipsy-payments/tipsy-payments.php
new file mode 100755
index 0000000..ba8fe91
--- /dev/null
+++ b/wordpress-plugin/tipsy-payments/tipsy-payments.php
@@ -0,0 +1,56 @@
+<?php
+/*
+Plugin Name: Tipsy Payment Info
+Plugin URI: http://tipsy.csail.mit.edu/
+Description: Enables micropayments from visitors with the Tipsy browser extension.
+Version: 2.1
+Author: schilippe
+License: GPL
+*/
+
+if (!defined('ABSPATH')) {
+    header('HTTP/1.1 403 Forbidden');
+    exit('HTTP/1.1 403 Forbidden');
+}
+
+add_option("tipsy_paypal_email");
+add_option("tipsy_dwolla_key");
+add_action("admin_menu" , 'tipsy_wp_admin_options_page');
+add_action("wp_head" , 'tipsy_inject');
+
+function tipsy_wp_admin_options_page(){
+	add_management_page("Tipsy Payment Info" , "Tipsy Payment Info", "administrator" , "tipsy-payments" , "tipsy_options_input");
+}
+
+function tipsy_options_input(){
+	$inputs  = "<div><h2>Insert Tipsy Payment Info</h2></br>" ;
+	$inputs .= "<form method='post' action='options.php'>" . wp_nonce_field('update-options');
+	$inputs .= "<p>Enter your PayPal email: <br><input type='email' value = '" . esc_html(get_option(tipsy_paypal_email)) . "' name='tipsy_paypal_email'/></p><br/>" ;
+	$inputs .= "<p>Enter your Dwolla key : <br> <input type='text' value =  '" . esc_html(get_option(tipsy_dwolla_key)) . "' name='tipsy_dwolla_key'/></p><br/>" ;
+	$inputs .= "<input type='submit' value='Update' /><input type='hidden' name='action' value='update' />
+				<input type='hidden' name='page_options' value='tipsy_paypal_email,tipsy_dwolla_key' /></form></div>";
+	echo $inputs;
+}
+
+function tipsy_inject($content){
+    	$ppe = esc_html(get_option(tipsy_paypal_email));
+	$dwk = esc_html(get_option(tipsy_dwolla_key));
+	
+	if ($ppe === '' && $dwk === '' ) {
+		return; 
+	}
+	$string = '<link rel="author" name="' . get_bloginfo('name') . '"';
+
+	if ($ppe !== '') {
+		$string .= ' data-paypal="' . $ppe . '"';
+	}
+
+	if ($dwk !== '') {
+		$string .= ' data-dwolla="' . $dwk . '"';
+	}
+	
+	$string .= ">\n";
+	print($string); 
+	return;
+}
+?>
diff --git a/wp-tipsy-payment-info/TipsyInjection.php b/wp-tipsy-payment-info/TipsyInjection.php
deleted file mode 100755
index c50578b..0000000
--- a/wp-tipsy-payment-info/TipsyInjection.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
-Plugin Name: Insert Tipsy Payment Info
-Plugin URI: tipsy.csail.mit.edu
-Description: Inserts Tipsy payment info into your site's head tag.
-Version: 2.0
-Author: schilippe
-License: GPL
-*/
-
-add_option("paypal_email");
-add_option("dwolla_key");
-add_action("admin_menu" , 'wp_admin_options_page');
-add_action("wp_head" , 'inject');
-
-function wp_admin_options_page(){
-	add_management_page("Insert Tipsy Info" , "Insert Tipsy Info" , "administrator" , "Tipsy-Injection" , "inputs");
-}
-
-function inputs(){
-	$inputs  = "<div><h2>Insert Tipsy Payment Info</h2></br>" ;
-	$inputs .= "<form method='post' action='options.php'>" . wp_nonce_field('update-options');
-	$inputs .= "<p>Enter your PayPal email: <br><input type='email' value = '" . get_option(paypal_email) . "' name= 'paypal_email'/></input></p><br/>" ;
-	$inputs .= "<p>Enter your Dwolla key : <br> <input type='text' value =  '" . get_option(dwolla_key) . "' name= 'dwolla_key'/></input></p><br/>" ;
-	$inputs .= "<input type='submit' value='Update' /><input type='hidden' name='action' value='update' />
-				<input type='hidden' name='page_options' value='paypal_email, dwolla_key' /></form></div>"; 
-	echo $inputs;
-}
-
-function inject($content){
-    	$ppe = get_option(paypal_email);
-	$dwk = get_option(dwolla_key);
-	
-	if ($ppe === '' && $dwk === '' ) {
-		return; 
-	}
-	$string = "<link rel='author' name='Tipsy'";
-
-	if ($ppe !== '') {
-		$string .= " data-paypal='".$ppe . "'";
-	}
-
-	if ($dwk !== '') {
-		$string .= " data-dwolla='".$dwk . "'";
-	}
-	
-	$string .= ">\n";
-	echo $string; 
-	return;
-}
-?>