Refactoring package name to avoid conflicts