diff --git a/livy-api/pom.xml b/api/pom.xml similarity index 100% rename from livy-api/pom.xml rename to api/pom.xml diff --git a/livy-api/src/main/java/com/cloudera/livy/Job.java b/api/src/main/java/com/cloudera/livy/Job.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/Job.java rename to api/src/main/java/com/cloudera/livy/Job.java diff --git a/livy-api/src/main/java/com/cloudera/livy/JobContext.java b/api/src/main/java/com/cloudera/livy/JobContext.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/JobContext.java rename to api/src/main/java/com/cloudera/livy/JobContext.java diff --git a/livy-api/src/main/java/com/cloudera/livy/JobHandle.java b/api/src/main/java/com/cloudera/livy/JobHandle.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/JobHandle.java rename to api/src/main/java/com/cloudera/livy/JobHandle.java diff --git a/livy-api/src/main/java/com/cloudera/livy/LivyClient.java b/api/src/main/java/com/cloudera/livy/LivyClient.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/LivyClient.java rename to api/src/main/java/com/cloudera/livy/LivyClient.java diff --git a/livy-api/src/main/java/com/cloudera/livy/LivyClientBuilder.java b/api/src/main/java/com/cloudera/livy/LivyClientBuilder.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/LivyClientBuilder.java rename to api/src/main/java/com/cloudera/livy/LivyClientBuilder.java diff --git a/livy-api/src/main/java/com/cloudera/livy/LivyClientFactory.java b/api/src/main/java/com/cloudera/livy/LivyClientFactory.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/LivyClientFactory.java rename to api/src/main/java/com/cloudera/livy/LivyClientFactory.java diff --git a/livy-api/src/main/java/com/cloudera/livy/MetricsCollection.java b/api/src/main/java/com/cloudera/livy/MetricsCollection.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/MetricsCollection.java rename to api/src/main/java/com/cloudera/livy/MetricsCollection.java diff --git a/livy-api/src/main/java/com/cloudera/livy/annotations/Private.java b/api/src/main/java/com/cloudera/livy/annotations/Private.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/annotations/Private.java rename to api/src/main/java/com/cloudera/livy/annotations/Private.java diff --git a/livy-api/src/main/java/com/cloudera/livy/metrics/DataReadMethod.java b/api/src/main/java/com/cloudera/livy/metrics/DataReadMethod.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/metrics/DataReadMethod.java rename to api/src/main/java/com/cloudera/livy/metrics/DataReadMethod.java diff --git a/livy-api/src/main/java/com/cloudera/livy/metrics/InputMetrics.java b/api/src/main/java/com/cloudera/livy/metrics/InputMetrics.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/metrics/InputMetrics.java rename to api/src/main/java/com/cloudera/livy/metrics/InputMetrics.java diff --git a/livy-api/src/main/java/com/cloudera/livy/metrics/Metrics.java b/api/src/main/java/com/cloudera/livy/metrics/Metrics.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/metrics/Metrics.java rename to api/src/main/java/com/cloudera/livy/metrics/Metrics.java diff --git a/livy-api/src/main/java/com/cloudera/livy/metrics/ShuffleReadMetrics.java b/api/src/main/java/com/cloudera/livy/metrics/ShuffleReadMetrics.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/metrics/ShuffleReadMetrics.java rename to api/src/main/java/com/cloudera/livy/metrics/ShuffleReadMetrics.java diff --git a/livy-api/src/main/java/com/cloudera/livy/metrics/ShuffleWriteMetrics.java b/api/src/main/java/com/cloudera/livy/metrics/ShuffleWriteMetrics.java similarity index 100% rename from livy-api/src/main/java/com/cloudera/livy/metrics/ShuffleWriteMetrics.java rename to api/src/main/java/com/cloudera/livy/metrics/ShuffleWriteMetrics.java diff --git a/livy-api/src/test/java/com/cloudera/livy/TestClientFactory.java b/api/src/test/java/com/cloudera/livy/TestClientFactory.java similarity index 100% rename from livy-api/src/test/java/com/cloudera/livy/TestClientFactory.java rename to api/src/test/java/com/cloudera/livy/TestClientFactory.java diff --git a/livy-api/src/test/java/com/cloudera/livy/TestLivyClientBuilder.java b/api/src/test/java/com/cloudera/livy/TestLivyClientBuilder.java similarity index 100% rename from livy-api/src/test/java/com/cloudera/livy/TestLivyClientBuilder.java rename to api/src/test/java/com/cloudera/livy/TestLivyClientBuilder.java diff --git a/livy-api/src/test/java/com/cloudera/livy/TestMetricsCollection.java b/api/src/test/java/com/cloudera/livy/TestMetricsCollection.java similarity index 100% rename from livy-api/src/test/java/com/cloudera/livy/TestMetricsCollection.java rename to api/src/test/java/com/cloudera/livy/TestMetricsCollection.java diff --git a/livy-api/src/test/resources/META-INF/services/com.cloudera.livy.LivyClientFactory b/api/src/test/resources/META-INF/services/com.cloudera.livy.LivyClientFactory similarity index 100% rename from livy-api/src/test/resources/META-INF/services/com.cloudera.livy.LivyClientFactory rename to api/src/test/resources/META-INF/services/com.cloudera.livy.LivyClientFactory diff --git a/livy-assembly/assembly.xml b/assembly/assembly.xml similarity index 100% rename from livy-assembly/assembly.xml rename to assembly/assembly.xml diff --git a/livy-assembly/pom.xml b/assembly/pom.xml similarity index 100% rename from livy-assembly/pom.xml rename to assembly/pom.xml diff --git a/bin/setup-classpath b/bin/setup-classpath index 9eca07d47..e0382d14e 100644 --- a/bin/setup-classpath +++ b/bin/setup-classpath @@ -18,7 +18,7 @@ LIBDIR="$LIVY_HOME/jars" if [ ! -d "$LIBDIR" ]; then - LIBDIR="$LIVY_HOME/livy-assembly/target/jars" + LIBDIR="$LIVY_HOME/assembly/target/jars" fi if [ ! -d "$LIBDIR" ]; then echo "Could not find Livy jars directory." 1>&2 diff --git a/livy-client-http/pom.xml b/client-http/pom.xml similarity index 100% rename from livy-client-http/pom.xml rename to client-http/pom.xml diff --git a/livy-client-local/pom.xml b/client-local/pom.xml similarity index 100% rename from livy-client-local/pom.xml rename to client-local/pom.xml diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/BaseProtocol.java b/client-local/src/main/java/com/cloudera/livy/client/local/BaseProtocol.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/BaseProtocol.java rename to client-local/src/main/java/com/cloudera/livy/client/local/BaseProtocol.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/JobContextImpl.java b/client-local/src/main/java/com/cloudera/livy/client/local/JobContextImpl.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/JobContextImpl.java rename to client-local/src/main/java/com/cloudera/livy/client/local/JobContextImpl.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/JobHandleImpl.java b/client-local/src/main/java/com/cloudera/livy/client/local/JobHandleImpl.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/JobHandleImpl.java rename to client-local/src/main/java/com/cloudera/livy/client/local/JobHandleImpl.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/LocalClient.java b/client-local/src/main/java/com/cloudera/livy/client/local/LocalClient.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/LocalClient.java rename to client-local/src/main/java/com/cloudera/livy/client/local/LocalClient.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/LocalClientFactory.java b/client-local/src/main/java/com/cloudera/livy/client/local/LocalClientFactory.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/LocalClientFactory.java rename to client-local/src/main/java/com/cloudera/livy/client/local/LocalClientFactory.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/LocalConf.java b/client-local/src/main/java/com/cloudera/livy/client/local/LocalConf.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/LocalConf.java rename to client-local/src/main/java/com/cloudera/livy/client/local/LocalConf.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/MonitorCallback.java b/client-local/src/main/java/com/cloudera/livy/client/local/MonitorCallback.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/MonitorCallback.java rename to client-local/src/main/java/com/cloudera/livy/client/local/MonitorCallback.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/RemoteDriver.java b/client-local/src/main/java/com/cloudera/livy/client/local/RemoteDriver.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/RemoteDriver.java rename to client-local/src/main/java/com/cloudera/livy/client/local/RemoteDriver.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/KryoMessageCodec.java b/client-local/src/main/java/com/cloudera/livy/client/local/rpc/KryoMessageCodec.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/KryoMessageCodec.java rename to client-local/src/main/java/com/cloudera/livy/client/local/rpc/KryoMessageCodec.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/README.md b/client-local/src/main/java/com/cloudera/livy/client/local/rpc/README.md similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/README.md rename to client-local/src/main/java/com/cloudera/livy/client/local/rpc/README.md diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/Rpc.java b/client-local/src/main/java/com/cloudera/livy/client/local/rpc/Rpc.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/Rpc.java rename to client-local/src/main/java/com/cloudera/livy/client/local/rpc/Rpc.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcDispatcher.java b/client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcDispatcher.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcDispatcher.java rename to client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcDispatcher.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcException.java b/client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcException.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcException.java rename to client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcException.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcServer.java b/client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcServer.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcServer.java rename to client-local/src/main/java/com/cloudera/livy/client/local/rpc/RpcServer.java diff --git a/livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/SaslHandler.java b/client-local/src/main/java/com/cloudera/livy/client/local/rpc/SaslHandler.java similarity index 100% rename from livy-client-local/src/main/java/com/cloudera/livy/client/local/rpc/SaslHandler.java rename to client-local/src/main/java/com/cloudera/livy/client/local/rpc/SaslHandler.java diff --git a/livy-client-local/src/main/resources/META-INF/services/com.cloudera.livy.LivyClientFactory b/client-local/src/main/resources/META-INF/services/com.cloudera.livy.LivyClientFactory similarity index 100% rename from livy-client-local/src/main/resources/META-INF/services/com.cloudera.livy.LivyClientFactory rename to client-local/src/main/resources/META-INF/services/com.cloudera.livy.LivyClientFactory diff --git a/livy-client-local/src/test/java/com/cloudera/livy/client/local/TestJobHandle.java b/client-local/src/test/java/com/cloudera/livy/client/local/TestJobHandle.java similarity index 100% rename from livy-client-local/src/test/java/com/cloudera/livy/client/local/TestJobHandle.java rename to client-local/src/test/java/com/cloudera/livy/client/local/TestJobHandle.java diff --git a/livy-client-local/src/test/java/com/cloudera/livy/client/local/TestSparkClient.java b/client-local/src/test/java/com/cloudera/livy/client/local/TestSparkClient.java similarity index 100% rename from livy-client-local/src/test/java/com/cloudera/livy/client/local/TestSparkClient.java rename to client-local/src/test/java/com/cloudera/livy/client/local/TestSparkClient.java diff --git a/livy-client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestKryoMessageCodec.java b/client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestKryoMessageCodec.java similarity index 100% rename from livy-client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestKryoMessageCodec.java rename to client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestKryoMessageCodec.java diff --git a/livy-client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestRpc.java b/client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestRpc.java similarity index 100% rename from livy-client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestRpc.java rename to client-local/src/test/java/com/cloudera/livy/client/local/rpc/TestRpc.java diff --git a/livy-client-local/src/test/resources/log4j.properties b/client-local/src/test/resources/log4j.properties similarity index 100% rename from livy-client-local/src/test/resources/log4j.properties rename to client-local/src/test/resources/log4j.properties diff --git a/livy-client-local/src/test/resources/testweet.json b/client-local/src/test/resources/testweet.json similarity index 100% rename from livy-client-local/src/test/resources/testweet.json rename to client-local/src/test/resources/testweet.json diff --git a/livy-core/pom.xml b/core/pom.xml similarity index 100% rename from livy-core/pom.xml rename to core/pom.xml diff --git a/livy-core/src/main/scala/com/cloudera/livy/LineBufferedProcess.scala b/core/src/main/scala/com/cloudera/livy/LineBufferedProcess.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/LineBufferedProcess.scala rename to core/src/main/scala/com/cloudera/livy/LineBufferedProcess.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/LineBufferedStream.scala b/core/src/main/scala/com/cloudera/livy/LineBufferedStream.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/LineBufferedStream.scala rename to core/src/main/scala/com/cloudera/livy/LineBufferedStream.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/LivyConf.scala b/core/src/main/scala/com/cloudera/livy/LivyConf.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/LivyConf.scala rename to core/src/main/scala/com/cloudera/livy/LivyConf.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/Logging.scala b/core/src/main/scala/com/cloudera/livy/Logging.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/Logging.scala rename to core/src/main/scala/com/cloudera/livy/Logging.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/Utils.scala b/core/src/main/scala/com/cloudera/livy/Utils.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/Utils.scala rename to core/src/main/scala/com/cloudera/livy/Utils.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/WebServer.scala b/core/src/main/scala/com/cloudera/livy/WebServer.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/WebServer.scala rename to core/src/main/scala/com/cloudera/livy/WebServer.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/msgs.scala b/core/src/main/scala/com/cloudera/livy/msgs.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/msgs.scala rename to core/src/main/scala/com/cloudera/livy/msgs.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/Kind.scala b/core/src/main/scala/com/cloudera/livy/sessions/Kind.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/Kind.scala rename to core/src/main/scala/com/cloudera/livy/sessions/Kind.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/Session.scala b/core/src/main/scala/com/cloudera/livy/sessions/Session.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/Session.scala rename to core/src/main/scala/com/cloudera/livy/sessions/Session.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/SessionFactory.scala b/core/src/main/scala/com/cloudera/livy/sessions/SessionFactory.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/SessionFactory.scala rename to core/src/main/scala/com/cloudera/livy/sessions/SessionFactory.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala b/core/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala rename to core/src/main/scala/com/cloudera/livy/sessions/SessionManager.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala b/core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala rename to core/src/main/scala/com/cloudera/livy/sessions/SessionState.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/batch/BatchSession.scala b/core/src/main/scala/com/cloudera/livy/sessions/batch/BatchSession.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/batch/BatchSession.scala rename to core/src/main/scala/com/cloudera/livy/sessions/batch/BatchSession.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/interactive/InteractiveSession.scala b/core/src/main/scala/com/cloudera/livy/sessions/interactive/InteractiveSession.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/interactive/InteractiveSession.scala rename to core/src/main/scala/com/cloudera/livy/sessions/interactive/InteractiveSession.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/interactive/Statement.scala b/core/src/main/scala/com/cloudera/livy/sessions/interactive/Statement.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/interactive/Statement.scala rename to core/src/main/scala/com/cloudera/livy/sessions/interactive/Statement.scala diff --git a/livy-core/src/main/scala/com/cloudera/livy/sessions/interactive/StatementState.scala b/core/src/main/scala/com/cloudera/livy/sessions/interactive/StatementState.scala similarity index 100% rename from livy-core/src/main/scala/com/cloudera/livy/sessions/interactive/StatementState.scala rename to core/src/main/scala/com/cloudera/livy/sessions/interactive/StatementState.scala diff --git a/livy-core/src/test/scala/com/cloudera/livy/sessions/BaseInteractiveSessionSpec.scala b/core/src/test/scala/com/cloudera/livy/sessions/BaseInteractiveSessionSpec.scala similarity index 100% rename from livy-core/src/test/scala/com/cloudera/livy/sessions/BaseInteractiveSessionSpec.scala rename to core/src/test/scala/com/cloudera/livy/sessions/BaseInteractiveSessionSpec.scala diff --git a/livy-core/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala b/core/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala similarity index 100% rename from livy-core/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala rename to core/src/test/scala/com/cloudera/livy/sessions/SessionManagerSpec.scala diff --git a/livy-core/src/test/scala/com/cloudera/livy/sessions/interactive/StatementSpec.scala b/core/src/test/scala/com/cloudera/livy/sessions/interactive/StatementSpec.scala similarity index 100% rename from livy-core/src/test/scala/com/cloudera/livy/sessions/interactive/StatementSpec.scala rename to core/src/test/scala/com/cloudera/livy/sessions/interactive/StatementSpec.scala diff --git a/pom.xml b/pom.xml index 0357988c4..f2d9313eb 100644 --- a/pom.xml +++ b/pom.xml @@ -116,15 +116,15 @@ - livy-api - livy-assembly - livy-core - livy-repl - livy-server - livy-spark - livy-yarn - livy-client-local - livy-client-http + api + assembly + core + repl + server + spark + yarn + client-local + client-http diff --git a/livy-repl/pom.xml b/repl/pom.xml similarity index 100% rename from livy-repl/pom.xml rename to repl/pom.xml diff --git a/livy-repl/src/main/resources/fake_R.sh b/repl/src/main/resources/fake_R.sh similarity index 100% rename from livy-repl/src/main/resources/fake_R.sh rename to repl/src/main/resources/fake_R.sh diff --git a/livy-repl/src/main/resources/fake_pyspark.sh b/repl/src/main/resources/fake_pyspark.sh similarity index 100% rename from livy-repl/src/main/resources/fake_pyspark.sh rename to repl/src/main/resources/fake_pyspark.sh diff --git a/livy-repl/src/main/resources/fake_shell.py b/repl/src/main/resources/fake_shell.py similarity index 100% rename from livy-repl/src/main/resources/fake_shell.py rename to repl/src/main/resources/fake_shell.py diff --git a/livy-repl/src/main/resources/logback-access.xml b/repl/src/main/resources/logback-access.xml similarity index 100% rename from livy-repl/src/main/resources/logback-access.xml rename to repl/src/main/resources/logback-access.xml diff --git a/livy-repl/src/main/resources/logback.xml b/repl/src/main/resources/logback.xml similarity index 100% rename from livy-repl/src/main/resources/logback.xml rename to repl/src/main/resources/logback.xml diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/Interpreter.scala b/repl/src/main/scala/com/cloudera/livy/repl/Interpreter.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/Interpreter.scala rename to repl/src/main/scala/com/cloudera/livy/repl/Interpreter.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/Main.scala b/repl/src/main/scala/com/cloudera/livy/repl/Main.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/Main.scala rename to repl/src/main/scala/com/cloudera/livy/repl/Main.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/Session.scala b/repl/src/main/scala/com/cloudera/livy/repl/Session.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/Session.scala rename to repl/src/main/scala/com/cloudera/livy/repl/Session.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/WebApp.scala b/repl/src/main/scala/com/cloudera/livy/repl/WebApp.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/WebApp.scala rename to repl/src/main/scala/com/cloudera/livy/repl/WebApp.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/package.scala b/repl/src/main/scala/com/cloudera/livy/repl/package.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/package.scala rename to repl/src/main/scala/com/cloudera/livy/repl/package.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/process/ProcessInterpreter.scala b/repl/src/main/scala/com/cloudera/livy/repl/process/ProcessInterpreter.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/process/ProcessInterpreter.scala rename to repl/src/main/scala/com/cloudera/livy/repl/process/ProcessInterpreter.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/python/PythonInterpreter.scala b/repl/src/main/scala/com/cloudera/livy/repl/python/PythonInterpreter.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/python/PythonInterpreter.scala rename to repl/src/main/scala/com/cloudera/livy/repl/python/PythonInterpreter.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/scala/SparkInterpreter.scala b/repl/src/main/scala/com/cloudera/livy/repl/scala/SparkInterpreter.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/scala/SparkInterpreter.scala rename to repl/src/main/scala/com/cloudera/livy/repl/scala/SparkInterpreter.scala diff --git a/livy-repl/src/main/scala/com/cloudera/livy/repl/sparkr/SparkRInterpreter.scala b/repl/src/main/scala/com/cloudera/livy/repl/sparkr/SparkRInterpreter.scala similarity index 100% rename from livy-repl/src/main/scala/com/cloudera/livy/repl/sparkr/SparkRInterpreter.scala rename to repl/src/main/scala/com/cloudera/livy/repl/sparkr/SparkRInterpreter.scala diff --git a/livy-repl/src/test/resources/log4j.properties b/repl/src/test/resources/log4j.properties similarity index 100% rename from livy-repl/src/test/resources/log4j.properties rename to repl/src/test/resources/log4j.properties diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/BaseInterpreterSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/BaseInterpreterSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/BaseInterpreterSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/BaseInterpreterSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/BaseSessionSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/BaseSessionSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/BaseSessionSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/BaseSessionSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/PythonSessionSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/PythonSessionSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/PythonSessionSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/PythonSessionSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/ScalaInterpreterSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/ScalaInterpreterSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/ScalaInterpreterSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/ScalaInterpreterSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/SparkRInterpreterSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/SparkRInterpreterSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/SparkRInterpreterSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/SparkRInterpreterSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/SparkRSessionSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/SparkRSessionSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/SparkRSessionSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/SparkRSessionSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/SparkSessionSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/SparkSessionSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/SparkSessionSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/SparkSessionSpec.scala diff --git a/livy-repl/src/test/scala/com/cloudera/livy/repl/WebAppSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/WebAppSpec.scala similarity index 100% rename from livy-repl/src/test/scala/com/cloudera/livy/repl/WebAppSpec.scala rename to repl/src/test/scala/com/cloudera/livy/repl/WebAppSpec.scala diff --git a/livy-server/pom.xml b/server/pom.xml similarity index 100% rename from livy-server/pom.xml rename to server/pom.xml diff --git a/livy-server/src/main/resources/logback-access.xml b/server/src/main/resources/logback-access.xml similarity index 100% rename from livy-server/src/main/resources/logback-access.xml rename to server/src/main/resources/logback-access.xml diff --git a/livy-server/src/main/resources/logback.xml b/server/src/main/resources/logback.xml similarity index 100% rename from livy-server/src/main/resources/logback.xml rename to server/src/main/resources/logback.xml diff --git a/livy-server/src/main/scala/com/cloudera/livy/server/Main.scala b/server/src/main/scala/com/cloudera/livy/server/Main.scala similarity index 100% rename from livy-server/src/main/scala/com/cloudera/livy/server/Main.scala rename to server/src/main/scala/com/cloudera/livy/server/Main.scala diff --git a/livy-server/src/main/scala/com/cloudera/livy/server/SessionServlet.scala b/server/src/main/scala/com/cloudera/livy/server/SessionServlet.scala similarity index 100% rename from livy-server/src/main/scala/com/cloudera/livy/server/SessionServlet.scala rename to server/src/main/scala/com/cloudera/livy/server/SessionServlet.scala diff --git a/livy-server/src/main/scala/com/cloudera/livy/server/batch/BatchSessionServlet.scala b/server/src/main/scala/com/cloudera/livy/server/batch/BatchSessionServlet.scala similarity index 100% rename from livy-server/src/main/scala/com/cloudera/livy/server/batch/BatchSessionServlet.scala rename to server/src/main/scala/com/cloudera/livy/server/batch/BatchSessionServlet.scala diff --git a/livy-server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSessionServlet.scala b/server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSessionServlet.scala similarity index 100% rename from livy-server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSessionServlet.scala rename to server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSessionServlet.scala diff --git a/livy-server/src/test/resources/log4j.properties b/server/src/test/resources/log4j.properties similarity index 100% rename from livy-server/src/test/resources/log4j.properties rename to server/src/test/resources/log4j.properties diff --git a/livy-server/src/test/scala/com/cloudera/livy/server/batch/BatchServletSpec.scala b/server/src/test/scala/com/cloudera/livy/server/batch/BatchServletSpec.scala similarity index 100% rename from livy-server/src/test/scala/com/cloudera/livy/server/batch/BatchServletSpec.scala rename to server/src/test/scala/com/cloudera/livy/server/batch/BatchServletSpec.scala diff --git a/livy-server/src/test/scala/com/cloudera/livy/server/interactive/InteractiveSessionServletSpec.scala b/server/src/test/scala/com/cloudera/livy/server/interactive/InteractiveSessionServletSpec.scala similarity index 100% rename from livy-server/src/test/scala/com/cloudera/livy/server/interactive/InteractiveSessionServletSpec.scala rename to server/src/test/scala/com/cloudera/livy/server/interactive/InteractiveSessionServletSpec.scala diff --git a/livy-spark/pom.xml b/spark/pom.xml similarity index 100% rename from livy-spark/pom.xml rename to spark/pom.xml diff --git a/livy-spark/src/main/resources/com/cloudera/livy/spark/default-spark-user-configurable-options.conf b/spark/src/main/resources/com/cloudera/livy/spark/default-spark-user-configurable-options.conf similarity index 100% rename from livy-spark/src/main/resources/com/cloudera/livy/spark/default-spark-user-configurable-options.conf rename to spark/src/main/resources/com/cloudera/livy/spark/default-spark-user-configurable-options.conf diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/ConfigOptionNotAllowed.scala b/spark/src/main/scala/com/cloudera/livy/spark/ConfigOptionNotAllowed.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/ConfigOptionNotAllowed.scala rename to spark/src/main/scala/com/cloudera/livy/spark/ConfigOptionNotAllowed.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/SparkManager.scala b/spark/src/main/scala/com/cloudera/livy/spark/SparkManager.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/SparkManager.scala rename to spark/src/main/scala/com/cloudera/livy/spark/SparkManager.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/SparkProcess.scala b/spark/src/main/scala/com/cloudera/livy/spark/SparkProcess.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/SparkProcess.scala rename to spark/src/main/scala/com/cloudera/livy/spark/SparkProcess.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilder.scala b/spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilder.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilder.scala rename to spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilder.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilderFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilderFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilderFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/SparkProcessBuilderFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/SparkUserConfigurableOptions.scala b/spark/src/main/scala/com/cloudera/livy/spark/SparkUserConfigurableOptions.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/SparkUserConfigurableOptions.scala rename to spark/src/main/scala/com/cloudera/livy/spark/SparkUserConfigurableOptions.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcess.scala b/spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcess.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcess.scala rename to spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcess.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcessFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcessFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcessFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionProcessFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarn.scala b/spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarn.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarn.scala rename to spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarn.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarnFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarnFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarnFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/batch/BatchSessionYarnFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/batch/CreateBatchRequest.scala b/spark/src/main/scala/com/cloudera/livy/spark/batch/CreateBatchRequest.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/batch/CreateBatchRequest.scala rename to spark/src/main/scala/com/cloudera/livy/spark/batch/CreateBatchRequest.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/client/ClientSession.scala b/spark/src/main/scala/com/cloudera/livy/spark/client/ClientSession.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/client/ClientSession.scala rename to spark/src/main/scala/com/cloudera/livy/spark/client/ClientSession.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/client/ClientSessionFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/client/ClientSessionFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/client/ClientSessionFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/client/ClientSessionFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/client/CreateClientRequest.scala b/spark/src/main/scala/com/cloudera/livy/spark/client/CreateClientRequest.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/client/CreateClientRequest.scala rename to spark/src/main/scala/com/cloudera/livy/spark/client/CreateClientRequest.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/client/SessionCache.scala b/spark/src/main/scala/com/cloudera/livy/spark/client/SessionCache.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/client/SessionCache.scala rename to spark/src/main/scala/com/cloudera/livy/spark/client/SessionCache.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/client/SessionClientTracker.scala b/spark/src/main/scala/com/cloudera/livy/spark/client/SessionClientTracker.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/client/SessionClientTracker.scala rename to spark/src/main/scala/com/cloudera/livy/spark/client/SessionClientTracker.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/CreateInteractiveRequest.scala b/spark/src/main/scala/com/cloudera/livy/spark/interactive/CreateInteractiveRequest.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/CreateInteractiveRequest.scala rename to spark/src/main/scala/com/cloudera/livy/spark/interactive/CreateInteractiveRequest.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcess.scala b/spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcess.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcess.scala rename to spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcess.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarn.scala b/spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarn.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarn.scala rename to spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarn.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarnFactory.scala b/spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarnFactory.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarnFactory.scala rename to spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveSessionYarnFactory.scala diff --git a/livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveWebSession.scala b/spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveWebSession.scala similarity index 100% rename from livy-spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveWebSession.scala rename to spark/src/main/scala/com/cloudera/livy/spark/interactive/InteractiveWebSession.scala diff --git a/livy-spark/src/test/resources/log4j.properties b/spark/src/test/resources/log4j.properties similarity index 100% rename from livy-spark/src/test/resources/log4j.properties rename to spark/src/test/resources/log4j.properties diff --git a/livy-spark/src/test/scala/com/cloudera/livy/spark/SparkProcessBuilderSpec.scala b/spark/src/test/scala/com/cloudera/livy/spark/SparkProcessBuilderSpec.scala similarity index 100% rename from livy-spark/src/test/scala/com/cloudera/livy/spark/SparkProcessBuilderSpec.scala rename to spark/src/test/scala/com/cloudera/livy/spark/SparkProcessBuilderSpec.scala diff --git a/livy-spark/src/test/scala/com/cloudera/livy/spark/batch/BatchProcessSpec.scala b/spark/src/test/scala/com/cloudera/livy/spark/batch/BatchProcessSpec.scala similarity index 100% rename from livy-spark/src/test/scala/com/cloudera/livy/spark/batch/BatchProcessSpec.scala rename to spark/src/test/scala/com/cloudera/livy/spark/batch/BatchProcessSpec.scala diff --git a/livy-spark/src/test/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessSpec.scala b/spark/src/test/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessSpec.scala similarity index 100% rename from livy-spark/src/test/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessSpec.scala rename to spark/src/test/scala/com/cloudera/livy/spark/interactive/InteractiveSessionProcessSpec.scala diff --git a/livy-yarn/pom.xml b/yarn/pom.xml similarity index 100% rename from livy-yarn/pom.xml rename to yarn/pom.xml diff --git a/livy-yarn/src/main/assembly/dist.xml b/yarn/src/main/assembly/dist.xml similarity index 100% rename from livy-yarn/src/main/assembly/dist.xml rename to yarn/src/main/assembly/dist.xml diff --git a/livy-yarn/src/main/bash/run-am.sh b/yarn/src/main/bash/run-am.sh similarity index 100% rename from livy-yarn/src/main/bash/run-am.sh rename to yarn/src/main/bash/run-am.sh diff --git a/livy-yarn/src/main/bash/run-class.sh b/yarn/src/main/bash/run-class.sh similarity index 100% rename from livy-yarn/src/main/bash/run-class.sh rename to yarn/src/main/bash/run-class.sh diff --git a/livy-yarn/src/main/bash/run-job.sh b/yarn/src/main/bash/run-job.sh similarity index 100% rename from livy-yarn/src/main/bash/run-job.sh rename to yarn/src/main/bash/run-job.sh diff --git a/livy-yarn/src/main/resources/logback.xml b/yarn/src/main/resources/logback.xml similarity index 100% rename from livy-yarn/src/main/resources/logback.xml rename to yarn/src/main/resources/logback.xml diff --git a/livy-yarn/src/main/scala/com/cloudera/livy/yarn/ApplicationState.scala b/yarn/src/main/scala/com/cloudera/livy/yarn/ApplicationState.scala similarity index 100% rename from livy-yarn/src/main/scala/com/cloudera/livy/yarn/ApplicationState.scala rename to yarn/src/main/scala/com/cloudera/livy/yarn/ApplicationState.scala diff --git a/livy-yarn/src/main/scala/com/cloudera/livy/yarn/Client.scala b/yarn/src/main/scala/com/cloudera/livy/yarn/Client.scala similarity index 100% rename from livy-yarn/src/main/scala/com/cloudera/livy/yarn/Client.scala rename to yarn/src/main/scala/com/cloudera/livy/yarn/Client.scala diff --git a/livy-yarn/src/main/scala/com/cloudera/livy/yarn/Job.scala b/yarn/src/main/scala/com/cloudera/livy/yarn/Job.scala similarity index 100% rename from livy-yarn/src/main/scala/com/cloudera/livy/yarn/Job.scala rename to yarn/src/main/scala/com/cloudera/livy/yarn/Job.scala