refactor packages to be with standard package naming.