changed package and java compliance