Update cluster controls and correct namespace imports

setuptools needs correct namespace setup in __init__py to make
buildout conform