Cleanup and native java bindings skeleton