resolve package refactor/renaming problems