Refactored main package name