changed namespace and package names