diff --git a/agent/__init__.py b/agent/__init__.py
index 75ef1b6..f0cb314 100644
--- a/agent/__init__.py
+++ b/agent/__init__.py
@@ -6,3 +6,4 @@ $Id$
 
 from cybertools.agent.base import agent, control, job, log, schedule
 from cybertools.agent.core import agent, control, schedule
+from cybertools.agent.crawl import base
diff --git a/agent/base/agent.py b/agent/base/agent.py
index 23328cf..6f900d7 100644
--- a/agent/base/agent.py
+++ b/agent/base/agent.py
@@ -75,6 +75,9 @@ class Master(Agent):
     def setupAgents(self, agentSpecs):
         for spec in agentSpecs:
             agent = agents(self, spec.type)
+            if agent is None:
+                print spec.type
+                return
             agent.name = spec.name
             self.children[spec.name] = agent
 
diff --git a/agent/base/control.py b/agent/base/control.py
index 7e529f9..cb67e2a 100644
--- a/agent/base/control.py
+++ b/agent/base/control.py
@@ -56,6 +56,10 @@ class SampleController(Controller):
     def _getAgents(self):
         return [AgentSpecification(name, type) for name, type in self.agents]
 
+    def createAgent(self, agentType, name):
+        spec = AgentSpecification(name, agentType)
+        self.agent.setupAgents([spec])
+
     def enterJob(self, jobType, agent):
         self.jobNumber += 1
         spec = JobSpecification(jobType, '%05i' % self.jobNumber, agent=agent)
