refactoring support utils
moved everything under my github domain to get around issues with imports