added some jars and some re-organizing