Refactored again, switched to shade plugin for JVM assembly