diff --git a/themis.fields.egg-info/SOURCES.txt b/themis.fields.egg-info/SOURCES.txt
index 29c16b1..2cd92c1 100644
--- a/themis.fields.egg-info/SOURCES.txt
+++ b/themis.fields.egg-info/SOURCES.txt
@@ -1,14 +1,15 @@
 setup.cfg
 setup.py
+themis/__init__.py
 themis.fields.egg-info/PKG-INFO
 themis.fields.egg-info/SOURCES.txt
 themis.fields.egg-info/dependency_links.txt
 themis.fields.egg-info/entry_points.txt
 themis.fields.egg-info/not-zip-safe
 themis.fields.egg-info/top_level.txt
-themisfields/__init__.py
-themisfields/editors.py
-themisfields/handlers.py
-themisfields/interfaces.py
-themisfields/vocabs.py
-themisfields/widgets.py
\ No newline at end of file
+themis/fields/__init__.py
+themis/fields/editors.py
+themis/fields/handlers.py
+themis/fields/interfaces.py
+themis/fields/vocabs.py
+themis/fields/widgets.py
\ No newline at end of file
diff --git a/themis.fields.egg-info/top_level.txt b/themis.fields.egg-info/top_level.txt
index 9c48c49..bba520c 100644
--- a/themis.fields.egg-info/top_level.txt
+++ b/themis.fields.egg-info/top_level.txt
@@ -1 +1 @@
-themisfields
+themis
diff --git a/themis/__init__.py b/themis/__init__.py
new file mode 100644
index 0000000..f48ad10
--- /dev/null
+++ b/themis/__init__.py
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
diff --git a/themisfields/__init__.py b/themis/fields/__init__.py
similarity index 91%
rename from themisfields/__init__.py
rename to themis/fields/__init__.py
index c790a6f..3b34f4f 100644
--- a/themisfields/__init__.py
+++ b/themis/fields/__init__.py
@@ -4,27 +4,27 @@ from zope.schema import Choice, Field, List, Date, Orderable
 from zope.schema.interfaces import IFromUnicode, IChoice
 from zope.schema.interfaces import WrongType
 
-from themisfields.interfaces import ICommission
-from themisfields.interfaces import ICommissions
-from themisfields.vocabs import CommissionsSource
+from themis.fields.interfaces import ICommission
+from themis.fields.interfaces import ICommissions
+from themis.fields.vocabs import CommissionsSource
 
-from themisfields.interfaces import IDeputy, IDeputies
-from themisfields.vocabs import DeputiesSource
+from themis.fields.interfaces import IDeputy, IDeputies
+from themis.fields.vocabs import DeputiesSource
 
-from themisfields.interfaces import IMinistry, IMinistries
-from themisfields.vocabs import MinistriesSource
+from themis.fields.interfaces import IMinistry, IMinistries
+from themis.fields.vocabs import MinistriesSource
 
-from themisfields.interfaces import IDeputyOrMinistry, IDeputiesOrMinistries
-from themisfields.vocabs import DeputiesAndMinistriesSource
+from themis.fields.interfaces import IDeputyOrMinistry, IDeputiesOrMinistries
+from themis.fields.vocabs import DeputiesAndMinistriesSource
 
-from themisfields.interfaces import IContact, IContacts
-from themisfields.vocabs import ContactsSource
+from themis.fields.interfaces import IContact, IContacts
+from themis.fields.vocabs import ContactsSource
 
-from themisfields.interfaces import IDateOnly
-from themisfields.interfaces import ISubjects, ILegisTerm, IList
+from themis.fields.interfaces import IDateOnly
+from themis.fields.interfaces import ISubjects, ILegisTerm, IList
 
-from themisfields.vocabs import SubjectsSource
-from themisfields.vocabs import LegislativeTermsSource
+from themis.fields.vocabs import SubjectsSource
+from themis.fields.vocabs import LegislativeTermsSource
 
 
 class Commission(Field):
diff --git a/themisfields/configure.zcml b/themis/fields/configure.zcml
similarity index 94%
rename from themisfields/configure.zcml
rename to themis/fields/configure.zcml
index 33f944c..bd152cc 100644
--- a/themisfields/configure.zcml
+++ b/themis/fields/configure.zcml
@@ -1,7 +1,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="themisfields">
+    i18n_domain="themis.fields">
 
     <!-- Configure plone.supermodel support if available -->
     <include zcml:condition="installed plone.supermodel"
diff --git a/themisfields/editors.py b/themis/fields/editors.py
similarity index 75%
rename from themisfields/editors.py
rename to themis/fields/editors.py
index 11c2fcb..b695f10 100644
--- a/themisfields/editors.py
+++ b/themis/fields/editors.py
@@ -2,15 +2,15 @@ from zope import interface, component, schema
 from zope.schema import interfaces as schema_ifaces
 from plone.schemaeditor import interfaces as editor_ifaces
 
