Refactoring package structure and adopting gradle