diff --git a/bin/bump-version.pl b/bin/bump-version.pl
index 82dfab6..a39ff35 100755
--- a/bin/bump-version.pl
+++ b/bin/bump-version.pl
@@ -1,4 +1,18 @@
 #!/usr/bin/perl
+#
+# Copyright (c) 2008-2009 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+
 
 use strict;
 use warnings FATAL => 'all';
diff --git a/bin/tar-fixup-stamp-comment.pl b/bin/tar-fixup-stamp-comment.pl
index cc6793e..f908bb0 100755
--- a/bin/tar-fixup-stamp-comment.pl
+++ b/bin/tar-fixup-stamp-comment.pl
@@ -1,4 +1,17 @@
 #!/usr/bin/perl
+#
+# Copyright (c) 2008-2009 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
 
 use strict;
 use warnings FATAL => 'all';
diff --git a/bin/test-setup-specfile.pl b/bin/test-setup-specfile.pl
index 95b4437..30d1da3 100755
--- a/bin/test-setup-specfile.pl
+++ b/bin/test-setup-specfile.pl
@@ -1,4 +1,17 @@
 #!/usr/bin/perl
+#
+# Copyright (c) 2008-2009 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
 
 use strict;
 use warnings FATAL => 'all';
diff --git a/bin/tito b/bin/tito
deleted file mode 100755
index 582bfde..0000000
--- a/bin/tito
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008,2009 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-import sys
-import os.path
-
-from spacewalk.releng.cli import CLI
-
-if __name__ == "__main__":
-    CLI().main()
diff --git a/setup.py b/setup.py
index 92a1d24..521405f 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 #
+# Copyright (c) 2008-2009 Red Hat, Inc.
+#
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
 # implied, including the implied warranties of MERCHANTABILITY or FITNESS
@@ -11,7 +13,7 @@
 # granted to use or replicate Red Hat trademarks that are incorporated
 # in this software or its documentation.
 """
-Tito Distutils Setup Script
+Tito Setup Script
 """
 
 import os
diff --git a/src/spacewalk/__init__.py b/src/spacewalk/__init__.py
index e69de29..be8a689 100644
--- a/src/spacewalk/__init__.py
+++ b/src/spacewalk/__init__.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2008-2009 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+"""
+Spacewalk python package.
+"""
diff --git a/src/spacewalk/releng/__init__.py b/src/spacewalk/releng/__init__.py
index 50ba841..42207ca 100644
--- a/src/spacewalk/releng/__init__.py
+++ b/src/spacewalk/releng/__init__.py
@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008-2009 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,9 +10,6 @@
 # Red Hat trademarks are not licensed under GPLv2. No permission is
 # granted to use or replicate Red Hat trademarks that are incorporated
 # in this software or its documentation.
-#
-
 """
 Infrastructure for building Spacewalk and Satellite packages from git tags.
 """
-
diff --git a/src/spacewalk/releng/builder.py b/src/spacewalk/releng/builder.py
index 8fe6e39..69348c8 100644
--- a/src/spacewalk/releng/builder.py
+++ b/src/spacewalk/releng/builder.py
@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2008-2009 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,8 +10,9 @@
 # Red Hat trademarks are not licensed under GPLv2. No permission is
 # granted to use or replicate Red Hat trademarks that are incorporated
 # in this software or its documentation.
-
-""" Code for building Spacewalk/Satellite tarballs, srpms, and rpms. """
+"""
+Code for building Spacewalk/Satellite tarballs, srpms, and rpms.
+"""
 
 import os
 import re
diff --git a/src/spacewalk/releng/cli.py b/src/spacewalk/releng/cli.py
index 4b833f4..402c3a1 100644
--- a/src/spacewalk/releng/cli.py
+++ b/src/spacewalk/releng/cli.py
@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2008-2009 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,8 +10,6 @@
 # Red Hat trademarks are not licensed under GPLv2. No permission is
 # granted to use or replicate Red Hat trademarks that are incorporated
 # in this software or its documentation.
-#
-
 """
 Command line interface for building Spacewalk and Satellite packages from git tags.
 """
diff --git a/src/spacewalk/releng/common.py b/src/spacewalk/releng/common.py
index b3a1f12..1827d1c 100644
--- a/src/spacewalk/releng/common.py
+++ b/src/spacewalk/releng/common.py
@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008-2009 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,6 +10,9 @@
 # Red Hat trademarks are not licensed under GPLv2. No permission is
 # granted to use or replicate Red Hat trademarks that are incorporated
 # in this software or its documentation.
+"""
+Common operations.
+"""
 
 import os
 import re
diff --git a/src/spacewalk/releng/tagger.py b/src/spacewalk/releng/tagger.py
index cba5e8d..e3346f4 100644
--- a/src/spacewalk/releng/tagger.py
+++ b/src/spacewalk/releng/tagger.py
@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008-2009 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,8 +10,9 @@
 # Red Hat trademarks are not licensed under GPLv2. No permission is
 # granted to use or replicate Red Hat trademarks that are incorporated
 # in this software or its documentation.
-
-""" Code for tagging Spacewalk/Satellite packages. """
+"""
+Code for tagging Spacewalk/Satellite packages.
+"""
 
 import os
 import re
diff --git a/test/runtests.py b/test/runtests.py
index e053514..9a11977 100644
--- a/test/runtests.py
+++ b/test/runtests.py
@@ -1,4 +1,20 @@
 #!/usr/bin/env python
+#
+# Copyright (c) 2008-2009 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+"""
+Executes all tests.
+"""
 
 import sys
 import os