refactored ubersmith data module
updated ubersmith module