Fix jvm NonHeap/Heap, move dependencies