Organize Imports improvements

 - Java file, project detection improvement
 - Java class detection improvement