Cosmetic changes and adding correct completion for modules for java search completion.