aritfactId and package naming conventions modified