rename from server/python/junius/__init__.py
rename to server/python/raindrop/__init__.py

rename from server/python/junius/bootstrap.py
rename to server/python/raindrop/bootstrap.py
--- a/server/python/junius/bootstrap.py
+++ b/server/python/raindrop/bootstrap.py
@@ -62,18 +62,18 @@ def install_client_files(whateva, option
         if failure.value.status != '404': # not found.
             failure.raiseException()
         return {} # return an empty doc.
 
     def _maybe_update_doc(design_doc):
         fp = Fingerprinter()
         attachments = design_doc['_attachments'] = {}
         # we cannot go in a zipped egg...
-        junius_root_dir = path_part_nuke(model.__file__, 4)
-        client_dir = os.path.join(junius_root_dir, 'client')
+        root_dir = path_part_nuke(model.__file__, 4)
+        client_dir = os.path.join(root_dir, 'client')
         logger.debug("listing contents of '%s' to look for client files", client_dir)
 
         for filename in os.listdir(client_dir):
             path = os.path.join(client_dir, filename)
             if os.path.isfile(path):
                 f = open(path, 'rb')
                 ct = mimetypes.guess_type(filename)[0]
                 if ct is None and sys.platform=="win32":

rename from server/python/junius/config.py
rename to server/python/raindrop/config.py

rename from server/python/junius/ext/__init__.py
rename to server/python/raindrop/ext/__init__.py

rename from server/python/junius/ext/message/__init__.py
rename to server/python/raindrop/ext/message/__init__.py

rename from server/python/junius/ext/message/email.py
rename to server/python/raindrop/ext/message/email.py

rename from server/python/junius/ext/message/message.py
rename to server/python/raindrop/ext/message/message.py

rename from server/python/junius/ext/message/rfc822.py
rename to server/python/raindrop/ext/message/rfc822.py

rename from server/python/junius/model.py
rename to server/python/raindrop/model.py

rename from server/python/junius/pipeline.py
rename to server/python/raindrop/pipeline.py
--- a/server/python/junius/pipeline.py
+++ b/server/python/raindrop/pipeline.py
@@ -6,32 +6,32 @@ from twisted.python.failure import Failu
 import logging
 
 logger = logging.getLogger(__name__)
 
 # Simple forward chaining.
 chain = [
     # from_type, to_type, transformer)
     ('proto/test',         'raw/message/rfc822',
-                           'junius.proto.test.TestConverter'),
+                           'raindrop.proto.test.TestConverter'),
     # skype goes directly to 'message' for now...
     ('proto/skype-msg',    'message',
-                           'junius.proto.skype.SkypeConverter'),
+                           'raindrop.proto.skype.SkypeConverter'),
     # skype-chat is 'terminal' for now.
     ('proto/skype-chat', None, None),
     ('proto/imap',         'raw/message/rfc822',
-                           'junius.proto.imap.IMAPConverter'),
+                           'raindrop.proto.imap.IMAPConverter'),
     ('proto/twitter',      'message',
-                           'junius.proto.twitter.TwitterConverter'),
+                           'raindrop.proto.twitter.TwitterConverter'),
     ('raw/message/rfc822', 'raw/message/email',
-                           'junius.ext.message.rfc822.RFC822Converter'),
+                           'raindrop.ext.message.rfc822.RFC822Converter'),
     ('raw/message/email',  'message',
-                           'junius.ext.message.email.EmailConverter'),
+                           'raindrop.ext.message.email.EmailConverter'),
     ('message',            'anno/tags',
-                           'junius.ext.message.message.MessageAnnotator'),
+                           'raindrop.ext.message.message.MessageAnnotator'),
     # anno/tags is 'terminal'
     ('anno/tags', None, None),
 ]
 
 
 class Pipeline(object):
     def __init__(self, doc_model, options):
         self.doc_model = doc_model

rename from server/python/junius/proc/__init__.py
rename to server/python/raindrop/proc/__init__.py

rename from server/python/junius/proc/base.py
rename to server/python/raindrop/proc/base.py

