diff --git a/bin/check-license.sh b/bin/check-license.sh
deleted file mode 100755
index f38f89d..0000000
--- a/bin/check-license.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-################################################################################
-##
-##  Licensed to the Apache Software Foundation (ASF) under one or more
-##  contributor license agreements.  See the NOTICE file distributed with
-##  this work for additional information regarding copyright ownership.
-##  The ASF licenses this file to You under the Apache License, Version 2.0
-##  (the "License"); you may not use this file except in compliance with
-##  the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-##  Unless required by applicable law or agreed to in writing, software
-##  distributed under the License is distributed on an "AS IS" BASIS,
-##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-##  See the License for the specific language governing permissions and
-##  limitations under the License.
-##
-################################################################################
-
-# set the variables
-BASE=$(cd "$(dirname "$0")/.." | pwd)
-VERSION_RAT="0.14"
-RAT_HOME=${BASE}/.rat/apache-rat-${VERSION_RAT}
-RAT_JAR=${RAT_HOME}/apache-rat-${VERSION_RAT}.jar
-RAT_EXCLUSION=$1
-
-# Validate if the folder is created
-if [[ ! -f "${BASE}/.rat" ]]; then
-  mkdir -p ${BASE}/.rat
-fi
-
-# download the elements required
-if [[ ! -f "$RAT_JAR" ]]; then
-  cd ${BASE}/.rat
-  wget https://dlcdn.apache.org/creadur/apache-rat-${VERSION_RAT}/apache-rat-${VERSION_RAT}-bin.tar.gz
-  tar -xvf apache-rat-${VERSION_RAT}-bin.tar.gz
-fi
-
-cd ${BASE}
-# Set the parameters for rat
-rat_opts=("-jar" "${RAT_JAR}" "-d" "${BASE}")
-
-#add the default exclusion for the project
-rat_opts+=("-e" "target/*")
-rat_opts+=("-e" "^.*.input")
-rat_opts+=("-e" "^.*.md")
-rat_opts+=("-e" "^.*.iml")
-rat_opts+=("-e" "^.*_pb2.py") # code generated by protocol buffer
-rat_opts+=("-e" "Gemfile.lock")
-rat_opts+=("-e" ".gitignore")
-rat_opts+=("-e" ".gitmodules")
-rat_opts+=("-e" ".rat-excludes")
-if [[ ! -z "$RAT_EXCLUSION" ]]; then
-   rat_opts+=("-E")
-   rat_opts+=($RAT_EXCLUSION)
-fi
-
-# execute the validation using rat
-java "${rat_opts[@]}"  2>&1 | grep "== File:"
\ No newline at end of file
diff --git a/bin/pyplangenerator.sh b/build/pyplangenerator.sh
similarity index 100%
rename from bin/pyplangenerator.sh
rename to build/pyplangenerator.sh
diff --git a/conf/flink/default.properties b/conf/flink/default.properties
new file mode 100644
index 0000000..9ef13c5
--- /dev/null
+++ b/conf/flink/default.properties
@@ -0,0 +1,13 @@
+# Cluster configuration
+#wayang.flink.mode.run = distribution
+#wayang.flink.master =
+#wayang.flink.port =
+#wayang.flink.paralelism =
+
+# Local distribute
+#wayang.flink.mode.run = local
+#wayang.flink.paralelism = 1
+
+# collection mode
+wayang.flink.mode.run = collection
+wayang.flink.paralelism = 1
diff --git a/conf/spark/default.properties b/conf/spark/default.properties
new file mode 100644
index 0000000..b517311
--- /dev/null
+++ b/conf/spark/default.properties
@@ -0,0 +1,4 @@
+spark.master = local[1]
+spark.app.name = Wayang App
+spark.ui.showConsoleProgress = false
+spark.driver.allowMultipleContexts=true
\ No newline at end of file
diff --git a/wayang-assembly/src/main/assembly/assembly.xml b/wayang-assembly/src/main/assembly/assembly.xml
index 2034b3f..b232f3c 100644
--- a/wayang-assembly/src/main/assembly/assembly.xml
+++ b/wayang-assembly/src/main/assembly/assembly.xml
@@ -41,9 +41,18 @@
     </fileSet>
     <fileSet>
       <directory>
+        ${project.parent.basedir}/conf/
+      </directory>
+      <outputDirectory>conf</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>
         ${project.parent.basedir}/assembly/target/
       </directory>
-      <outputDirectory>wayangs</outputDirectory>
+      <outputDirectory>jars</outputDirectory>
       <includes>
         <include>*</include>
       </includes>