Refactor all classes to same package
Add compiled JAR