cleaning and update namespacing
changes reflecting latest refactoring in core refinery clientside