Refactoring package name
Resolving compiler warnings