Allow f3 to look up java files, and some refactor related to this