Refactored package names and artifact id