diff --git a/build.gradle b/build.gradle
index f1b3a8b9..05513b30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,8 +61,8 @@ configure(javaprojects) {
 // -----------------------------------------------------------------------------
 configure(coreprojects) {
     erlangLicense = false
-    apply from: "$rootDir/buildSrc/bundlor.gradle"
-    apply from: "$rootDir/buildSrc/maven.gradle"
+    apply from: "$rootDir/gradle/bundlor.gradle"
+    apply from: "$rootDir/gradle/maven-deployment.gradle"
 
     dependencies {
         compile ('log4j:log4j:1.2.15') {
@@ -147,8 +147,8 @@ configure(sampleprojects) {
 // -----------------------------------------------------------------------------
 // import tasks related to releasing and managing the project
 // -----------------------------------------------------------------------------
-apply from: "$rootDir/buildSrc/release.gradle"
-apply from: "$rootDir/buildSrc/wrapper.gradle"
+apply from: "$rootDir/gradle/release.gradle"
+apply from: "$rootDir/gradle/wrapper.gradle"
 
 // -----------------------------------------------------------------------------
 // configuration for each individual core java subproject
diff --git a/buildSrc/bundlor.gradle b/gradle/bundlor.gradle
similarity index 100%
rename from buildSrc/bundlor.gradle
rename to gradle/bundlor.gradle
diff --git a/buildSrc/maven.gradle b/gradle/maven-deployment.gradle
similarity index 100%
rename from buildSrc/maven.gradle
rename to gradle/maven-deployment.gradle
diff --git a/buildSrc/release.gradle b/gradle/release.gradle
similarity index 100%
rename from buildSrc/release.gradle
rename to gradle/release.gradle
diff --git a/buildSrc/wrapper.gradle b/gradle/wrapper.gradle
similarity index 88%
rename from buildSrc/wrapper.gradle
rename to gradle/wrapper.gradle
index 0bedc9bd..8d651238 100644
--- a/buildSrc/wrapper.gradle
+++ b/gradle/wrapper.gradle
@@ -4,6 +4,6 @@ task wrapper(type: Wrapper) {
     gradleVersion = '0.9-preview-3'
     // place jar file and properties into a
     // subdirectory to avoid root dir clutter
-    jarPath = 'buildSrc/wrapper'
+    jarPath = 'gradle/wrapper'
 }
 
diff --git a/buildSrc/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from buildSrc/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/buildSrc/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 88%
rename from buildSrc/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
index 366f2106..de1213ad 100644
--- a/buildSrc/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Thu Jul 08 11:21:04 CEST 2010
+#Fri Jul 09 15:17:22 CEST 2010
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 5e33ff41..062dcf31 100755
--- a/gradlew
+++ b/gradlew
@@ -63,8 +63,8 @@ if $cygwin ; then
 fi
 
 STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-CLASSPATH=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.jar
-WRAPPER_PROPERTIES=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.properties
+CLASSPATH=`dirname "$0"`/gradle/wrapper/gradle-wrapper.jar
+WRAPPER_PROPERTIES=`dirname "$0"`/gradle/wrapper/gradle-wrapper.properties
 # Determine the Java command to use to start the JVM.
 if [ -z "$JAVACMD" ] ; then
     if [ -n "$JAVA_HOME" ] ; then
diff --git a/gradlew.bat b/gradlew.bat
index 8b3030d0..114aaa4c 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -101,8 +101,8 @@ set CMD_LINE_ARGS=%$
 @rem Setup the command line
 
 set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-set CLASSPATH=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.jar
-set WRAPPER_PROPERTIES=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.properties
+set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar
+set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties
 set JAVA_EXE=%JAVA_HOME%\bin\java.exe
 
 set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"