-from themisfields import interfaces
-from themisfields import Commission, Commissions
-from themisfields import DateOnly
-from themisfields import Subjects
-from themisfields import LegisTerm
-from themisfields import Contact, Contacts
-from themisfields import Deputy, Deputies
-from themisfields import Ministry, Ministries
-from themisfields import DeputyOrMinistry, DeputiesOrMinistries
+from themis.fields import interfaces
+from themis.fields import Commission, Commissions
+from themis.fields import DateOnly
+from themis.fields import Subjects
+from themis.fields import LegisTerm
+from themis.fields import Contact, Contacts
+from themis.fields import Deputy, Deputies
+from themis.fields import Ministry, Ministries
+from themis.fields import DeputyOrMinistry, DeputiesOrMinistries
 from plone.schemaeditor.fields import FieldFactory
 
 @interface.implementer(editor_ifaces.IFieldEditFormSchema)
diff --git a/themisfields/editors.zcml b/themis/fields/editors.zcml
similarity index 64%
rename from themisfields/editors.zcml
rename to themis/fields/editors.zcml
index 452662f..75f87d4 100644
--- a/themisfields/editors.zcml
+++ b/themis/fields/editors.zcml
@@ -1,69 +1,69 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="themisfields">
+    i18n_domain="themis.fields">
 
     <utility
-        name="themisfields.Commission"
+        name="themis.fields.Commission"
         component=".editors.CommissionFactory"
         />
 
     <utility
-        name="themisfields.DateOnly"
+        name="themis.fields.DateOnly"
         component=".editors.DateOnlyFactory"
         />
 
     <utility
-        name="themisfields.Subjects"
+        name="themis.fields.Subjects"
         component=".editors.SubjectsFactory"
         />
 
     <utility
-        name="themisfields.Commissions"
+        name="themis.fields.Commissions"
         component=".editors.CommissionsFactory"
         />
 
     <utility
-        name="themisfields.Contacts"
+        name="themis.fields.Contacts"
         component=".editors.ContactsFactory"
         />
 
     <utility
-        name="themisfields.Contact"
+        name="themis.fields.Contact"
         component=".editors.ContactFactory"
         />
 
     <utility
-        name="themisfields.Deputy"
+        name="themis.fields.Deputy"
         component=".editors.DeputyFactory"
         />
 
     <utility
-        name="themisfields.Deputies"
+        name="themis.fields.Deputies"
         component=".editors.DeputiesFactory"
         />
 
     <utility
-        name="themisfields.Ministry"
+        name="themis.fields.Ministry"
         component=".editors.MinistryFactory"
         />
 
     <utility
-        name="themisfields.Ministries"
+        name="themis.fields.Ministries"
         component=".editors.MinistriesFactory"
         />
 
     <utility
-        name="themisfields.DeputyOrMinistry"
+        name="themis.fields.DeputyOrMinistry"
         component=".editors.DeputyOrMinistryFactory"
         />
 
     <utility
-        name="themisfields.DeputiesOrMinistries"
+        name="themis.fields.DeputiesOrMinistries"
         component=".editors.DeputiesOrMinistriesFactory"
         />
 
     <utility
-        name="themisfields.LegisTerm"
+        name="themis.fields.LegisTerm"
         component=".editors.LegisTermFactory"
         />
 
diff --git a/themisfields/handlers.py b/themis/fields/handlers.py
similarity index 82%
rename from themisfields/handlers.py
rename to themis/fields/handlers.py
index 2430f30..7304247 100644
--- a/themisfields/handlers.py
+++ b/themis/fields/handlers.py
@@ -11,14 +11,14 @@ if HAVE_SUPERMODEL:
     from zope.component import adapts
     from plone.supermodel.interfaces import IToUnicode
 
-    from themisfields import Commission, Commissions
-    from themisfields import DateOnly
-    from themisfields import Subjects
-    from themisfields import Deputy, Deputies
-    from themisfields import Ministry, Ministries
-    from themisfields import DeputyOrMinistry, DeputiesOrMinistries
-    from themisfields import Contact, Contacts
-    from themisfields import LegisTerm
+    from themis.fields import Commission, Commissions
+    from themis.fields import DateOnly
+    from themis.fields import Subjects
+    from themis.fields import Deputy, Deputies
+    from themis.fields import Ministry, Ministries
+    from themis.fields import DeputyOrMinistry, DeputiesOrMinistries
+    from themis.fields import Contact, Contacts
+    from themis.fields import LegisTerm
 
     class CommissionHandler_(BaseHandler):
         pass
diff --git a/themisfields/handlers.zcml b/themis/fields/handlers.zcml
similarity index 65%
rename from themisfields/handlers.zcml
rename to themis/fields/handlers.zcml
index 61e5bc9..1f7228a 100644
--- a/themisfields/handlers.zcml
+++ b/themis/fields/handlers.zcml
@@ -1,72 +1,72 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="themisfields">
+    i18n_domain="themis.fields">
 
     <!-- plone.supermodel configuration -->
 
     <utility
         component=".handlers.CommissionHandler"
-        name="themisfields.Commission"
+        name="themis.fields.Commission"
         />
 
     <utility
         component=".handlers.CommissionsHandler"
