restructure lib for proper define namespacing
update imports for new structure