some dependency cleanup and minor namespace refactor