diff --git a/adult_smile/adult_smile.php b/adult_smile/adult_smile.php
deleted file mode 100644
index 46574143..00000000
--- a/adult_smile/adult_smile.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- * Name: Adult Smilies
- * Description: Smily icons that could or should not be included in core
- * Version: 1.0
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
- * This is a template for how to extend the "smily" code.
- * 
- */
-
-function adult_smile_install() {
-	register_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
-}
-
-function adult_smile_uninstall() {
-	unregister_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
-}
-
- 
-
-function adult_smile_smilies(&$a,&$b) {
-
-	$b['texts'][] = '(o)(o)';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
-
-	$b['texts'][] = '(.)(.)';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
-
-	$b['texts'][] = ':bong';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/bong.gif' . '" alt="' . ':bong' . '" />';
-
-
-}
\ No newline at end of file
diff --git a/smiley_pack/icons/disgust/fart.gif b/smiley_pack/icons/disgust/fart.gif
deleted file mode 100644
index 4160a1fc..00000000
Binary files a/smiley_pack/icons/disgust/fart.gif and /dev/null differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index d85f9b5e..7f4bfb7b 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -13,7 +13,7 @@ function smiley_pack_install() {
 	register_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
-function smiley_pack__uninstall() {
+function smiley_pack_uninstall() {
 	unregister_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
diff --git a/adult_smile/icons/bong.gif b/smilies-adult/icons/bong.gif
similarity index 100%
rename from adult_smile/icons/bong.gif
rename to smilies-adult/icons/bong.gif
diff --git a/adult_smile/icons/drunk.gif b/smilies-adult/icons/drunk.gif
similarity index 100%
rename from adult_smile/icons/drunk.gif
rename to smilies-adult/icons/drunk.gif
diff --git a/adult_smile/icons/sperm.gif b/smilies-adult/icons/sperm.gif
similarity index 100%
rename from adult_smile/icons/sperm.gif
rename to smilies-adult/icons/sperm.gif
diff --git a/adult_smile/icons/tits.gif b/smilies-adult/icons/tits.gif
similarity index 100%
rename from adult_smile/icons/tits.gif
rename to smilies-adult/icons/tits.gif
diff --git a/smilies-adult/smilies-adult.php b/smilies-adult/smilies-adult.php
new file mode 100644
index 00000000..f48bdd29
--- /dev/null
+++ b/smilies-adult/smilies-adult.php
@@ -0,0 +1,38 @@
+<?php
+/*
+ * Name: Adult Smilies
+ * Description: Smily icons that could or should not be included in core
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * 
+ * This is a template for how to extend the "smily" code.
+ * 
+ */
+
+function adult_smile_install() {
+	register_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
+}
+
+function adult_smile_uninstall() {
+	unregister_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
+}
+
+ 
+
+function adult_smile_smilies(&$a,&$b) {
+
+	$b['texts'][] = '(o)(o)';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
+
+	$b['texts'][] = '(.)(.)';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
+
+	$b['texts'][] = ':bong';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
+
+	$b['texts'][] = ':sperm';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
+
+	$b['texts'][] = ':drunk';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smilies-adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
+}
\ No newline at end of file