more cleanup. lets get rid of relative imports.