some refactoring with new package names