diff --git a/README.md b/README.md
index 4f829ce02e..cad07ecf58 100644
--- a/README.md
+++ b/README.md
@@ -54,18 +54,18 @@ java -jar ethereumj-core/build/libs/ethereumj-core-*-all.jar
 ```
 > git clone https://github.com/ethereum/ethereumj
 > cd ethereumj
-> ./gradlew run [-PmainClass=<sample class>]
+> ./gradlew ethereumj-cli:run
 ```
 
 ##### Optional samples to try:
 ```
-./gradlew run -PmainClass=org.ethereum.samples.BasicSample
-./gradlew run -PmainClass=org.ethereum.samples.FollowAccount
-./gradlew run -PmainClass=org.ethereum.samples.PendingStateSample
-./gradlew run -PmainClass=org.ethereum.samples.PriceFeedSample
-./gradlew run -PmainClass=org.ethereum.samples.PrivateMinerSample
-./gradlew run -PmainClass=org.ethereum.samples.TestNetSample
-./gradlew run -PmainClass=org.ethereum.samples.TransactionBomb
+./gradlew ethereumj-samples:run -PmainClass=org.ethereum.samples.BasicSample
+./gradlew ethereumj-samples:run -PmainClass=org.ethereum.samples.FollowAccount
+./gradlew ethereumj-samples:run -PmainClass=org.ethereum.samples.PendingStateSample
+./gradlew ethereumj-samples:run -PmainClass=org.ethereum.samples.PriceFeedSample
+./gradlew ethereumj-samples:run -PmainClass=org.ethereum.samples.PrivateMinerSample
+./gradlew ethereumj-samples:run -PmainClass=org.ethereum.samples.TestNetSample
+./gradlew ethereumj-samples:run -PmainClass=org.ethereum.samples.TransactionBomb
 ```
 
 ##### Importing project to IntelliJ IDEA: 
