Changed namespaces structure, added shell and singletoner helpers