Add missing namespaces
Cleanup, namespace renaming, remove controller from client, create a helper class