diff --git a/configure.in b/configure.in
index fd7feeba..a3b05df1 100644
--- a/configure.in
+++ b/configure.in
@@ -421,7 +421,7 @@ src/fe-text/Makefile
 src/lib-config/Makefile
 src/lib-popt/Makefile
 src/perl/Makefile
-src/perl/core/Makefile.PL
+src/perl/common/Makefile.PL
 src/perl/irc/Makefile.PL
 servertest/Makefile
 scripts/Makefile
@@ -438,7 +438,7 @@ if test "x$want_perl" = "xyes"; then
 	old_dir=`pwd` && cd $srcdir && whole_dir=`pwd` && cd $old_dir
 
 	if test "x$old_dir" != "x$whole_dir"; then
-		for file in $whole_dir/src/perl/core/typemap $whole_dir/src/perl/core/module.h $whole_dir/src/perl/core/*.xs $whole_dir/src/perl/irc/typemap $whole_dir/src/perl/irc/module.h $whole_dir/src/perl/irc/*.xs; do
+		for file in $whole_dir/src/perl/common/typemap $whole_dir/src/perl/common/module.h $whole_dir/src/perl/common/*.xs $whole_dir/src/perl/irc/typemap $whole_dir/src/perl/irc/module.h $whole_dir/src/perl/irc/*.xs; do
 			ln -sf $file `echo $file|sed "s?$whole_dir/??"`
 		done
 	fi
diff --git a/src/perl/core/.cvsignore b/src/perl/common/.cvsignore
similarity index 100%
rename from src/perl/core/.cvsignore
rename to src/perl/common/.cvsignore
diff --git a/src/perl/core/Channel.xs b/src/perl/common/Channel.xs
similarity index 100%
rename from src/perl/core/Channel.xs
rename to src/perl/common/Channel.xs
diff --git a/src/perl/core/Core.xs b/src/perl/common/Core.xs
similarity index 100%
rename from src/perl/core/Core.xs
rename to src/perl/common/Core.xs
diff --git a/src/perl/core/Irssi.pm b/src/perl/common/Irssi.pm
similarity index 100%
rename from src/perl/core/Irssi.pm
rename to src/perl/common/Irssi.pm
diff --git a/src/perl/core/Irssi.xs b/src/perl/common/Irssi.xs
similarity index 100%
rename from src/perl/core/Irssi.xs
rename to src/perl/common/Irssi.xs
diff --git a/src/perl/core/Log.xs b/src/perl/common/Log.xs
similarity index 100%
rename from src/perl/core/Log.xs
rename to src/perl/common/Log.xs
diff --git a/src/perl/core/Makefile.PL.in b/src/perl/common/Makefile.PL.in
similarity index 100%
rename from src/perl/core/Makefile.PL.in
rename to src/perl/common/Makefile.PL.in
diff --git a/src/perl/core/Masks.xs b/src/perl/common/Masks.xs
similarity index 100%
rename from src/perl/core/Masks.xs
rename to src/perl/common/Masks.xs
diff --git a/src/perl/core/Query.xs b/src/perl/common/Query.xs
similarity index 100%
rename from src/perl/core/Query.xs
rename to src/perl/common/Query.xs
diff --git a/src/perl/core/Rawlog.xs b/src/perl/common/Rawlog.xs
similarity index 100%
rename from src/perl/core/Rawlog.xs
rename to src/perl/common/Rawlog.xs
diff --git a/src/perl/core/Server.xs b/src/perl/common/Server.xs
similarity index 100%
rename from src/perl/core/Server.xs
rename to src/perl/common/Server.xs
diff --git a/src/perl/core/Settings.xs b/src/perl/common/Settings.xs
similarity index 100%
rename from src/perl/core/Settings.xs
rename to src/perl/common/Settings.xs
diff --git a/src/perl/core/Window.xs b/src/perl/common/Window.xs
similarity index 100%
rename from src/perl/core/Window.xs
rename to src/perl/common/Window.xs
diff --git a/src/perl/core/module.h b/src/perl/common/module.h
similarity index 100%
rename from src/perl/core/module.h
rename to src/perl/common/module.h
diff --git a/src/perl/core/typemap b/src/perl/common/typemap
similarity index 100%
rename from src/perl/core/typemap
rename to src/perl/common/typemap