diff --git a/bin/buildmod b/bin/buildmod
index a0069e6..c7e08da 100755
--- a/bin/buildmod
+++ b/bin/buildmod
@@ -21,13 +21,13 @@ my $module = $ARGV[0];
 # Set full path.
 my $type = 0;
 my $modulep;
-if (-e "$Bin/../modules/$module.pm") {
-    $modulep = "$Bin/../modules/$module.pm";
+if (-e "$Bin/../modules/src/$module.pm") {
+    $modulep = "$Bin/../modules/src/$module.pm";
     $type = 1;
 }
 else {
-    if (-e "$Bin/../modules/$module/Buildfile") {
-        $modulep = "$Bin/../modules/$module/Buildfile";
+    if (-e "$Bin/../modules/src/$module/Buildfile") {
+        $modulep = "$Bin/../modules/src/$module/Buildfile";
         $type = 2;
     }
     else {
@@ -117,6 +117,7 @@ foreach my $line (<$FHBM>) {
 }
 close $FHBM;
 
+$modulep =~ s/src\///g;
 open $FHBM, '>', $modulep;
 print {$FHBM} $db;
 close $FHBM;
diff --git a/modules/Badwords.pm b/modules/src/Badwords.pm
similarity index 100%
rename from modules/Badwords.pm
rename to modules/src/Badwords.pm
diff --git a/modules/Bitly.pm b/modules/src/Bitly.pm
similarity index 100%
rename from modules/Bitly.pm
rename to modules/src/Bitly.pm
diff --git a/modules/Calc.pm b/modules/src/Calc.pm
similarity index 100%
rename from modules/Calc.pm
rename to modules/src/Calc.pm
diff --git a/modules/EightBall.pm b/modules/src/EightBall.pm
similarity index 100%
rename from modules/EightBall.pm
rename to modules/src/EightBall.pm
diff --git a/modules/FML.pm b/modules/src/FML.pm
similarity index 100%
rename from modules/FML.pm
rename to modules/src/FML.pm
diff --git a/modules/HelloChan.pm b/modules/src/HelloChan.pm
similarity index 100%
rename from modules/HelloChan.pm
rename to modules/src/HelloChan.pm
diff --git a/modules/IsItUp.pm b/modules/src/IsItUp.pm
similarity index 100%
rename from modules/IsItUp.pm
rename to modules/src/IsItUp.pm
diff --git a/modules/QDB.pm b/modules/src/QDB.pm
similarity index 100%
rename from modules/QDB.pm
rename to modules/src/QDB.pm
diff --git a/modules/SASLAuth.pm b/modules/src/SASLAuth.pm
similarity index 100%
rename from modules/SASLAuth.pm
rename to modules/src/SASLAuth.pm
diff --git a/modules/Weather.pm b/modules/src/Weather.pm
similarity index 100%
rename from modules/Weather.pm
rename to modules/src/Weather.pm