changed the package names to something more suitable