Changed package name to conform to package naming standards