diff --git a/debian/changelog b/debian/changelog
index 1de1b74..697b312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ubuntu-dev-tools (0.60) UNRELEASED; urgency=low
 
-  * Changes go here.
+  * ubuntutools/common.py: Now split into multiple files depending on
+    function.
+  * Adjusted imports on all files as necessary for the change above.
 
- -- Loic Minier <lool@dooz.org>  Mon, 19 Jan 2009 18:13:18 +0100
+ -- Jonathan Davies <jpds@ubuntu.com>  Mon, 19 Jan 2009 18:00:15 +0000
 
 ubuntu-dev-tools (0.59) jaunty; urgency=low
 
diff --git a/grab-attachments b/grab-attachments
index ab4dd96..368130d 100755
--- a/grab-attachments
+++ b/grab-attachments
@@ -20,7 +20,7 @@
 
 import os
 import sys
-from ubuntutools.common import get_launchpad
+from ubuntutools.lplibsupport import get_launchpad
 
 USAGE = "grab-attachments <bug numbers>"
 
diff --git a/hugdaylist b/hugdaylist
index 55a44a8..d761893 100755
--- a/hugdaylist
+++ b/hugdaylist
@@ -35,7 +35,7 @@ import string
 import sys
 from optparse import OptionParser
 
-from ubuntutools.common import get_launchpad, translate_web_api, translate_api_web
+from ubuntutools.lplibsupport import get_launchpad, translate_web_api, translate_api_web
 
 def check_args():
     howmany = -1
diff --git a/lp-set-dup b/lp-set-dup
index d64f8bb..c2efea0 100755
--- a/lp-set-dup
+++ b/lp-set-dup
@@ -25,7 +25,7 @@
 import os, sys
 from optparse import OptionParser
 
-from ubuntutools import common
+from ubuntutools import lplibsupport
 
 def die(message):
     print >> sys.stderr, "Fatal: " + message
@@ -46,7 +46,7 @@ if __name__ == '__main__':
     launchpad = None
     try:
         print "Setting up Launchpad"
-        launchpad = common.get_launchpad("ubuntu-dev-tools")
+        launchpad = lplibsupport.get_launchpad("ubuntu-dev-tools")
         print "Launchpad setup complete"
     except ImportError:
         suggestion = "check whether python-launchpadlib is installed"
diff --git a/massfile b/massfile
index 1e34af7..8ba3db4 100755
--- a/massfile
+++ b/massfile
@@ -6,6 +6,8 @@
 # Modified by Iain Lane <iain@orangesquash.org.uk>, taking some code written by
 # Daniel Hahler <ubuntu@thequod.de>
 #
+# python-launchpadlib support was added by Markus Korn <thekorn@gmx.de>.
+#
 # ##################################################################
 #
 # This program is free software; you can redistribute it and/or
@@ -27,7 +29,7 @@ import email
 import subprocess
 import glob
 
-from ubuntutools.common import get_launchpad, translate_api_web, translate_web_api
+from ubuntutools.lplibsupport import get_launchpad, translate_api_web, translate_web_api
 
 def read_config():
     instructions_file = open("instructions")
diff --git a/pull-lp-source b/pull-lp-source
index 2aa2cab..a22625b 100755
--- a/pull-lp-source
+++ b/pull-lp-source
@@ -33,7 +33,7 @@ import urllib2
 from optparse import OptionParser
 
 # Ubuntu-dev-tools modules.
-from ubuntutools import common
+from ubuntutools import packages
 
 class BackportFromLP:
 
@@ -65,10 +65,7 @@ if __name__ == '__main__':
     optParser = OptionParser(usage)
     (options, args) = optParser.parse_args()
     
-    if not args:
-        print >> sys.stderr, "Need arguments."
-        optParser.print_help()
-        sys.exit(1)
+    if not args: optParser.error("Arguments required.")
     
     package = str(args[0]).lower()
 
@@ -79,10 +76,10 @@ if __name__ == '__main__':
 
     # Correct-ish args, can proceed.
     # Check release by checking if Launchpad page exists
-    common.checkReleaseExists(release)
+    packages.checkReleaseExists(release)
 
     # Check package exists.
-    common.checkSourceExists(package, release)
+    packages.checkSourceExists(package, release)
 
     # All good - start downloading...
     try:
diff --git a/requestsync b/requestsync
index 82c56cb..408b060 100755
--- a/requestsync
+++ b/requestsync
@@ -35,9 +35,13 @@ from debian_bundle.changelog import Version
 from optparse import OptionParser
 from time import sleep
 
-from ubuntutools import common
+# ubuntu-dev-tools modules.
+from ubuntutools import lpcookie
+from ubuntutools import lplibfunctions
+from ubuntutools import lplibsupport
+from ubuntutools import lpurlopener
     
-launchpad_cookiefile = common.prepareLaunchpadCookie()
+launchpad_cookiefile = lpcookie.prepareLaunchpadCookie()
 
 def checkNeedsSponsorship(component):
     """
@@ -58,7 +62,7 @@ def checkNeedsSponsorship(component):
     #  >>> me = launchpad.me
     #  >>> me.inTeam(<TEAM>)  #or
     #  >>> me in <TEAM>
-    urlopener = common.setupLaunchpadUrlOpener(launchpad_cookiefile)
+    urlopener = lpurlopener.setupLaunchpadUrlOpener(launchpad_cookiefile)
 
     # Check where the package is and assign the appropriate variables.
     if component in ['main', 'restricted']:
@@ -69,7 +73,7 @@ def checkNeedsSponsorship(component):
         sponsor = "ubuntu-universe-sponsors"
 
     # Check if they are a member of the team.
-    teamMember = common.isLPTeamMember(team)
+    teamMember = lplibfunctions.isLPTeamMember(team)
     
     if not teamMember:
         print "You are not a member (direct or indirect) of the '%s' " \
@@ -98,7 +102,7 @@ def checkExistingReports(package):
     launchpad = None
 
     try:
-        launchpad = common.get_launchpad("ubuntu-dev-tools")
+        launchpad = lplibsupport.get_launchpad("ubuntu-dev-tools")
     except ImportError:
         print >> sys.stderr, 'Importing launchpadlib failed. Is ' \
             'python-launchpadlib installed?'
@@ -348,7 +352,7 @@ def post_bug(source_package, subscribe, status, bugtitle, bugtext):
     import glob, os.path
 
     try:
-        launchpad = common.get_launchpad("ubuntu-dev-tools")
+        launchpad = lplibsupport.get_launchpad("ubuntu-dev-tools")
     except ImportError:
         print >> sys.stderr, 'Importing launchpadlib failed. Is python-launchpadlib installed?'
         return False