fixed imports, horribly bumped the version

CHANGELOG.md

-# v2.1.12
+# v2.2.1
 
 * added [TerminableThread](satella/coding/concurrent/thread.py)
+* **COMPATIBILITY BREAKERS**
+    * `Singleton` and family are meant to be imported from `satella.coding.structures`
+    * `CallableGroup` is meant to be imported from `satella.coding.concurrent`
 
 # v2.1.11
 

docs/coding/structures.rst

@@ -9,7 +9,7 @@ Heap
 This essentially allows you to have a heap object that will pretty much
 behave like the `heapq <https://docs.python.org/2/library/heapq.html>` library.
 
-.. autoclass:: satella.coding.Heap
+.. autoclass:: satella.coding.structures.Heap
     :members:
 
 TimeBasedHeap
@@ -18,7 +18,7 @@ TimeBasedHeap
 Time-based heap is a good structure if you have many callbacks set to fire at a particular
 time in the future. It functions very like a normal Heap.
 
-.. autoclass:: satella.coding.TimeBasedHeap
+.. autoclass:: satella.coding.structures.TimeBasedHeap
     :members:
 
 typednamedtuple
@@ -27,28 +27,23 @@ typednamedtuple
 It's a named tuple, but it has typed fields. You will get a TypeError if you
 try to assign something else there.
 
-.. autofunction:: satella.coding.typednamedtuple
-
-
+.. autofunction:: satella.coding.structures.typednamedtuple
 
 OmniHashableMixin
 -----------------
 
 If you need quick __hash__ and __eq__ operators from listed fields of the class.
 
-.. autoclass:: satella.coding.OmniHashableMixin
+.. autoclass:: satella.coding.structures.OmniHashableMixin
     :members:
 
-.. autofunction:: satella.coding.typednamedtuple
-
-
 Singleton
 ---------
 
 Makes the resulting object's ``__init__()`` be called at most once, then caches the object and returns the same
 upon each instantiation.
 
-.. autofunction:: satella.coding.Singleton
+.. autofunction:: satella.coding.structures.Singleton
 
 DictObject
 ----------
@@ -56,10 +51,10 @@ DictObject
 DictObject is an object constructed out of a dict, that allows it's values to be obtained as getattr(), and not only
 getitem().
 
-.. autoclass:: satella.coding.DictObject
+.. autoclass:: satella.coding.structures.DictObject
     :members:
 
 You can use the following function to recursively turn every dict into a DictObject
 
-.. autofunction:: satella.coding.apply_dict_object
+.. autofunction:: satella.coding.structures.apply_dict_object
 

satella/__init__.py

 # coding=UTF-8
-__version__ = '2.1.12rc1'
+__version__ = '2.2.1rc1'

satella/coding/__init__.py

@@ -3,21 +3,16 @@ Just useful objects to make your coding nicer every day
 """
 
 from .algos import merge_dicts
-from .concurrent import Monitor, RMonitor, CallableGroup
+from .concurrent import Monitor, RMonitor
 from .recast_exceptions import rethrow_as, silence_excs
-from .structures import TimeBasedHeap, Heap, typednamedtuple, OmniHashableMixin, Singleton, \
-    DictObject, apply_dict_object
 from .decorators import precondition, for_argument, PreconditionError
 from .fun_static import static_var
 
 
 __all__ = [
-    'typednamedtuple', 'OmniHashableMixin',
-                       'TimeBasedHeap', 'Heap', 'CallableGroup', 'DictObject', 'apply_dict_object',
-    'Monitor', 'RMonitor', 'CallableGroup', 'merge_dicts',
+    'Monitor', 'RMonitor', 'merge_dicts',
     'for_argument',
     'precondition', 'PreconditionError',
     'rethrow_as', 'silence_excs',
-    'Singleton',
     'static_var'
 ]

tests/test_coding/test_concurrent.py

@@ -3,8 +3,7 @@ from __future__ import print_function, absolute_import, division
 import unittest
 import time
 
-from satella.coding import CallableGroup
-from satella.coding.concurrent import TerminableThread
+from satella.coding.concurrent import TerminableThread, CallableGroup
 
 
 class TestCallableGroup(unittest.TestCase):

tests/test_coding/test_locked_dataset.py

 import unittest
 
-from satella.coding import LockedDataset
+from satella.coding.concurrent import LockedDataset
 from satella.exceptions import ResourceLocked, ResourceNotLocked
 
 

tests/test_coding/test_singleton.py

@@ -3,7 +3,7 @@ from __future__ import print_function, absolute_import, division
 
 import unittest
 
-from satella.coding import Singleton
+from satella.coding.structures import Singleton
 
 
 class TestSingleton(unittest.TestCase):

tests/test_coding/test_structures.py

@@ -6,8 +6,9 @@ import unittest
 
 import mock
 
-from satella.coding import TimeBasedHeap, Heap, CallableGroup, typednamedtuple, \
+from satella.coding.structures import TimeBasedHeap, Heap, typednamedtuple, \
     OmniHashableMixin, DictObject, apply_dict_object
+from satella.coding.concurrent import CallableGroup
 
 
 class TestCallableGroup(unittest.TestCase):