new file mode 100644
--- /dev/null
+++ b/bitten.egg-info/trac_plugin.txt
@@ -0,0 +1,2 @@
+bitten.trac_ext.main
+bitten.trac_ext.web_ui

--- a/bitten/trac_ext/__init__.py
+++ b/bitten/trac_ext/__init__.py
@@ -17,6 +17,3 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 # Author: Christopher Lenz <cmlenz@gmx.de>
-
-import bitten.trac_ext.main
-import bitten.trac_ext.web_ui

rename from htdocs/build.css
rename to bitten/trac_ext/htdocs/build.css

rename from htdocs/build.png
rename to bitten/trac_ext/htdocs/build.png

rename from templates/build.cs
rename to bitten/trac_ext/templates/build.cs

--- a/bitten/trac_ext/web_ui.py
+++ b/bitten/trac_ext/web_ui.py
@@ -23,6 +23,7 @@
 import sys
 from time import localtime, strftime
 
+import pkg_resources
 from trac.core import *
 from trac.Timeline import ITimelineEventProvider
 from trac.util import escape, pretty_timedelta
@@ -32,17 +33,6 @@
 from trac.wiki import wiki_to_html
 from bitten.model import BuildConfig, TargetPlatform, Build, BuildStep
 
-def _find_dir(name):
-    import bitten
-    # First assume we're being executing directly form the source directory
-    path = os.path.join(os.path.split(os.path.dirname(bitten.__file__))[0],
-                        name)
-    if not os.path.isdir(path):
-        # Not being executed from the source directory, so assume the
-        # default installation prefix
-        path = os.path.join(sys.prefix, 'share', 'bitten', name)
-    return path
-
 
 class BuildModule(Component):
     """Implements the Bitten web interface."""
@@ -54,9 +44,6 @@
                      Build.SUCCESS: 'completed',
                      Build.FAILURE: 'failed'}
 
-    htdocs_dir = _find_dir('htdocs')
-    templates_dir = _find_dir('templates')
-
     # INavigationContributor methods
 
     def get_active_navigation_item(self, req):
@@ -136,10 +123,10 @@
     # ITemplatesProvider methods
 
     def get_htdocs_dir(self):
-        return self.config.get('bitten', 'htdocs_dir') or self.htdocs_dir
+        return pkg_resources.resource_filename(__name__, 'htdocs')
 
     def get_templates_dir(self):
-        return self.config.get('bitten', 'templates_dir') or self.templates_dir
+        return pkg_resources.resource_filename(__name__, 'templates')
 
     # ITimelineEventProvider methods
 

new file mode 100755
--- /dev/null
+++ b/ez_setup.py
@@ -0,0 +1,164 @@
+#!/usr/bin/env python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from ez_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+
+DEFAULT_VERSION = "0.5a13"
+DEFAULT_URL     = "http://www.python.org/packages/source/s/setuptools/"
+
+import sys, os
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+def use_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir
+):
+    """Automatically find/download setuptools and make it available on sys.path
+
+    `version` should be a valid setuptools version number that is available
+    as an egg for download under the `download_base` URL (which should end with
+    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
+    it is not already available.
+
+    If an older version of setuptools is installed, this will print a message
+    to ``sys.stderr`` and raise SystemExit in an attempt to abort the calling
+    script.
+    """
+    try:
+        import setuptools
+        if setuptools.__version__ == '0.0.1':
+            print >>sys.stderr, (
+            "You have an obsolete version of setuptools installed.  Please\n"
+            "remove it from your system entirely before rerunning this script."
+            )
+            sys.exit(2)
+
+    except ImportError:
+        egg = download_setuptools(version, download_base, to_dir)
+        sys.path.insert(0, egg)
+        import setuptools; setuptools.bootstrap_install_from = egg
+
+    import pkg_resources
+    try:
+        pkg_resources.require("setuptools>="+version)
+
+    except pkg_resources.VersionConflict:
+        # XXX could we install in a subprocess here?
+        print >>sys.stderr, (
+            "The required version of setuptools (>=%s) is not available, and\n"
+            "can't be installed while this script is running. Please install\n"
+            " a more recent version first."
+        ) % version
+        sys.exit(2)
+
+def download_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir
+):
+    """Download setuptools from a specified location and return its filename
+
+    `version` should be a valid setuptools version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    """
+    import urllib2, shutil
+    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+    url = download_base + egg_name + '.zip'  # XXX
+    saveto = os.path.join(to_dir, egg_name)
+    src = dst = None
+
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            from distutils import log
+            log.warn("Downloading %s", url)
+            src = urllib2.urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = src.read()
+            dst = open(saveto,"wb")
+            dst.write(data)
+        finally:
+            if src: src.close()
+            if dst: dst.close()
+
+    return os.path.realpath(saveto)
+
+
+
+
+
+
+
+
+
+
+
+def main(argv, version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+
+    try:
+        import setuptools
+    except ImportError:
+        import tempfile, shutil
+        tmpdir = tempfile.mkdtemp(prefix="easy_install-")
+        try:
+            egg = download_setuptools(version, to_dir=tmpdir)
+            sys.path.insert(0,egg)
+            from setuptools.command.easy_install import main
+            main(list(argv)+[egg])
+        finally:
+            shutil.rmtree(tmpdir)
+    else:
+        if setuptools.__version__ == '0.0.1':
+            # tell the user to uninstall obsolete version
+            use_setuptools(version)
+
+    req = "setuptools>="+version
+    import pkg_resources
+    try:
+        pkg_resources.require(req)
+    except pkg_resources.VersionConflict:
+        try:
+            from setuptools.command.easy_install import main
+        except ImportError:
+            from easy_install import main
+        main(list(argv)+[download_setuptools()])
+        sys.exit(0) # try to force an exit
+    else:
+        if argv:
+            from setuptools.command.easy_install import main
+            main(argv)
+        else:
+            print "Setuptools version",version,"or greater has been installed."
+            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+if __name__=='__main__':
+    main(sys.argv[1:])
+

--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,11 @@
 #
 # Author: Christopher Lenz <cmlenz@gmx.de>
 
-from distutils.core import setup
+import ez_setup # From http://peak.telecommunity.com/DevCenter/setuptools
+ez_setup.use_setuptools()
+
+
+from setuptools import setup, find_packages
 from distutils import util
 from glob import glob
 
@@ -30,9 +34,9 @@
 if util.get_platform()[:3] == 'win':
     scripts = [script + '.bat' for script in scripts]
 
-setup(name='bitten', version=VERSION,
-      packages=['bitten', 'bitten.build', 'bitten.trac_ext', 'bitten.util'],
-      data_files=[('share/bitten/htdocs', glob('htdocs/*.*')),
-                  ('share/bitten/templates', glob('templates/*.cs'))],
-      scripts=scripts, author="Christopher Lenz", author_email="cmlenz@gmx.de",
-      url="http://bitten.cmlenz.net/", cmdclass={'unittest': unittest})
+setup(name='bitten', version=VERSION, author="Christopher Lenz",
+      author_email="cmlenz@gmx.de", url="http://bitten.cmlenz.net/",
+      packages=find_packages(exclude=["*.tests*"]),
+      package_data={'bitten.trac_ext': ['templates/*.cs', 'htdocs/*.*']},
+      scripts=scripts, test_suite='bitten.tests.suite', zip_safe=True,
+      cmdclass={'unittest': unittest})