moved java files
added scalac options
fixed some warnings
fixed java warnings