Refactored package name and solved gradle properties