-        name="themisfields.Commissions"
+        name="themis.fields.Commissions"
         />
 
     <utility
         component=".handlers.DateOnlyHandler"
-        name="themisfields.DateOnly"
+        name="themis.fields.DateOnly"
         />
 
     <utility
         component=".handlers.SubjectsHandler"
-        name="themisfields.Subjects"
+        name="themis.fields.Subjects"
         />
 
     <utility
         component=".handlers.ContactHandler"
-        name="themisfields.Contact"
+        name="themis.fields.Contact"
         />
 
     <utility
         component=".handlers.ContactsHandler"
-        name="themisfields.Contacts"
+        name="themis.fields.Contacts"
         />
 
     <utility
         component=".handlers.DeputyHandler"
-        name="themisfields.Deputy"
+        name="themis.fields.Deputy"
         />
 
     <utility
         component=".handlers.DeputiesHandler"
-        name="themisfields.Deputies"
+        name="themis.fields.Deputies"
         />
 
     <utility
         component=".handlers.MinistryHandler"
-        name="themisfields.Ministry"
+        name="themis.fields.Ministry"
         />
 
     <utility
         component=".handlers.MinistriesHandler"
-        name="themisfields.Ministries"
+        name="themis.fields.Ministries"
         />
 
     <utility
         component=".handlers.DeputyOrMinistryHandler"
-        name="themisfields.DeputyOrMinistry"
+        name="themis.fields.DeputyOrMinistry"
         />
 
     <utility
         component=".handlers.DeputiesOrMinistriesHandler"
-        name="themisfields.DeputiesOrMinistries"
+        name="themis.fields.DeputiesOrMinistries"
         />
 
     <utility
         component=".handlers.LegisTermHandler"
-        name="themisfields.LegisTerm"
+        name="themis.fields.LegisTerm"
         />
 
 </configure>
diff --git a/themisfields/interfaces.py b/themis/fields/interfaces.py
similarity index 100%
rename from themisfields/interfaces.py
rename to themis/fields/interfaces.py
diff --git a/themisfields/orderedselectandadd_display.pt b/themis/fields/orderedselectandadd_display.pt
similarity index 100%
rename from themisfields/orderedselectandadd_display.pt
rename to themis/fields/orderedselectandadd_display.pt
diff --git a/themisfields/orderedselectandadd_input.pt b/themis/fields/orderedselectandadd_input.pt
similarity index 100%
rename from themisfields/orderedselectandadd_input.pt
rename to themis/fields/orderedselectandadd_input.pt
diff --git a/themisfields/vocabs.py b/themis/fields/vocabs.py
similarity index 100%
rename from themisfields/vocabs.py
rename to themis/fields/vocabs.py
diff --git a/themisfields/widgets.py b/themis/fields/widgets.py
similarity index 91%
rename from themisfields/widgets.py
rename to themis/fields/widgets.py
index f86c3d8..e60e94b 100644
--- a/themisfields/widgets.py
+++ b/themis/fields/widgets.py
@@ -7,16 +7,16 @@ from z3c.form.interfaces import IFormLayer, IFieldWidget
 from z3c.form.widget import FieldWidget
 from collective.z3cform.datetimewidget import DateWidget
 
-from themisfields.interfaces import ICommission, ICommissions
+from themis.fields.interfaces import ICommission, ICommissions
 from zope.schema.interfaces import IDate, IContextSourceBinder, ISource
-from themisfields.interfaces import IDateOnly
-from themisfields.interfaces import ISubjects
-from themisfields.interfaces import ILegisTerm
-from themisfields.interfaces import IContact, IContacts
-from themisfields.interfaces import IDeputy, IDeputies
-from themisfields.interfaces import IMinistry, IMinistries
-from themisfields.interfaces import IDeputyOrMinistry, IDeputiesOrMinistries
-from themisfields.interfaces import IOrderedSelectAndAddWidget
+from themis.fields.interfaces import IDateOnly
+from themis.fields.interfaces import ISubjects
+from themis.fields.interfaces import ILegisTerm
+from themis.fields.interfaces import IContact, IContacts
+from themis.fields.interfaces import IDeputy, IDeputies
+from themis.fields.interfaces import IMinistry, IMinistries
+from themis.fields.interfaces import IDeputyOrMinistry, IDeputiesOrMinistries
+from themis.fields.interfaces import IOrderedSelectAndAddWidget
 
 from plone.formwidget.autocomplete.interfaces import IAutocompleteWidget
 from plone.formwidget.autocomplete.widget import AutocompleteSelectionWidget
diff --git a/themisfields/widgets.zcml b/themis/fields/widgets.zcml
similarity index 98%
rename from themisfields/widgets.zcml
rename to themis/fields/widgets.zcml
index ab348c4..b01ae10 100644
--- a/themisfields/widgets.zcml
+++ b/themis/fields/widgets.zcml
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:z3c="http://namespaces.zope.org/z3c"
     xmlns:browser="http://namespaces.zope.org/browser"
-    i18n_domain="themisfields">
+    i18n_domain="themis.fields">
 
     <include package="z3c.form" file="meta.zcml" />
     <include package="z3c.form" />