reorganize files to match java runtime
cleanup imports
configure tests