additional refactoring by Jenya

re-naming packages