diff --git a/.gitignore b/.gitignore
index fb620eab8991bf386870c7e6a184072794d7577f..a78744e0480cbc4fb1e384d1967cf445ab3a5e97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,5 @@
 *.pyc
 
 # Package Files #
-*.jar
 *.war
 *.ear
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f19637c3543863b1ce7ba2eee8c355fee29d479f..a7cc3c96a381c0a1f9e375dece712b95fb2f7f9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,13 +23,13 @@ catkin_add_env_hooks(15.rosjava SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
 # Have to install gradle here so we can retain executable permissions
 # If we do via setup.py with the data subsection, it loses permissions
 install(
-    PROGRAMS src/rosjava_build_tools/gradle/gradlew
-    DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
+    PROGRAMS gradle/gradlew
+    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/gradle
     )
 
 install(
-    DIRECTORY src/rosjava_build_tools/gradle/gradle
-    DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
+    DIRECTORY gradle/gradle
+    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/gradle
   )
 
 install(
@@ -44,7 +44,7 @@ install(
 
 set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY})
 if(NOT ROS_MAVEN_DEPLOYMENT_REPOSITORY)
-    set(ROS_MAVEN_DEPLOYMENT_REPOSITORY "${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_SHARE_DESTINATION}/maven")
+    set(ROS_MAVEN_DEPLOYMENT_REPOSITORY "${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_SHARE_DESTINATION}/repository")
 endif()
 file(WRITE ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}/rospack_nosubdirs "")
 install(FILES ${ROS_MAVEN_DEPLOYMENT_REPOSITORY}/rospack_nosubdirs
diff --git a/gradle/Readme.md b/gradle/Readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..0c5781dcae89b3efcdd015a9d18d972497cdfc74
--- /dev/null
+++ b/gradle/Readme.md
@@ -0,0 +1,5 @@
+It is currently the gradle wrapper supporting gradle 4.6
+
+When creating the tarball, simply run the following command in any gradle projects root.
+
+> tar -cvzf gradle.tar.gz gradlew gradle gradle.properties
diff --git a/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar
rename to gradle/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties
rename to gradle/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/rosjava_build_tools/gradle/gradlew b/gradle/gradlew
similarity index 100%
rename from src/rosjava_build_tools/gradle/gradlew
rename to gradle/gradlew
diff --git a/package.xml b/package.xml
index c8872561019fe8a93611b7b0ba9c696ad742d6fc..06c3a94b045707c1d81bab04f95a2ec14670501e 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosjava_build_tools</name>
-  <version>0.3.4</version>
+  <version>0.3.5</version>
   <description>
     Simple tools and catkin modules for rosjava development.
   </description>
diff --git a/src/rosjava_build_tools/create_package.py b/src/rosjava_build_tools/create_package.py
index 42cea2cd8c431064230e2bf64482363df2c0cb0d..a5e19e8a16352f4d0c6e96b4fac0f9a36eaaae28 100644
--- a/src/rosjava_build_tools/create_package.py
+++ b/src/rosjava_build_tools/create_package.py
@@ -100,7 +100,7 @@ def populate_repo(repo_path, package_type):
 
 
 def create_gradle_wrapper(repo_path):
-    gradle_binary = os.path.join(os.path.dirname(__file__), 'gradle', 'gradlew')
+    gradle_binary = os.path.join(os.path.dirname(__file__),'..', '..', '..', 'share', 'rosjava_build_tools', 'gradle', 'gradlew')
     cmd = [gradle_binary, '-p', repo_path, 'wrapper']
     console.pretty_print("Creating gradle wrapper: ", console.cyan)
     console.pretty_println("%s" % ' '.join(cmd), console.yellow)
diff --git a/src/rosjava_build_tools/gradle/Readme.md b/src/rosjava_build_tools/gradle/Readme.md
deleted file mode 100644
index c2b6daaab2a1e7d234f1b891d5f3594ea2562a9a..0000000000000000000000000000000000000000
--- a/src/rosjava_build_tools/gradle/Readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This is not installed, but it gets used to generate the gradle wrapper for a project.
-
-It is currently the gradle wrapper supporting gradle 4.6