move packages around
update imports so tests pass