rename from server/python/junius/proc/contact.py
rename to server/python/raindrop/proc/contact.py

rename from server/python/junius/proc/message.py
rename to server/python/raindrop/proc/message.py

rename from server/python/junius/proto/__init__.py
rename to server/python/raindrop/proto/__init__.py
--- a/server/python/junius/proto/__init__.py
+++ b/server/python/raindrop/proto/__init__.py
@@ -1,17 +1,17 @@
 # this needs to become a 'plugin' mechanism...
 
 _protocol_infos = [
-    ('imap', 'junius.proto.imap', 'IMAPAccount'),
-    ('skype', 'junius.proto.skype', 'SkypeAccount'),
-    ('twitter', 'junius.proto.twitter', 'TwitterAccount'),
+    ('imap', 'raindrop.proto.imap', 'IMAPAccount'),
+    ('skype', 'raindrop.proto.skype', 'SkypeAccount'),
+    ('twitter', 'raindrop.proto.twitter', 'TwitterAccount'),
 ]
 if __debug__:
-    _protocol_infos.append(('test', 'junius.proto.test', 'TestAccount'))
+    _protocol_infos.append(('test', 'raindrop.proto.test', 'TestAccount'))
 
 protocols = {}
 def init_protocols():
     import sys, logging
     logger = logging.getLogger('raindrop.proto')
     for name, mod, factname in _protocol_infos:
         try:
             logger.debug("attempting import of '%s' for '%s'", mod, factname)

rename from server/python/junius/proto/imap.py
rename to server/python/raindrop/proto/imap.py

rename from server/python/junius/proto/skype.py
rename to server/python/raindrop/proto/skype.py

rename from server/python/junius/proto/test/__init__.py
rename to server/python/raindrop/proto/test/__init__.py

rename from server/python/junius/proto/twitter.py
rename to server/python/raindrop/proto/twitter.py

rename from server/python/junius/replicate.py
rename to server/python/raindrop/replicate.py

rename from server/python/junius/sync.py
rename to server/python/raindrop/sync.py

--- a/server/python/run-raindrop.py
+++ b/server/python/run-raindrop.py
@@ -1,20 +1,20 @@
 """The raindrop server
 """
 import sys
 import optparse
 import logging
 
 from twisted.internet import reactor, defer, task
 
-from junius import model
-from junius import bootstrap
-from junius import pipeline
-from junius.sync import get_conductor
+from raindrop import model
+from raindrop import bootstrap
+from raindrop import pipeline
+from raindrop.sync import get_conductor
 
 logger = logging.getLogger('raindrop')
 
 class HelpFormatter(optparse.IndentedHelpFormatter):
     def format_description(self, description):
         return description
 
 # decorators for our global functions:
@@ -93,17 +93,17 @@ def show_view(result, parser, options, a
     def print_view(result, view_name):
         print "** view %r **" % view_name
         pprint(result)
 
     def gen_views():
         for arg in args:
             # don't use open_view as then we'd need to parse the query portion!
             # grrr - just to get the dbname :()
-            from junius.config import get_config
+            from raindrop.config import get_config
             dbinfo = get_config().couches['local']
             dbname = dbinfo['name']
             if arg.startswith("/"):
                 uri = "/%s/%s" % (dbname, arg)
             else:
                 try:
                     doc, rest = arg.split("/")
                 except ValueError:

--- a/server/python/setup.py
+++ b/server/python/setup.py
@@ -1,19 +1,19 @@
 from setuptools import setup, find_packages
 
 setup(
-    name = "junius",
+    name = "raindrop",
     version = "0.1a1",
     packages = find_packages(),
 
     install_requires = [
                         ],
 
     # PyPI meta
     author = 'Andrew Sutherland',
     author_email = 'asutherland@asutherland.org',
-    description = 'junius',
+    description = 'raindrop',
     license = 'MPL/GPL/LGPL tri-license',
     keywords = 'mail',
     url = 'www.mozillamessaging.com',
     zip_safe = False,
 )