Updated to new JAR-only project structure