New jar packaging
One TODO removed. Evaluation/PoC proved it would not make code cleaner