Refactoring/renaming and gradle fixes