refactored out com from the package names