diff --git a/bin/protoc-gen-scala.sh b/bin/protoc-gen-scala.sh
index c09f487..4c16db9 100755
--- a/bin/protoc-gen-scala.sh
+++ b/bin/protoc-gen-scala.sh
@@ -3,7 +3,7 @@ SCRIPT=`readlink -f $0`
 SCRIPTPATH=`dirname $SCRIPT`
 
 CLASSPATH=${SCALA_HOME}/lib/scala-library.jar
-for i in ${SCRIPTPATH}/../lib/*.jar
+for i in ${SCRIPTPATH}/../lib/*.jar ${SCRIPTPATH}/../*.jar
 do
   CLASSPATH=${CLASSPATH}:${i}
 done
diff --git a/lib/scala-protobuf_2.8.0-0.1.jar b/scala-protobuf_2.8.0-0.1.jar
similarity index 100%
rename from lib/scala-protobuf_2.8.0-0.1.jar
rename to scala-protobuf_2.8.0-0.1.jar