diff --git a/agent/core/README.txt b/agent/core/README.txt
deleted file mode 100644
index 07645ea..0000000
--- a/agent/core/README.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-================================================
-Agents for Job Execution and Communication Tasks
-================================================
-
-Agents collect informations and transfer them e.g. to a loops server.
-
-  ($Id$)
-
-This package does not depend on zope or the other loops packages
-but represents a standalone application.
-
-But we need a reactor for working with Twisted; in order not to block
-testing when running the reactor we use reactor.iterate() calls
-wrapped in a ``tester`` object.
-
-  >>> from cybertools.agent.tests import tester
-
-
-Master Agent
-============
-
-The agent uses Twisted's cooperative multitasking model.
-
-This means that all calls to services (like crawler, transporter, ...)
-return a deferred that must be supplied with a callback method (and in
-most cases also an errback method).
-
-  >>> #from cybertools.agent.core.agent import Master
-  >>> #master = Master()
-
-
diff --git a/agent/crawl/README.txt b/agent/crawl/README.txt
index 1a4c613..dc13de2 100644
--- a/agent/crawl/README.txt
+++ b/agent/crawl/README.txt
@@ -1,36 +1,46 @@
-================================================
-Agents for Job Execution and Communication Tasks
-================================================
-
-Agents collect informations and transfer them e.g. to a loops server.
-
-  ($Id: README.txt 2413 2008-02-23 14:07:15Z helmutm $)
-
-This package does not depend on zope or the other loops packages
-but represents a standalone application.
-
-But we need a reactor for working with Twisted; in order not to block
-testing when running the reactor we use reactor.iterate() calls
-wrapped in a ``tester`` object.
-
-  >>> from cybertools.agent.tests import tester
-
-
-Crawler
-============
-
-The agent uses Twisted's cooperative multitasking model.
-
-Crawler is the base class for all derived Crawlers like the filesystem crawler
-and the mailcrawler. The SampleCrawler returns a deferred that already had a
-callback being called, so it will return at once.
-Returns a deferred that must be supplied with a callback method (and in
-most cases also an errback method).
-
-  >>> from cybertools.agent.crawl.base import SampleCrawler
-  >>> from twisted.internet import defer
-  >>> crawler = SampleCrawler()
-  >>> deferred = crawler.collect()
-  SampleCrawler is collecting.
-
-
+================================================
+Agents for Job Execution and Communication Tasks
+================================================
+
+  ($Id$)
+
+  >>> from cybertools.agent.base.agent import Master
+
+  >>> config = '''
+  ... controller(name='core.sample')
+  ... scheduler(name='core')
+  ... logger(name='default', standard=30)
+  ... '''
+  >>> master = Master(config)
+  >>> master.setup()
+
+
+Crawler
+=======
+
+The agent uses Twisted's cooperative multitasking model.
+
+Crawler is the base class for all derived crawlers like the filesystem crawler
+and the mailcrawler. The SampleCrawler returns a deferred that already had a
+callback being called, so it will return at once.
+
+Returns a deferred that must be supplied with a callback method (and in
+most cases also an errback method).
+
+We create the sample crawler via the master's controller. The sample
+controller provides a simple method for this purpose.
+
+  >>> controller = master.controllers[0]
+  >>> controller.createAgent('crawl.sample', 'crawler01')
+
+In the next step we request the start of a job, again via the controller.
+
+  >>> controller.enterJob('sample', 'crawler01')
+
+The job is not executed immediately - we have to hand over control to
+the twisted reactor first.
+
+  >>> from cybertools.agent.tests import tester
+  >>> tester.iterate()
+  SampleCrawler is collecting.
+
diff --git a/agent/crawl/base.py b/agent/crawl/base.py
index aa1bf89..ac87708 100644
--- a/agent/crawl/base.py
+++ b/agent/crawl/base.py
@@ -1,54 +1,54 @@
-#
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-"""
-Crawl base and sample classes.
-
-$Id: base.py 
-"""
-
-from zope.interface import implements
-
-from cybertools.agent.base.agent import Agent
-from cybertools.agent.interfaces import ICrawler
-from cybertools.agent.components import agents
-from twisted.internet.defer import succeed
-
-
-class Crawler(object):
-
-    implements(ICrawler)
-
-    def __init__(self):
-        pass
-
-    def collect(self, filter=None):
-        d = defer.succeed([])
-        return d
-
-
-class SampleCrawler(Crawler):
-
-    def collect(self, filter=None):
-        print 'SampleCrawler is collecting.'
-        d = succeed([])
-        return d
-
-
-agents.register(SampleCrawler, Agent, name='crawl.sample')
-
+#
+#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Crawl base and sample classes.
+
+$Id: base.py
+"""
+
+from zope.interface import implements
+
+from cybertools.agent.base.agent import Master
+from cybertools.agent.core.agent import QueueableAgent
+from cybertools.agent.interfaces import ICrawler
+from cybertools.agent.components import agents
+from twisted.internet.defer import succeed
+
+
+class Crawler(QueueableAgent):
+
+    implements(ICrawler)
+
+    def process(self):
+        return self.collect()
+
+    def collect(self, filter=None):
+        d = defer.succeed([])
+        return d
+
+
+class SampleCrawler(Crawler):
+
+    def collect(self, filter=None):
+        print 'SampleCrawler is collecting.'
+        d = succeed([])
+        return d
+
+agents.register(SampleCrawler, Master, name='crawl.sample')
+
diff --git a/agent/crawl/mailcrawl.py b/agent/crawl/mail.py
similarity index 85%
rename from agent/crawl/mailcrawl.py
rename to agent/crawl/mail.py
index 30e049d..664a978 100644
--- a/agent/crawl/mailcrawl.py
+++ b/agent/crawl/mail.py
@@ -1,47 +1,46 @@
-#
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-"""
-Crawl base and sample classes.
-
-$Id: base.py 
-"""
-
-from zope.interface import implements
-
-from cybertools.agent.agent import Agent
-from cybertools.agent.interfaces import ICrawler
-from cybertools.agent.crawl.base import Crawler as BaseCrawler
-from cybertools.agent.components import agents
-from twisted.internet.defer import succeed
-
-
-class MailCrawler(Crawler):
-    
-    def __init__(self, params):
-        self.params = params
-
-    def collect(self, filter=None):
-        print 'MailCrawler is collecting.'
-        d = succeed([])
-        return d
-
-#would it make sense to register this one at the AdapterFactory?
-#or should it also just serve as base class for OutlookCrawler
-#KMailCrawler etc. ?
+#
+#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Crawl base and sample classes.
+
+$Id: base.py
+"""
+
+from zope.interface import implements
+
+from cybertools.agent.agent import Agent
+from cybertools.agent.crawl.base import Crawler
+from cybertools.agent.components import agents
+from twisted.internet.defer import succeed
+
+
+class MailCrawler(Crawler):
+
+    def __init__(self, params):
+        self.params = params
+
+    def collect(self, filter=None):
+        print 'MailCrawler is collecting.'
+        d = succeed([])
+        return d
+
+#would it make sense to register this one at the AdapterFactory?
+#or should it also just serve as base class for OutlookCrawler
+#KMailCrawler etc. ?
 #agents.register(MailCrawler, Agent, name='crawl.mail')
\ No newline at end of file
diff --git a/agent/tests.py b/agent/tests.py
index becc580..0e23dbf 100755
--- a/agent/tests.py
+++ b/agent/tests.py
@@ -42,9 +42,7 @@ def test_suite():
     testSuite = unittest.TestSuite((
             unittest.makeSuite(Test),
             DocFileSuite('README.txt', optionflags=flags),
-            DocFileSuite('core/README.txt', optionflags=flags),
             DocFileSuite('crawl/README.txt', optionflags=flags),
-            #DocFileSuite('transport/httpput.txt', optionflags=flags),
     ))
     return testSuite