More refactoring in VimGrandSetup + adding more sources back into javacomplete.