Got rid of com in package names