diff --git a/pastebin/clientlib/lodgeit.rb b/clientlib/lodgeit.rb
similarity index 100%
rename from pastebin/clientlib/lodgeit.rb
rename to clientlib/lodgeit.rb
diff --git a/pastebin/lodgeit.py b/lodgeit.py
similarity index 100%
rename from pastebin/lodgeit.py
rename to lodgeit.py
diff --git a/pastebin/__init__.py b/pastebin/__init__.py
index e69de29..feafef5 100644
--- a/pastebin/__init__.py
+++ b/pastebin/__init__.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+"""
+    pastebin
+    ~~~~~~~~
+
+    Lodge It pastebin.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+"""
diff --git a/pastebin/media/css/style.css b/pastebin/media/css/style.css
index 4565900..3719880 100644
--- a/pastebin/media/css/style.css
+++ b/pastebin/media/css/style.css
@@ -1,3 +1,13 @@
+/*
+    pastebin style
+    ~~~~~~~~~~~~~~
+
+    Lodge It styles.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+*/
+
 body {
     background-color: #919191;
     font-family: 'Verdana', 'Bitstream Vera Sans', sans-serif;
diff --git a/pastebin/media/js/pastebin.js b/pastebin/media/js/pastebin.js
index bede3c3..ed26979 100644
--- a/pastebin/media/js/pastebin.js
+++ b/pastebin/media/js/pastebin.js
@@ -1,3 +1,13 @@
+/*
+    pastebin client scripts
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lodge It pastebin client scripts.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+*/
+
 function togglePasteThread(uid) {
     if (Element.visible('paste_thread')) {
         new Effect.Fade('paste_thread');
diff --git a/pastebin/pastes/models.py b/pastebin/pastes/models.py
index 6b9cda0..6b058e7 100644
--- a/pastebin/pastes/models.py
+++ b/pastebin/pastes/models.py
@@ -1,3 +1,13 @@
+# -*- coding: utf-8 -*-
+"""
+    pastebin.pastes.models
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    Lodge It pastebin models.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+"""
 import sha
 import math
 import re
diff --git a/pastebin/pastes/views.py b/pastebin/pastes/views.py
index 4486bfb..aa2201f 100644
--- a/pastebin/pastes/views.py
+++ b/pastebin/pastes/views.py
@@ -1,3 +1,13 @@
+# -*- coding: utf-8 -*-
+"""
+    pastebin.pastes.views
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lodge It pastebin views.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+"""
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.forms import FormWrapper
 from pastebin.utils import Pagination, templated, render_diff
diff --git a/pastebin/static/models.py b/pastebin/static/models.py
deleted file mode 100644
index 71a8362..0000000
--- a/pastebin/static/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.
diff --git a/pastebin/static/views.py b/pastebin/static/views.py
index 7b210f7..62f4e9c 100644
--- a/pastebin/static/views.py
+++ b/pastebin/static/views.py
@@ -1,3 +1,13 @@
+# -*- coding: utf-8 -*-
+"""
+    pastebin.static.views
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lodge It pastebin static views.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+"""
 from pastebin.utils import templated
 from django.http import HttpResponseRedirect
 from pastebin.pastes.models import KNOWN_STYLES
diff --git a/pastebin/urls.py b/pastebin/urls.py
index 89ba25b..b4dcb41 100644
--- a/pastebin/urls.py
+++ b/pastebin/urls.py
@@ -1,3 +1,13 @@
+# -*- coding: utf-8 -*-
+"""
+    pastebin.urls
+    ~~~~~~~~~~~~~
+
+    Lodge It pastebin urls.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+"""
 from re import escape
 from django.conf import settings
 from django.conf.urls.defaults import *
diff --git a/pastebin/utils.py b/pastebin/utils.py
index 225eb77..22c8bb1 100644
--- a/pastebin/utils.py
+++ b/pastebin/utils.py
@@ -1,3 +1,13 @@
+# -*- coding: utf-8 -*-
+"""
+    pastebin.utils
+    ~~~~~~~~~~~~~~
+
+    Lodge It pastebin utilities.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+"""
 import math
 import inspect
 import time
diff --git a/pastebin/xmlrpc/models.py b/pastebin/xmlrpc/models.py
deleted file mode 100644
index 71a8362..0000000
--- a/pastebin/xmlrpc/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.
diff --git a/pastebin/xmlrpc/views.py b/pastebin/xmlrpc/views.py
index c714750..881c534 100644
--- a/pastebin/xmlrpc/views.py
+++ b/pastebin/xmlrpc/views.py
@@ -1,4 +1,13 @@
 # -*- coding: utf-8 -*-
+"""
+    pastebin.xmlrpc.views
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lodge It pastebin xmlrpc interface.
+
+    :copyright: 2006 by Armin Ronacher.
+    :license: BSD
+"""
 from pygments.lexers import get_lexer_by_name, \
                             get_lexer_for_mimetype, \
                             get_lexer_for_filename
diff --git a/scripts/lodgeit.py b/scripts/lodgeit.py
new file mode 100755
index 0000000..0182c9e
--- /dev/null
+++ b/scripts/lodgeit.py
@@ -0,0 +1,299 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    LodgeIt!
+    ~~~~~~~~
+
+    A script that pastes stuff into the lodgeit pastebin on
+    paste.pocoo.org.
+
+    .lodgeitrc / _lodgeitrc
+    -----------------------
+
+    Under UNIX create a file called ``~/.lodgerc``, under Windows
+    create a file ``%APPDATA%/_lodgerc`` to override defaults::
+
+        author=Your Name
+        language=default_language
+        private=true/false
+        clipboard=true/false
+        open_browser=true/false
+        encoding=fallback_charset
+
+    :authors: 2006 Armin Ronacher <armin.ronacher@active-4.com>,
+              2006 Matt Good <matt@matt-good.net>,
+              2005 Raphael Slinckx <raphael@slinckx.net>
+"""
+import os
+import sys
+
+
+SCRIPT_NAME = os.path.basename(sys.argv[0])
+VERSION = '0.1'
+SERVICE_URL = 'http://paste.pocoo.org/xmlrpc/'
+SETTING_KEYS = ['author', 'title', 'language', 'private', 'clipboard',
+                'open_browser']
+
+
+def fail(msg, code):
+    print >> sys.stderr, 'ERROR: %s' % msg
+    sys.exit(code)
+
+
+def load_default_settings():
+    """Load the defaults from the lodgeitrc file."""
+    settings = {
+        'author':       None,
+        'language':     None,
+        'private':      False,
+        'clipboard':    True,
+        'open_browser': False,
+        'encoding':     'iso-8859-15'
+    }
+    rcfile = None
+    if os.name == 'posix':
+        rcfile = os.path.expanduser('~/.lodgeitrc')
+    elif os.name == 'nt' and 'APPDATA' in os.environ:
+        rcfile = os.path.expandvars(r'$APPDATA\_lodgeitrc')
+    if rcfile:
+        try:
+            f = open(rcfile)
+            for line in f:
+                if line.strip()[:1] in '#;':
+                    continue
+                p = line.split('=', 1)
+                if len(p) == 2:
+                    key = p[0].strip().lower()
+                    if key in settings:
+                        if key in ('private', 'clipboard', 'open_browser'):
+                            settings[key] = p[1].strip().lower() in \
+                                            ('true', '1', 'on', 'yes')
+                        else:
+                            settings[key] = p[1].strip()
+            f.close()
+        except IOError:
+            pass
+    settings['tags'] = []
+    settings['title'] = None
+    return settings
+
+
+def make_utf8(text, encoding):
+    """Convert a text to utf-8"""
+    try:
+        u = unicode(text, 'utf-8')
+        uenc = 'utf-8'
+    except UnicodeError:
+        try:
+            u = unicode(text, encoding)
+            uenc = 'utf-8'
+        except UnicodeError:
+            u = unicode(text, 'iso-8859-15', 'ignore')
+            uenc = 'iso-8859-15'
+    try:
+        import chardet
+    except ImportError:
+        return u.encode('utf-8')
+    d = chardet.detect(text)
+    if d['encoding'] == uenc:
+        return u.encode('utf-8')
+    return unicode(text, d['encoding'], 'ignore').encode('utf-8')
+
+
+def get_xmlrpc_service():
+    global _xmlrpc_service
+    import xmlrpclib
+    try:
+        _xmlrpc_service
+    except NameError:
+        try:
+            _xmlrpc_service = xmlrpclib.ServerProxy(SERVICE_URL)
+        except:
+            fail('Could not connect to Pastebin', -1)
+    return _xmlrpc_service
+
+
+def copy_url(url):
+    """Copy the url into the clipboard."""
+    try:
+        import win32clipboard
+        import win32con
+    except ImportError:
+        try:
+            import pygtk
+            pygtk.require('2.0')
+            import gtk
+            import gobject
+        except ImportError:
+            return
+        gtk.clipboard_get(gtk.gdk.SELECTION_CLIPBOARD).set_text(url)
+        gobject.idle_add(gtk.main_quit)
+        gtk.main()
+    else:
+        win32clipboard.OpenClipboard()
+        win32clipboard.EmptyClipboard()
+        win32clipboard.SetClipboardText(url)
+        win32clipboard.CloseClipboard()
+
+
+def open_webbrowser(url):
+    """Open a new browser window."""
+    import webbrowser
+    webbrowser.open(url)
+
+
+def get_unix_username():
+    """Return the current unix username"""
+    import getpass
+    return getpass.getuser()
+
+
+def language_exists(language):
+    """Check if a language alias exists."""
+    xmlrpc = get_xmlrpc_service()
+    return bool(xmlrpc.pastes.getNameByAlias(language))
+
+
+def guess_language(data, filename):
+    """Guess the language for a given data."""
+    xmlrpc = get_xmlrpc_service()
+    try:
+        import gnomevfs
+    except ImportError:
+        pass
+    else:
+        mimes = [gnomevfs.get_mime_type_for_data(data)]
+        if filename:
+            mimes.append(gnomevfs.get_mime_type(os.path.abspath(filename)))
+        for mime in mimes:
+            alias = xmlrpc.pastes.getAliasForMimetype(mime)
+            if alias and alias != 'text':
+                return alias
+    if filename:
+        alias = xmlrpc.pastes.getAliasForFilename(filename)
+        if alias:
+            return alias
+    return 'text'
+
+
+def print_languages():
+    xmlrpc = get_xmlrpc_service()
+    languages = xmlrpc.pastes.getLanguages()
+    languages.sort(lambda a, b: cmp(a[1].lower(), b[1].lower()))
+    print 'Supported Languages:'
+    for alias, name in languages:
+        print '    %-30s%s' % (alias, name)
+
+
+def download_paste(uid):
+    xmlrpc = get_xmlrpc_service()
+    paste = xmlrpc.pastes.getPaste(uid)
+    if not paste:
+        fail('Paste "%s" does not exist' % uid, 5)
+    print paste['code']
+
+
+def create_paste(code, title, author, language, private, tags):
+    xmlrpc = get_xmlrpc_service()
+    rv = xmlrpc.pastes.newPaste(language, code, private, title, author, tags)
+    if not rv:
+        fail('Could not commit paste. Something went wrong', 4)
+    return rv['url']
+
+
+if __name__ == '__main__':
+    # parse command line
+    from optparse import OptionParser
+    parser = OptionParser()
+
+    settings = load_default_settings()
+
+    parser.add_option('-v', '--version', action='store_true',
+                      help='Print script version')
+    parser.add_option('-t', '--title',
+                      help='Title of the paste (default is FILE if given)')
+    parser.add_option('-a', '--author', default=settings['author'],
+                      help='Name of the author (default is UNIX username)')
+    parser.add_option('-l', '--language', default=settings['language'],
+                      help='Used syntax highlighter for the file')
+    parser.add_option('-p', '--private', default=settings['private'],
+                      action='store_true', help='Paste as private')
+    parser.add_option('-e', '--encoding', default=settings['encoding'],
+                      help='Specify the encoding of a file (default is '
+                           'utf-8 or guessing if available)')
+    parser.add_option('--no-clipboard', dest='clipboard',
+                      action='store_false',
+                      default=settings['clipboard'],
+                      help="Don't copy the url into the clipboard")
+    parser.add_option('--open-browser', dest='open_browser',
+                      action='store_true',
+                      default=settings['open_browser'],
+                      help='Open the paste in a web browser')
+    parser.add_option('--tags', help='List of comma separated tags')
+    parser.add_option('--languages', action='store_true', default=False,
+                      help='Retrieve a list of supported languages')
+    parser.add_option('--download', metavar='UID',
+                      help='Download a given paste')
+
+    opts, args = parser.parse_args()
+
+    if len(args) > 1:
+        fail('Can only paste one file', 1)
+
+    # System Version
+    if opts.version:
+        print '%s: version %s' % (SCRIPT_NAME, VERSION)
+        sys.exit()
+    
+    # Languages
+    elif opts.languages:
+        print_languages()
+        sys.exit()
+
+    # Download Paste
+    elif opts.download:
+        download_paste(opts.download)
+        sys.exit()
+
+    if opts.tags:
+        opts.tags = [t.strip() for t in opts.tags.split(',')]
+    else:
+        opts.tags = []
+ 
+    # check language if given
+    if opts.language and not language_exists(opts.language):
+        fail('Language %s is not supported', 3)
+
+    # load file
+    try:
+        if args:
+            f = file(args[0], 'r')
+        else:
+            f = sys.stdin
+        data = f.read()
+        f.close()
+    except Exception, msg:
+        fail('Error while reading the file: %s' % msg, 2)
+    if not data.strip():
+        fail('Aborted, paste file was empty', 4)
+
+    # fill with default settings
+    if not opts.author:
+        opts.author = get_unix_username()
+    if not opts.title:
+        if args:
+            opts.title = args[0]
+        else:
+            opts.title = ''
+    if not opts.language:
+        opts.language = guess_language(data, args and args[0] or None)
+
+    # create paste
+    code = make_utf8(data, opts.encoding)
+    url = create_paste(code, opts.title, opts.author, opts.language,
+                       opts.private, opts.tags)
+    print url
+    if opts.open_browser:
+        open_webbrowser(url)
+    if opts.clipboard:
+        copy_url(url)