--- a/scripts/build-luan.sh	Fri Aug 26 03:15:41 2016 -0600
+++ b/scripts/build-luan.sh	Fri Aug 26 14:36:40 2016 -0600
@@ -13,51 +13,15 @@
 mkdir $LUAN_BUILD/luan/jars
 
 cd $LUAN_HOME
-echo "return '$VERSION'" >core/src/luan/version.luan
+echo "return '$VERSION'" >src/luan/version.luan
 find . -name *.class -delete
 
-cd $LUAN_HOME
-SRC=core/src
-CLASSPATH=$LUAN_HOME/$SRC
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
+CLASSPATH=$LUAN_HOME/src
+for i in $LUAN_HOME/lib/* ; do CLASSPATH=$CLASSPATH:$i ; done
+cd src
+javac -classpath $CLASSPATH `find . -name *.java`
 jar cvf $LUAN_BUILD/luan/jars/luan-$VERSION.jar `find . -name *.class -o -name *.luan`
-
-cd $LUAN_HOME
-SRC=http/src
-CLASSPATH=$LUAN_HOME/core/src:$LUAN_HOME/$SRC:$SLF4J
-for i in $LUAN_HOME/http/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar uvf $LUAN_BUILD/luan/jars/luan-$VERSION.jar `find . -name *.class -o -name *.luan`
-cp $LUAN_HOME/http/ext/* $LUAN_BUILD/luan/jars
-
-cd $LUAN_HOME
-SRC=logging/src
-CLASSPATH=$LUAN_HOME/core/src:$LUAN_HOME/$SRC
-for i in $LUAN_HOME/logging/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar uvf $LUAN_BUILD/luan/jars/luan-$VERSION.jar `find . -name *.class -o -name *.luan`
-cp $LUAN_HOME/logging/ext/* $LUAN_BUILD/luan/jars
-
-cd $LUAN_HOME
-SRC=mail/src
-CLASSPATH=$LUAN_HOME/core/src:$LUAN_HOME/$SRC
-for i in $LUAN_HOME/mail/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar uvf $LUAN_BUILD/luan/jars/luan-$VERSION.jar `find . -name *.class -o -name *.luan`
-cp $LUAN_HOME/mail/ext/* $LUAN_BUILD/luan/jars
-
-cd $LUAN_HOME
-SRC=lucene/src
-CLASSPATH=$LUAN_HOME/core/src:$LUAN_HOME/$SRC:$SLF4J
-for i in $LUAN_HOME/lucene/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar uvf $LUAN_BUILD/luan/jars/luan-$VERSION.jar `find . -name *.class -o -name *.luan`
-cp $LUAN_HOME/lucene/ext/* $LUAN_BUILD/luan/jars
+cp $LUAN_HOME/lib/* $LUAN_BUILD/luan/jars
 
 cp $LUAN_HOME/scripts/install.sh $LUAN_BUILD/luan
 chmod +x $LUAN_BUILD/luan/install.sh