diff --git a/PowerEditor/installer/nsisInclude/autoCompletion.nsh b/PowerEditor/installer/nsisInclude/autoCompletion.nsh
index db626a1d..a4e8c8fe 100644
--- a/PowerEditor/installer/nsisInclude/autoCompletion.nsh
+++ b/PowerEditor/installer/nsisInclude/autoCompletion.nsh
@@ -30,127 +30,127 @@ SectionGroup "Auto-completion Files" autoCompletionComponent
 	SetOverwrite off
 	
 	${MementoSection} "C" C
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\c.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "C++" C++
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\cpp.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Java" Java
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\java.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "C#" C#
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\cs.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "HTML" HTML
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\html.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "RC" RC
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\rc.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "SQL" SQL
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\sql.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "PHP" PHP
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\php.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "CSS" CSS
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\css.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "VB" VB
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\vb.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Perl" Perl
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\perl.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "JavaScript" JavaScript
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\javascript.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Python" Python
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\python.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "ActionScript" ActionScript
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\actionscript.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "LISP" LISP
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\lisp.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "VHDL" VHDL
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\vhdl.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "TeX" TeX
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\tex.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "DocBook" DocBook
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\xml.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "NSIS" NSIS
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\nsis.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "CMAKE" CMAKE
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\cmake.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "BATCH" BATCH
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\batch.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "CoffeeScript" CoffeeScript
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\coffee.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "BaanC" BaanC
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\baanc.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Lua" Lua
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\lua.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "AutoIt" AutoIt
-		SetOutPath "$INSTDIR\plugins\APIs"
+		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\autoit.xml"
 	${MementoSectionEnd}
 SectionGroupEnd
@@ -160,103 +160,128 @@ SectionGroupEnd
 SectionGroup un.autoCompletionComponent
 	Section un.PHP
 		Delete "$INSTDIR\plugins\APIs\php.xml"
+		Delete "$INSTDIR\autoCompletion\php.xml"
 	SectionEnd
 
 	Section un.CSS
 		Delete "$INSTDIR\plugins\APIs\css.xml"
+		Delete "$INSTDIR\autoCompletion\css.xml"
 	SectionEnd	
 	
 	Section un.HTML
 		Delete "$INSTDIR\plugins\APIs\html.xml"
+		Delete "$INSTDIR\autoCompletion\html.xml"
 	SectionEnd
 	
 	Section un.SQL
 		Delete "$INSTDIR\plugins\APIs\sql.xml"
+		Delete "$INSTDIR\autoCompletion\sql.xml"
 	SectionEnd
 	
 	Section un.RC
 		Delete "$INSTDIR\plugins\APIs\rc.xml"
+		Delete "$INSTDIR\autoCompletion\rc.xml"
 	SectionEnd
 
 	Section un.VB
 		Delete "$INSTDIR\plugins\APIs\vb.xml"
+		Delete "$INSTDIR\autoCompletion\vb.xml"
 	SectionEnd
 
 	Section un.Perl
 		Delete "$INSTDIR\plugins\APIs\perl.xml"
+		Delete "$INSTDIR\autoCompletion\perl.xml"
 	SectionEnd
 
 	Section un.C
 		Delete "$INSTDIR\plugins\APIs\c.xml"
+		Delete "$INSTDIR\autoCompletion\c.xml"
 	SectionEnd
 	
 	Section un.C++
 		Delete "$INSTDIR\plugins\APIs\cpp.xml"
+		Delete "$INSTDIR\autoCompletion\cpp.xml"
 	SectionEnd
 	
 	Section un.Java
 		Delete "$INSTDIR\plugins\APIs\java.xml"
+		Delete "$INSTDIR\autoCompletion\java.xml"
 	SectionEnd
 	
 	Section un.C#
 		Delete "$INSTDIR\plugins\APIs\cs.xml"
+		Delete "$INSTDIR\autoCompletion\cs.xml"
 	SectionEnd
 	
 	Section un.JavaScript
 		Delete "$INSTDIR\plugins\APIs\javascript.xml"
+		Delete "$INSTDIR\autoCompletion\javascript.xml"
 	SectionEnd
 
 	Section un.Python
 		Delete "$INSTDIR\plugins\APIs\python.xml"
+		Delete "$INSTDIR\autoCompletion\python.xml"
 	SectionEnd
 
 	Section un.ActionScript
 		Delete "$INSTDIR\plugins\APIs\actionscript.xml"
+		Delete "$INSTDIR\autoCompletion\actionscript.xml"
 	SectionEnd
 	
 	Section un.LISP
 		Delete "$INSTDIR\plugins\APIs\lisp.xml"
+		Delete "$INSTDIR\autoCompletion\lisp.xml"
 	SectionEnd
 	
 	Section un.VHDL
 		Delete "$INSTDIR\plugins\APIs\vhdl.xml"
+		Delete "$INSTDIR\autoCompletion\vhdl.xml"
 	SectionEnd	
 	
 	Section un.TeX
 		Delete "$INSTDIR\plugins\APIs\tex.xml"
+		Delete "$INSTDIR\autoCompletion\tex.xml"
 	SectionEnd
 	
 	Section un.DocBook
 		Delete "$INSTDIR\plugins\APIs\xml.xml"
+		Delete "$INSTDIR\autoCompletion\xml.xml"
 	SectionEnd
 	
 	Section un.NSIS
 		Delete "$INSTDIR\plugins\APIs\nsis.xml"
+		Delete "$INSTDIR\autoCompletion\nsis.xml"
 	SectionEnd
 	
 	Section un.CMAKE
 		Delete "$INSTDIR\plugins\APIs\cmake.xml"
+		Delete "$INSTDIR\autoCompletion\cmake.xml"
 	SectionEnd
 
 	Section un.BATCH
 		Delete "$INSTDIR\plugins\APIs\batch.xml"
+		Delete "$INSTDIR\autoCompletion\batch.xml"
 	SectionEnd
 	
 	Section un.CoffeeScript
 		Delete "$INSTDIR\plugins\APIs\coffee.xml"
+		Delete "$INSTDIR\autoCompletion\coffee.xml"
 	SectionEnd
 
 	Section un.BaanC
 		Delete "$INSTDIR\plugins\APIs\baanc.xml"
+		Delete "$INSTDIR\autoCompletion\baanc.xml"
 	SectionEnd
 
 	Section un.Lua
 		Delete "$INSTDIR\plugins\APIs\lua.xml"
+		Delete "$INSTDIR\autoCompletion\lua.xml"
 	SectionEnd
 
 
 	Section un.autoit
 		Delete "$INSTDIR\plugins\APIs\autoit.xml"
+		Delete "$INSTDIR\autoCompletion\autoit.xml"
 	SectionEnd
 
 SectionGroupEnd
diff --git a/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp b/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
index f3d5b399..7c4c1d78 100644
--- a/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
+++ b/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
@@ -768,7 +768,7 @@ bool AutoCompletion::setLanguage(LangType language) {
 	TCHAR path[MAX_PATH];
 	::GetModuleFileName(NULL, path, MAX_PATH);
 	PathRemoveFileSpec(path);
-	lstrcat(path, TEXT("\\plugins\\APIs\\"));
+	lstrcat(path, TEXT("\\autoCompletion\\"));
 	lstrcat(path, getApiFileName());
 	lstrcat(path, TEXT(".xml"));