diff --git a/build.gradle b/build.gradle
index 370dd36d01..ae86c5f387 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,18 @@
-wrapper.gradleVersion = '2.2.1'
+
+buildscript {
+    repositories {
+        jcenter()
+        maven { url 'http://repo.spring.io/plugins-release-local' }
+    }
+    dependencies {
+        classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
+    }
+}
 
 allprojects {
     apply plugin: 'eclipse'
+    apply plugin: 'propdeps-maven'
+
     if (JavaVersion.current().isJava8Compatible()) {
         //Disable lint of javadoc until someone fixes all the html
         tasks.withType(Javadoc) {
@@ -10,31 +21,60 @@ allprojects {
     }
 }
 
-def gitCurBranch() {
-    def branchName = System.getenv('TRAVIS_BRANCH')
-
-    if (branchName) return branchName
-    def process = "git rev-parse --abbrev-ref HEAD".execute()
-    return process.text.trim()
-}
-
 subprojects {
     apply plugin: 'java'
 
-    def config = new ConfigSlurper().parse(new File("$projectDir/src/main/resources/version.properties").toURI().toURL())
-
     group = 'org.ethereum'
 
-    version = config.versionNumber + ("master" == gitCurBranch() ? "-RELEASE" : "-SNAPSHOT")
+    compileJava {
+        sourceCompatibility = 1.7
+        targetCompatibility = 1.7
 
-    println("Building version: " + version + " (from branch " + gitCurBranch() + ")")
-
-    compileJava.options.encoding = 'UTF-8'
-    compileJava.options.compilerArgs << '-XDignore.symbol.file'
+        options.encoding = 'UTF-8'
+        options.compilerArgs << '-XDignore.symbol.file'
+    }
 
     compileTestJava.options.encoding = 'UTF-8'
 
     repositories {
         jcenter()
+        maven {
+            url "http://dl.bintray.com/ethereum/maven"
+        }
+    }
+}
+
+ext {
+    slf4jVersion = '1.7.7'
+    leveldbVersion = '0.7'
+    scastleVersion = '1.51.0.0'
+    log4jVersion = '1.2.17'
+    springVersion = '4.2.0.RELEASE'
+    hibernateVersion = '4.3.7.Final'
+    junitVersion = '4.11'
+}
+
+project(':ethereumj-core') {
+}
+
+project(':ethereumj-cli') {
+    dependencies {
+        compile project(':ethereumj-core')
+    }
+}
+
+project(':ethereumj-samples') {
+    dependencies {
+        compile project(':ethereumj-core')
     }
 }
+
+project(':ethereumj-tck') {
+    dependencies {
+        compile project(':ethereumj-core')
+    }
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.12'
+}
diff --git a/ethereumj-cli/build.gradle b/ethereumj-cli/build.gradle
new file mode 100644
index 0000000000..e274004d86
--- /dev/null
+++ b/ethereumj-cli/build.gradle
@@ -0,0 +1,21 @@
+
+plugins {
+    id 'application'
+}
+
+
+dependencies {
+
+    compile "log4j:log4j:${log4jVersion}"
+    compile "org.slf4j:slf4j-log4j12:${slf4jVersion}"
+    compile "log4j:apache-log4j-extras:${log4jVersion}"
+
+    optional "commons-logging:commons-logging:1.0"
+    optional "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
+}
+
+
+mainClassName = 'org.ethereum.Start'
+applicationDefaultJvmArgs = ["-server", "-Xss32m", "-XX:-OmitStackTraceInFastThrow"]
+
+apply from: "${rootProject.projectDir}/gradle/networkRunTasks.gradle"
diff --git a/ethereumj-core/src/main/java/org/ethereum/Start.java b/ethereumj-cli/src/main/java/org/ethereum/Start.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/Start.java
rename to ethereumj-cli/src/main/java/org/ethereum/Start.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/cli/CLIInterface.java b/ethereumj-cli/src/main/java/org/ethereum/cli/CLIInterface.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/cli/CLIInterface.java
rename to ethereumj-cli/src/main/java/org/ethereum/cli/CLIInterface.java
diff --git a/ethereumj-cli/src/main/resources/log4j.properties b/ethereumj-cli/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..65ca57b445
--- /dev/null
+++ b/ethereumj-cli/src/main/resources/log4j.properties
@@ -0,0 +1,42 @@
+# Root logger option
+log4j.rootLogger=DEBUG, stdout, file
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss.SSS} %p [%c{1}]  %m%n
+log4j.appender.stdout.Threshold=INFO
+
+log4j.appender.file=org.apache.log4j.rolling.RollingFileAppender
+log4j.appender.file.file=./logs/ethereum.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern= %d{HH:mm:ss.SSS} %p [%c{1}]  %m%n
+log4j.appender.file.RollingPolicy=org.apache.log4j.rolling.TimeBasedRollingPolicy
+log4j.appender.file.RollingPolicy.FileNamePattern=./logs/ethereum_%d{yyyy-MM-dd}_h%d{HH}.log
+log4j.appender.file.Threshold=TRACE
+
+# filter noisy classes
+log4j.logger.general =    DEBUG
+log4j.logger.net = DEBUG
+log4j.logger.wire =  ERROR
+log4j.logger.discover = DEBUG
+log4j.logger.db =  DEBUG
+log4j.logger.sync = TRACE
+log4j.logger.blockqueue = DEBUG
+log4j.logger.repository = INFO
+log4j.logger.blockchain = INFO
+log4j.logger.mine = DEBUG
+log4j.logger.VM =    ERROR
+log4j.logger.trie =  ERROR
+log4j.logger.state = WARN
+log4j.logger.execute = ERROR
+log4j.logger.rlp = ERROR
+
+log4j.logger.TCK-Test = ERROR
+
+log4j.logger.java.nio = ERROR
+log4j.logger.io.netty = ERROR
+log4j.logger.org.springframework = ERROR
+log4j.logger.org.hibernate = ERROR
+log4j.logger.hsqldb.db = ERROR
diff --git a/ethereumj-core/build.gradle b/ethereumj-core/build.gradle
index 89b564c999..2f5ab68378 100644
--- a/ethereumj-core/build.gradle
+++ b/ethereumj-core/build.gradle
@@ -1,42 +1,26 @@
 import java.text.SimpleDateFormat
 
 buildscript {
-    repositories {
-        jcenter()
-        maven { url 'http://repo.spring.io/plugins-release-local' }
-    }
     dependencies {
-        classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1'
     }
 }
 
 plugins {
-    id 'application'
     id 'jacoco'
-    id 'com.github.johnrengelman.shadow' version '1.2.0'
+    id 'com.github.johnrengelman.shadow' version '1.2.3'
     id 'com.github.kt3k.coveralls' version '2.0.1x'
     id 'com.jfrog.bintray' version '1.0'
 }
 
-apply plugin: 'propdeps-maven'
 apply plugin: 'com.jfrog.artifactory-upload'
 
-
 repositories {
-    maven {
-        url "http://dl.bintray.com/ethereum/maven"
-    }
 }
 
-sourceCompatibility = 1.7
-
-mainClassName = 'org.ethereum.Start'
-applicationDefaultJvmArgs = ["-server", "-Xss32m", "-XX:-OmitStackTraceInFastThrow"]
-if (project.hasProperty("mainClass")) {
-    mainClassName = mainClass
-}
+def config = new ConfigSlurper().parse(new File("$projectDir/src/main/resources/version.properties").toURI().toURL())
 
+version = config.versionNumber + ("master" == gitCurBranch() ? "-RELEASE" : "-SNAPSHOT")
 
 ext.generatedSrcDir = file('src/gen/java')
 
@@ -47,42 +31,6 @@ tasks.withType(JavaCompile){
     options.warnings = false
 }
 
-task runMorden (type: JavaExec) {
-    main = mainClassName
-    classpath = sourceSets.main.runtimeClasspath
-    jvmArgs = applicationDefaultJvmArgs + '-Dethereumj.conf.res=morden.conf'
-}
-
-task runTest (type: JavaExec) {
-    main = mainClassName
-    classpath = sourceSets.main.runtimeClasspath
-    jvmArgs = applicationDefaultJvmArgs + '-Dethereumj.conf.res=test.conf'
-}
-
-/**
- *  This is TCK test command line option,
- *  to run the test:
- *     gradle tckRun -PfilePath=[ file path]
- *      e.g: gradle tckRun -PfilePath=E:\temp\test-case.json
- */
-task tckRun(type:JavaExec){
-
-    if (project.hasProperty("filePath")) {
-        args = ["filerun", "$filePath"]
-        jvmArgs = ["-Xss32M"]
-    }
-
-    if (project.hasProperty("content")) {
-        args = ["content", "$content"]
-        jvmArgs = ["-Xss32M"]
-    }
-
-    main = "org.ethereum.tck.RunTck"
-    classpath = sourceSets.main.runtimeClasspath
-}
-
-
-
 test {
 
     beforeTest { descriptor ->
@@ -99,16 +47,6 @@ test {
     systemProperty "file.encoding", "UTF-8"
 }
 
-ext {
-    slf4jVersion = '1.7.7'
-    leveldbVersion = '0.7'
-    scastleVersion = '1.51.0.0'
-    log4jVersion = '1.2.17'
-    springVersion = '4.2.0.RELEASE'
-    hibernateVersion = '4.3.7.Final'
-    junitVersion = '4.11'
-}
-
 dependencies {
     compile "io.netty:netty-all:4.0.30.Final"
     compile "com.madgag.spongycastle:core:${scastleVersion}" // for SHA3 and SECP256K1
@@ -122,7 +60,6 @@ dependencies {
     compile "com.cedarsoftware:java-util:1.8.0" // for deep equals
     compile "org.javassist:javassist:3.15.0-GA"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"
-    compile "log4j:log4j:${log4jVersion}"
     compile "org.codehaus.jackson:jackson-mapper-asl:1.9.13"
     compile "com.google.code.findbugs:jsr305:3.0.0"
     compile "com.fasterxml.jackson.core:jackson-databind:2.5.1"
@@ -141,14 +78,10 @@ dependencies {
 
     compile "org.mapdb:mapdb:2.0-beta12"
 
-    compile "org.slf4j:slf4j-log4j12:${slf4jVersion}"
-    compile "log4j:apache-log4j-extras:${log4jVersion}"
-
     compile("com.googlecode.json-simple:json-simple:1.1.1") {
         exclude group: 'junit', module: 'junit'
     }
-    optional "commons-logging:commons-logging:1.0"
-    optional "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
+
     testCompile "junit:junit:${junitVersion}"
     testCompile "org.springframework:spring-test:${springVersion}"
 }
diff --git a/ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java b/ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java
index 742ab217cd..c9269023b6 100644
--- a/ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java
+++ b/ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java
@@ -13,7 +13,6 @@
 import org.ethereum.manager.AdminInfo;
 import org.ethereum.trie.Trie;
 import org.ethereum.trie.TrieImpl;
-import org.ethereum.util.AdvancedDeviceUtils;
 import org.ethereum.util.ByteUtil;
 import org.ethereum.util.RLP;
 import org.ethereum.validator.DependentBlockHeaderRule;
@@ -485,10 +484,6 @@ public synchronized boolean add(Block block) {
         if (!Arrays.equals(bestBlock.getHash(),
                 block.getParentHash())) return false;
 
-        if (block.getNumber() >= config.traceStartBlock() && config.traceStartBlock() != -1) {
-            AdvancedDeviceUtils.adjustDetailedTracing(block.getNumber());
-        }
-
         List<TransactionReceipt> receipts = processBlock(block);
 
         // Sanity checks
diff --git a/ethereumj-core/src/main/java/org/ethereum/util/AdvancedDeviceUtils.java b/ethereumj-core/src/main/java/org/ethereum/util/AdvancedDeviceUtils.java
deleted file mode 100644
index f5e0b9ee3a..0000000000
--- a/ethereumj-core/src/main/java/org/ethereum/util/AdvancedDeviceUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.ethereum.util;
-
-import org.apache.log4j.PropertyConfigurator;
-
-import java.net.URL;
-
-import static org.ethereum.config.SystemProperties.CONFIG;
-
-/**
- * @author Roman Mandeleil
- * @since 25.07.2014
- */
-public class AdvancedDeviceUtils {
-
-    public static void adjustDetailedTracing(long blockNum) {
-        // here we can turn on the detail tracing in the middle of the chain
-        if (blockNum >= CONFIG.traceStartBlock() && CONFIG.traceStartBlock() != -1) {
-            URL configFile = ClassLoader.getSystemResource("log4j-detailed.properties");
-            PropertyConfigurator.configure(configFile);
-        }
-    }
-}
diff --git a/ethereumj-core/src/test/java/org/ethereum/net/shh/FilterTest.java b/ethereumj-core/src/test/java/org/ethereum/net/shh/FilterTest.java
index bd90e4bf71..b9de73e40f 100644
--- a/ethereumj-core/src/test/java/org/ethereum/net/shh/FilterTest.java
+++ b/ethereumj-core/src/test/java/org/ethereum/net/shh/FilterTest.java
@@ -1,6 +1,5 @@
 package org.ethereum.net.shh;
 
-import org.ethereum.Start;
 import org.ethereum.crypto.ECKey;
 import org.ethereum.util.RLP;
 import org.junit.Test;
diff --git a/ethereumj-core/src/test/java/org/ethereum/net/swarm/GoPeerTest.java b/ethereumj-core/src/test/java/org/ethereum/net/swarm/GoPeerTest.java
deleted file mode 100644
index 566ce54304..0000000000
--- a/ethereumj-core/src/test/java/org/ethereum/net/swarm/GoPeerTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.ethereum.net.swarm;
-
-import org.ethereum.Start;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.ethereum.crypto.HashUtil.sha3;
-
-/**
- * Created by Admin on 06.07.2015.
- */
-public class GoPeerTest {
-
-    @Ignore
-    @Test
-    // TODO to be done at some point: run Go peer and connect to it
-    public void putTest() throws Exception {
-        System.out.println("Starting Java peer...");
-        Start.main(new String[]{});
-        System.out.println("Warming up...");
-        Thread.sleep(5000);
-        System.out.println("Sending a chunk...");
-
-        Key key = new Key(sha3(new byte[]{0x22, 0x33}));
-//            stdout.setFilter(Hex.toHexString(key.getBytes()));
-        Chunk chunk = new Chunk(key, new byte[]{0, 0, 0, 0, 0, 0, 0, 0, 77, 88});
-
-        NetStore.getInstance().put(chunk);
-    }
-}
diff --git a/ethereumj-samples/build.gradle b/ethereumj-samples/build.gradle
new file mode 100644
index 0000000000..6d3d674996
--- /dev/null
+++ b/ethereumj-samples/build.gradle
@@ -0,0 +1,25 @@
+
+plugins {
+    id 'application'
+}
+
+version = '1.0.0'
+
+dependencies {
+
+    compile "log4j:log4j:${log4jVersion}"
+    compile "org.slf4j:slf4j-log4j12:${slf4jVersion}"
+    compile "log4j:apache-log4j-extras:${log4jVersion}"
+
+    optional "commons-logging:commons-logging:1.0"
+    optional "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
+}
+
+if (project.hasProperty("mainClass")) {
+    mainClassName = mainClass
+} else {
+	mainClassName = 'org.ethereum.samples.BasicSample'
+}
+applicationDefaultJvmArgs = ["-server", "-Xss32m", "-XX:-OmitStackTraceInFastThrow"]
+
+apply from: "${rootProject.projectDir}/gradle/networkRunTasks.gradle"
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/BasicSample.java b/ethereumj-samples/src/main/java/org/ethereum/samples/BasicSample.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/BasicSample.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/BasicSample.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/CreateContractSample.java b/ethereumj-samples/src/main/java/org/ethereum/samples/CreateContractSample.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/CreateContractSample.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/CreateContractSample.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/FollowAccount.java b/ethereumj-samples/src/main/java/org/ethereum/samples/FollowAccount.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/FollowAccount.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/FollowAccount.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/PendingStateSample.java b/ethereumj-samples/src/main/java/org/ethereum/samples/PendingStateSample.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/PendingStateSample.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/PendingStateSample.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/PriceFeedSample.java b/ethereumj-samples/src/main/java/org/ethereum/samples/PriceFeedSample.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/PriceFeedSample.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/PriceFeedSample.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/PrivateMinerSample.java b/ethereumj-samples/src/main/java/org/ethereum/samples/PrivateMinerSample.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/PrivateMinerSample.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/PrivateMinerSample.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/StandaloneBlockchainSample.java b/ethereumj-samples/src/main/java/org/ethereum/samples/StandaloneBlockchainSample.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/StandaloneBlockchainSample.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/StandaloneBlockchainSample.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/TestNetSample.java b/ethereumj-samples/src/main/java/org/ethereum/samples/TestNetSample.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/TestNetSample.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/TestNetSample.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/samples/TransactionBomb.java b/ethereumj-samples/src/main/java/org/ethereum/samples/TransactionBomb.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/samples/TransactionBomb.java
rename to ethereumj-samples/src/main/java/org/ethereum/samples/TransactionBomb.java
diff --git a/ethereumj-core/src/main/resources/log4j-detailed.properties b/ethereumj-samples/src/main/resources/log4j-detailed.properties
similarity index 100%
rename from ethereumj-core/src/main/resources/log4j-detailed.properties
rename to ethereumj-samples/src/main/resources/log4j-detailed.properties
diff --git a/ethereumj-core/src/main/resources/log4j.properties b/ethereumj-samples/src/main/resources/log4j.properties
similarity index 100%
rename from ethereumj-core/src/main/resources/log4j.properties
rename to ethereumj-samples/src/main/resources/log4j.properties
diff --git a/ethereumj-tck/build.gradle b/ethereumj-tck/build.gradle
new file mode 100644
index 0000000000..83850b9900
--- /dev/null
+++ b/ethereumj-tck/build.gradle
@@ -0,0 +1,26 @@
+
+dependencies {
+    compile "org.slf4j:slf4j-simple:${slf4jVersion}"
+}
+
+/**
+ *  This is TCK test command line option,
+ *  to run the test:
+ *     gradle tckRun -PfilePath=[ file path]
+ *      e.g: gradle tckRun -PfilePath=E:\temp\test-case.json
+ */
+task tckRun(type:JavaExec){
+
+    if (project.hasProperty("filePath")) {
+        args = ["filerun", "$filePath"]
+        jvmArgs = ["-Xss32M"]
+    }
+
+    if (project.hasProperty("content")) {
+        args = ["content", "$content"]
+        jvmArgs = ["-Xss32M"]
+    }
+
+    main = "org.ethereum.tck.RunTck"
+    classpath = sourceSets.main.runtimeClasspath
+}
diff --git a/ethereumj-core/src/main/java/org/ethereum/tck/RunTck.java b/ethereumj-tck/src/main/java/org/ethereum/tck/RunTck.java
similarity index 100%
rename from ethereumj-core/src/main/java/org/ethereum/tck/RunTck.java
rename to ethereumj-tck/src/main/java/org/ethereum/tck/RunTck.java
diff --git a/gradle/networkRunTasks.gradle b/gradle/networkRunTasks.gradle
new file mode 100644
index 0000000000..fc40c05f86
--- /dev/null
+++ b/gradle/networkRunTasks.gradle
@@ -0,0 +1,12 @@
+
+task runMorden (type: JavaExec) {
+    main = mainClassName
+    classpath = sourceSets.main.runtimeClasspath
+    jvmArgs = applicationDefaultJvmArgs + '-Dethereumj.conf.res=morden.conf'
+}
+
+task runTest (type: JavaExec) {
+    main = mainClassName
+    classpath = sourceSets.main.runtimeClasspath
+    jvmArgs = applicationDefaultJvmArgs + '-Dethereumj.conf.res=test.conf'
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c97a8bdb90..2c6137b878 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b1d77dbffd..2435448710 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 16 19:48:53 IST 2015
+#Thu Apr 21 18:40:45 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-rc-4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e269e1..9d82f78915 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/gradlew.bat b/gradlew.bat
index aec99730b4..72d362dafd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/settings.gradle b/settings.gradle
index 02424d6807..d394118aa6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
+
 rootProject.name = "ethereumj"
-include "ethereumj-core"
 
+include 'ethereumj-cli', 'ethereumj-core', 'ethereumj-samples', 'ethereumj-tck'