[anjuta-extras] scintilla: Reorganize files like in scintilla source archive

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 5ce05691d661a2902e4f9f686aa64aca33405310
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sat Mar 3 21:00:12 2012 +0100

    scintilla: Reorganize files like in scintilla source archive

 plugins/scintilla/scintilla/Makefile.am            |  194 ++++++-----
 plugins/scintilla/scintilla/README.sync            |   16 +-
 plugins/scintilla/scintilla/{ => gtk}/Converter.h  |    0
 plugins/scintilla/scintilla/{ => gtk}/PlatGTK.cxx  |    0
 .../scintilla/scintilla/{ => gtk}/ScintillaGTK.cxx |    0
 .../scintilla/{ => gtk}/scintilla-marshal.list     |    0
 plugins/scintilla/scintilla/lexers.make            |  346 ++++++++++----------
 .../scintilla/scintilla/{ => lexers}/LexA68k.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexAPDL.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexASY.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexAU3.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexAVE.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexAVS.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexAbaqus.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexAda.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexAsm.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexAsn1.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexBaan.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexBash.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexBasic.cxx  |    0
 .../scintilla/{ => lexers}/LexBullant.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexCLW.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexCOBOL.cxx  |    0
 .../scintilla/scintilla/{ => lexers}/LexCPP.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexCSS.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexCaml.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexCmake.cxx  |    0
 .../scintilla/{ => lexers}/LexCoffeeScript.cxx     |    0
 .../scintilla/scintilla/{ => lexers}/LexConf.cxx   |    0
 .../scintilla/{ => lexers}/LexCrontab.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexCsound.cxx |    0
 plugins/scintilla/scintilla/{ => lexers}/LexD.cxx  |    0
 .../scintilla/{ => lexers}/LexEScript.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexEiffel.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexErlang.cxx |    0
 .../scintilla/{ => lexers}/LexFlagship.cxx         |    0
 .../scintilla/scintilla/{ => lexers}/LexForth.cxx  |    0
 .../scintilla/{ => lexers}/LexFortran.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexGAP.cxx    |    0
 .../scintilla/{ => lexers}/LexGui4Cli.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexHTML.cxx   |    0
 .../scintilla/{ => lexers}/LexHaskell.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexInno.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexKix.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexLisp.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexLout.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexLua.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexMMIXAL.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexMPT.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexMSSQL.cxx  |    0
 .../scintilla/scintilla/{ => lexers}/LexMagik.cxx  |    0
 .../scintilla/{ => lexers}/LexMarkdown.cxx         |    0
 .../scintilla/scintilla/{ => lexers}/LexMatlab.cxx |    0
 .../scintilla/{ => lexers}/LexMetapost.cxx         |    0
 .../scintilla/scintilla/{ => lexers}/LexModula.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexMySQL.cxx  |    0
 .../scintilla/scintilla/{ => lexers}/LexNimrod.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexNsis.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexOpal.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexOthers.cxx |    0
 plugins/scintilla/scintilla/{ => lexers}/LexPB.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexPLM.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexPOV.cxx    |    0
 plugins/scintilla/scintilla/{ => lexers}/LexPS.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexPascal.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexPerl.cxx   |    0
 .../scintilla/{ => lexers}/LexPowerPro.cxx         |    0
 .../scintilla/{ => lexers}/LexPowerShell.cxx       |    0
 .../scintilla/{ => lexers}/LexProgress.cxx         |    0
 .../scintilla/scintilla/{ => lexers}/LexPython.cxx |    0
 plugins/scintilla/scintilla/{ => lexers}/LexR.cxx  |    0
 .../scintilla/scintilla/{ => lexers}/LexRebol.cxx  |    0
 .../scintilla/scintilla/{ => lexers}/LexRuby.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexSML.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexSQL.cxx    |    0
 .../scintilla/{ => lexers}/LexScriptol.cxx         |    0
 .../scintilla/{ => lexers}/LexSmalltalk.cxx        |    0
 .../scintilla/scintilla/{ => lexers}/LexSorcus.cxx |    0
 .../scintilla/{ => lexers}/LexSpecman.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexSpice.cxx  |    0
 .../scintilla/scintilla/{ => lexers}/LexTACL.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexTADS3.cxx  |    0
 .../scintilla/scintilla/{ => lexers}/LexTAL.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexTCL.cxx    |    0
 .../scintilla/scintilla/{ => lexers}/LexTCMD.cxx   |    0
 .../scintilla/scintilla/{ => lexers}/LexTeX.cxx    |    0
 .../scintilla/{ => lexers}/LexTxt2tags.cxx         |    0
 plugins/scintilla/scintilla/{ => lexers}/LexVB.cxx |    0
 .../scintilla/scintilla/{ => lexers}/LexVHDL.cxx   |    0
 .../scintilla/{ => lexers}/LexVerilog.cxx          |    0
 .../scintilla/scintilla/{ => lexers}/LexYAML.cxx   |    0
 .../scintilla/scintilla/{ => lexlib}/Accessor.cxx  |    0
 .../scintilla/scintilla/{ => lexlib}/Accessor.h    |    0
 .../scintilla/{ => lexlib}/CharacterSet.cxx        |    0
 .../scintilla/{ => lexlib}/CharacterSet.h          |    0
 .../scintilla/scintilla/{ => lexlib}/LexAccessor.h |    0
 .../scintilla/scintilla/{ => lexlib}/LexerBase.cxx |    0
 .../scintilla/scintilla/{ => lexlib}/LexerBase.h   |    0
 .../scintilla/{ => lexlib}/LexerModule.cxx         |    0
 .../scintilla/scintilla/{ => lexlib}/LexerModule.h |    0
 .../scintilla/{ => lexlib}/LexerNoExceptions.cxx   |    0
 .../scintilla/{ => lexlib}/LexerNoExceptions.h     |    0
 .../scintilla/{ => lexlib}/LexerSimple.cxx         |    0
 .../scintilla/scintilla/{ => lexlib}/LexerSimple.h |    0
 .../scintilla/scintilla/{ => lexlib}/OptionSet.h   |    0
 .../scintilla/{ => lexlib}/PropSetSimple.cxx       |    0
 .../scintilla/{ => lexlib}/PropSetSimple.h         |    0
 .../scintilla/scintilla/{ => lexlib}/SparseState.h |    0
 .../scintilla/{ => lexlib}/StyleContext.cxx        |    0
 .../scintilla/{ => lexlib}/StyleContext.h          |    0
 .../scintilla/scintilla/{ => lexlib}/WordList.cxx  |    0
 .../scintilla/scintilla/{ => lexlib}/WordList.h    |    0
 plugins/scintilla/scintilla/scintilla-marshal.c    |   86 -----
 plugins/scintilla/scintilla/scintilla-marshal.h    |   21 --
 .../scintilla/scintilla/{ => src}/AutoComplete.cxx |    0
 .../scintilla/scintilla/{ => src}/AutoComplete.h   |    0
 plugins/scintilla/scintilla/{ => src}/CallTip.cxx  |    0
 plugins/scintilla/scintilla/{ => src}/CallTip.h    |    0
 .../scintilla/scintilla/{ => src}/Catalogue.cxx    |    0
 plugins/scintilla/scintilla/{ => src}/Catalogue.h  |    0
 .../scintilla/scintilla/{ => src}/CellBuffer.cxx   |    0
 plugins/scintilla/scintilla/{ => src}/CellBuffer.h |    0
 .../scintilla/scintilla/{ => src}/CharClassify.cxx |    0
 .../scintilla/scintilla/{ => src}/CharClassify.h   |    0
 .../scintilla/{ => src}/ContractionState.cxx       |    0
 .../scintilla/{ => src}/ContractionState.h         |    0
 .../scintilla/scintilla/{ => src}/Decoration.cxx   |    0
 plugins/scintilla/scintilla/{ => src}/Decoration.h |    0
 plugins/scintilla/scintilla/{ => src}/Document.cxx |    0
 plugins/scintilla/scintilla/{ => src}/Document.h   |    0
 plugins/scintilla/scintilla/{ => src}/Editor.cxx   |    0
 plugins/scintilla/scintilla/{ => src}/Editor.h     |    0
 .../scintilla/{ => src}/ExternalLexer.cxx          |    0
 .../scintilla/scintilla/{ => src}/ExternalLexer.h  |    0
 plugins/scintilla/scintilla/src/FontQuality.h      |   15 +
 .../scintilla/scintilla/{ => src}/Indicator.cxx    |    0
 plugins/scintilla/scintilla/{ => src}/Indicator.h  |    0
 plugins/scintilla/scintilla/{ => src}/KeyMap.cxx   |    0
 plugins/scintilla/scintilla/{ => src}/KeyMap.h     |    0
 plugins/scintilla/scintilla/{ => src}/LexGen.py    |    0
 .../scintilla/scintilla/{ => src}/LineMarker.cxx   |    0
 plugins/scintilla/scintilla/{ => src}/LineMarker.h |    0
 .../scintilla/scintilla/{ => src}/Partitioning.h   |    0
 plugins/scintilla/scintilla/{ => src}/PerLine.cxx  |    0
 plugins/scintilla/scintilla/{ => src}/PerLine.h    |    0
 .../scintilla/{ => src}/PositionCache.cxx          |    0
 .../scintilla/scintilla/{ => src}/PositionCache.h  |    0
 plugins/scintilla/scintilla/{ => src}/RESearch.cxx |    0
 plugins/scintilla/scintilla/{ => src}/RESearch.h   |    0
 .../scintilla/scintilla/{ => src}/RunStyles.cxx    |    0
 plugins/scintilla/scintilla/{ => src}/RunStyles.h  |    0
 plugins/scintilla/scintilla/{ => src}/SVector.h    |    0
 .../scintilla/{ => src}/ScintillaBase.cxx          |    0
 .../scintilla/scintilla/{ => src}/ScintillaBase.h  |    0
 .../scintilla/scintilla/{ => src}/Selection.cxx    |    0
 plugins/scintilla/scintilla/{ => src}/Selection.h  |    0
 .../scintilla/scintilla/{ => src}/SplitVector.h    |    0
 plugins/scintilla/scintilla/{ => src}/Style.cxx    |    0
 plugins/scintilla/scintilla/{ => src}/Style.h      |    0
 .../scintilla/{ => src}/UniConversion.cxx          |    0
 .../scintilla/scintilla/{ => src}/UniConversion.h  |    0
 .../scintilla/scintilla/{ => src}/ViewStyle.cxx    |    0
 plugins/scintilla/scintilla/{ => src}/ViewStyle.h  |    0
 plugins/scintilla/scintilla/{ => src}/XPM.cxx      |    0
 plugins/scintilla/scintilla/{ => src}/XPM.h        |    0
 165 files changed, 291 insertions(+), 387 deletions(-)
---
diff --git a/plugins/scintilla/scintilla/Makefile.am b/plugins/scintilla/scintilla/Makefile.am
index e21ea41..b681bfd 100644
--- a/plugins/scintilla/scintilla/Makefile.am
+++ b/plugins/scintilla/scintilla/Makefile.am
@@ -6,6 +6,8 @@ noinst_LTLIBRARIES = libanjuta-scintilla.la
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/include \
+	-I$(srcdir)/src \
+	-I$(srcdir)/lexlib \
 	$(LIBANJUTA_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(GMODULE_CFLAGS) \
@@ -16,77 +18,80 @@ AM_CXXFLAGS = -DGTK -DSCI_LEXER -DUSE_XIM
 include $(srcdir)/lexers.make
 
 libanjuta_scintilla_la_SOURCES =\
-	Accessor.cxx \
-	AutoComplete.cxx \
-	CallTip.cxx \
-	Catalogue.cxx \
-	CellBuffer.cxx \
-	CharClassify.cxx \
-	CharacterSet.cxx \
-	ContractionState.cxx \
-	Decoration.cxx \
-	Document.cxx \
-	Editor.cxx \
-	ExternalLexer.cxx \
-	Indicator.cxx \
-	KeyMap.cxx \
-	LineMarker.cxx \
-	PerLine.cxx \
-	PlatGTK.cxx \
-	PositionCache.cxx \
-	PropSetSimple.cxx \
-	RESearch.cxx \
-	RunStyles.cxx \
-	ScintillaBase.cxx \
-	ScintillaGTK.cxx \
-	Selection.cxx \
-	StyleContext.cxx\
-	Style.cxx \
-	UniConversion.cxx \
-	ViewStyle.cxx \
-	WordList.cxx \
-	XPM.cxx\
-	Accessor.h \
-	AutoComplete.h \
-	CallTip.h \
-	Catalogue.h \
-	CellBuffer.h \
-	CharacterSet.h \
-	CharClassify.h \
-	ContractionState.h \
-	Converter.h \
-	Decoration.h \
-	Document.h \
-	Editor.h \
-	ExternalLexer.h \
-	Indicator.h \
-	KeyMap.h \
-	LexAccessor.h \
-	LexerModule.h \
-	LexerBase.h \
-	LexerSimple.h \
-	LineMarker.h \
-	OptionSet.h \
-	Partitioning.h \
-	PerLine.h \
-	PositionCache.h \
-	PropSetSimple.h \
-	RESearch.h \
-	RunStyles.h \
-	ScintillaBase.h \
-	Selection.h \
-	SparseState.h \
-	SplitVector.h \
-	StyleContext.h\
-	Style.h \
-	SVector.h \
-	UniConversion.h \
-	ViewStyle.h\
-	WordList.h \
-	XPM.h\
-	scintilla-marshal.h\
-	scintilla-marshal.c\
-	$(LEXER_SRCS)
+	src/AutoComplete.cxx \
+	src/AutoComplete.h \
+	src/CallTip.cxx \
+	src/CallTip.h \
+	src/Catalogue.cxx \
+	src/Catalogue.h \
+	src/CellBuffer.cxx \
+	src/CellBuffer.h \
+	src/CharClassify.cxx \
+	src/CharClassify.h \
+	src/ContractionState.cxx \
+	src/ContractionState.h \
+	src/Decoration.cxx \
+	src/Decoration.h \
+	src/Document.cxx \
+	src/Document.h \
+	src/Editor.cxx \
+	src/Editor.h \
+	src/ExternalLexer.cxx \
+	src/ExternalLexer.h \
+	src/Indicator.cxx \
+	src/Indicator.h \
+	src/KeyMap.cxx \
+	src/KeyMap.h \
+	src/LineMarker.cxx \
+	src/LineMarker.h \
+	src/Partitioning.h \
+	src/PerLine.h \
+	src/PerLine.cxx \
+	src/PositionCache.cxx \
+	src/PositionCache.h \
+	src/RESearch.cxx \
+	src/RESearch.h \
+	src/RunStyles.cxx \
+	src/RunStyles.h \
+	src/ScintillaBase.cxx \
+	src/ScintillaBase.h \
+	src/Selection.cxx \
+	src/Selection.h \
+	src/Style.cxx \
+	src/Style.h \
+	src/SVector.h \
+	src/UniConversion.cxx \
+	src/UniConversion.h \
+	src/ViewStyle.cxx \
+	src/ViewStyle.h\
+	src/XPM.cxx\
+	src/XPM.h\
+	lexlib/Accessor.cxx \
+	lexlib/Accessor.h \
+	lexlib/CharacterSet.cxx \
+	lexlib/CharacterSet.h \
+	lexlib/LexAccessor.h \
+	lexlib/LexerBase.cxx \
+	lexlib/LexerBase.h \
+	lexlib/LexerModule.cxx \
+	lexlib/LexerModule.h \
+	lexlib/LexerNoExceptions.cxx \
+	lexlib/LexerNoExceptions.h \
+	lexlib/LexerSimple.cxx \
+	lexlib/LexerSimple.h \
+	lexlib/OptionSet.h \
+	lexlib/PropSetSimple.cxx \
+	lexlib/PropSetSimple.h \
+	lexlib/SparseState.h \
+	lexlib/StyleContext.cxx\
+	lexlib/StyleContext.h\
+	lexlib/WordList.cxx \
+	lexlib/WordList.h \
+	gtk/Converter.h \
+	gtk/PlatGTK.cxx \
+	gtk/ScintillaGTK.cxx \
+	$(LEXER_SRCS) \
+	$(BUILT_SOURCES)
 
 libanjuta_scintilla_la_LIBADD = \
 	$(LIBANJUTA_LIBS) \
@@ -102,18 +107,16 @@ test_scintilla_LDADD = libanjuta-scintilla.la
 $(srcdir)/lexers.make:
 	cd $(srcdir); \
 	echo "## Lexers make file" > $(notdir $@); \
-	echo 'LEXER_OBJS = \' >> $(notdir $@); \
-	echo -n '	StyleContext.o' >> $(notdir $@); \
-	for lex in Lex*.cxx; do \
-		lex=`echo $$lex | sed -e "s,.*/,," -e "s/cxx$$/o/"`; \
+	echo -n 'LEXER_OBJS = ' >> $(notdir $@); \
+	for lex in lexers/*.cxx; do \
 		echo '\' >> $(notdir $@); \
+		lex=`echo $$lex | sed -e "s/cxx$$/o/"`; \
 		echo -n "	$$lex" >> $(notdir $@); \
 	done; \
 	echo "" >> $(notdir $@); \
 	echo "" >> $(notdir $@); \
-	echo 'LEXER_SRCS = \' >> $(notdir $@); \
-	echo -n '	LexerNoExceptions.h' >> $(notdir $@); \
-	for lex in Lex*.cxx; do \
+	echo -n 'LEXER_SRCS = ' >> $(notdir $@); \
+	for lex in lexers/*.cxx; do \
 		echo '\' >> $(notdir $@); \
 		echo -n "	$$lex" >> $(notdir $@); \
 	done; \
@@ -121,15 +124,14 @@ $(srcdir)/lexers.make:
 
 update-scintilla:
 	cd $(srcdir); \
-	cp scintilla/gtk/*.cxx .; \
-	cp scintilla/gtk/*.h .; \
-	cp scintilla/gtk/*.list h.; \
-	cp scintilla/lexers/*.cxx .; \
-	cp scintilla/lexers/*.h .; \
-	cp scintilla/lexlib/*.cxx .; \
-	cp scintilla/lexlib/*.h .; \
-	cp scintilla/src/*.cxx .; \
-	cp scintilla/src/*.h .; \
+	cp scintilla/gtk/*.cxx gtk; \
+	cp scintilla/gtk/*.h gtk; \
+	cp scintilla/gtk/*.list gtk; \
+	cp scintilla/lexers/*.cxx lexers; \
+	cp scintilla/lexlib/*.cxx lexlib; \
+	cp scintilla/lexlib/*.h lexlib; \
+	cp scintilla/src/*.cxx src; \
+	cp scintilla/src/*.h src; \
 	cp scintilla/include/*.h include; \
 	cp scintilla/include/*.py include; \
 	cp scintilla/include/*.iface include; \
@@ -142,8 +144,18 @@ update-scintilla:
 	cd $(srcdir); \
 	./update-properties.pl ../properties/styles.properties scite/src
 
-marshallers: scintilla-marshal.list
-	glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h
-	glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --body > scintilla-marshal.c 
+BUILT_SOURCES=scintilla-marshal.c scintilla-marshal.h
 
-EXTRA_DIST=lexers.make
+
+scintilla-marshal.h: gtk/scintilla-marshal.list
+	$(AM_V_GEN)@GLIB_GENMARSHAL@  --prefix scintilla_marshal $(srcdir)/gtk/scintilla-marshal.list --header > xgen-gmc \
+        && cp xgen-gmc $(@F) \
+        && rm -f xgen-gmc
+
+scintilla-marshal.c: gtk/scintilla-marshal.list
+	$(AM_V_GEN)@GLIB_GENMARSHAL@  --prefix scintilla_marshal $(srcdir)/gtk/scintilla-marshal.list --body > xgen-gmc \
+        && cp xgen-gmc $(@F) \
+        && rm -f xgen-gmc
+
+EXTRA_DIST=lexers.make \
+	gtk/scintilla-marshal.list
diff --git a/plugins/scintilla/scintilla/README.sync b/plugins/scintilla/scintilla/README.sync
index 209d3b9..f47283b 100644
--- a/plugins/scintilla/scintilla/README.sync
+++ b/plugins/scintilla/scintilla/README.sync
@@ -2,18 +2,12 @@
 	HOW TO UPDATE SCINTILLA in ANJUTA
 	
 	
-1 -	Checkout scintilla from CVS "in" the directory anjuta/scintilla (or 
-	make a symlink (ln -s from to) if you already have scintilla checkout elsewhere).
+1 -	Extract scite archive in plugins/scintilla/scintilla directory (or 
+	make a symlink (ln -s from to) if you already have scintilla elsewhere).
 	
-	cvs -z3 -d :pserver:anonymous cvs sourceforge net:/cvsroot/scintilla co \
-	scintilla
+2 -	In the build directory, run: "make update-scintilla" 
 
-
-2 -	Run: "make update-scintilla" 
-
-
-3 -	Run "cvs update" in /anjuta/scintilla/ directory. There you will notice
-	any newly added files (particulary LexXXX.cpp files). Add them in CVS.
-	
+3 -	Run "git status" in plugins/scintilla/scintilla directory to check
+	newly added files (particulary LexXXX.cpp files). Add them in git.
 	
 4 -	Proceed as usual: check for errors during build and commit.
diff --git a/plugins/scintilla/scintilla/Converter.h b/plugins/scintilla/scintilla/gtk/Converter.h
similarity index 100%
rename from plugins/scintilla/scintilla/Converter.h
rename to plugins/scintilla/scintilla/gtk/Converter.h
diff --git a/plugins/scintilla/scintilla/PlatGTK.cxx b/plugins/scintilla/scintilla/gtk/PlatGTK.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/PlatGTK.cxx
rename to plugins/scintilla/scintilla/gtk/PlatGTK.cxx
diff --git a/plugins/scintilla/scintilla/ScintillaGTK.cxx b/plugins/scintilla/scintilla/gtk/ScintillaGTK.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/ScintillaGTK.cxx
rename to plugins/scintilla/scintilla/gtk/ScintillaGTK.cxx
diff --git a/plugins/scintilla/scintilla/scintilla-marshal.list b/plugins/scintilla/scintilla/gtk/scintilla-marshal.list
similarity index 100%
rename from plugins/scintilla/scintilla/scintilla-marshal.list
rename to plugins/scintilla/scintilla/gtk/scintilla-marshal.list
diff --git a/plugins/scintilla/scintilla/lexers.make b/plugins/scintilla/scintilla/lexers.make
index bed029f..298ba5f 100644
--- a/plugins/scintilla/scintilla/lexers.make
+++ b/plugins/scintilla/scintilla/lexers.make
@@ -1,182 +1,172 @@
 ## Lexers make file
 LEXER_OBJS = \
-	StyleContext.o\
-	LexA68k.o\
-	LexAbaqus.o\
-	LexAda.o\
-	LexAPDL.o\
-	LexAsm.o\
-	LexAsn1.o\
-	LexASY.o\
-	LexAU3.o\
-	LexAVE.o\
-	LexAVS.o\
-	LexBaan.o\
-	LexBash.o\
-	LexBasic.o\
-	LexBullant.o\
-	LexCaml.o\
-	LexCLW.o\
-	LexCmake.o\
-	LexCOBOL.o\
-	LexCoffeeScript.o\
-	LexConf.o\
-	LexCPP.o\
-	LexCrontab.o\
-	LexCsound.o\
-	LexCSS.o\
-	LexD.o\
-	LexEiffel.o\
-	LexerBase.o\
-	LexErlang.o\
-	LexerModule.o\
-	LexerNoExceptions.o\
-	LexerSimple.o\
-	LexEScript.o\
-	LexFlagship.o\
-	LexForth.o\
-	LexFortran.o\
-	LexGAP.o\
-	LexGui4Cli.o\
-	LexHaskell.o\
-	LexHTML.o\
-	LexInno.o\
-	LexKix.o\
-	LexLisp.o\
-	LexLout.o\
-	LexLua.o\
-	LexMagik.o\
-	LexMarkdown.o\
-	LexMatlab.o\
-	LexMetapost.o\
-	LexMMIXAL.o\
-	LexModula.o\
-	LexMPT.o\
-	LexMSSQL.o\
-	LexMySQL.o\
-	LexNimrod.o\
-	LexNsis.o\
-	LexOpal.o\
-	LexOthers.o\
-	LexPascal.o\
-	LexPB.o\
-	LexPerl.o\
-	LexPLM.o\
-	LexPOV.o\
-	LexPowerPro.o\
-	LexPowerShell.o\
-	LexProgress.o\
-	LexPS.o\
-	LexPython.o\
-	LexR.o\
-	LexRebol.o\
-	LexRuby.o\
-	LexScriptol.o\
-	LexSmalltalk.o\
-	LexSML.o\
-	LexSorcus.o\
-	LexSpecman.o\
-	LexSpice.o\
-	LexSQL.o\
-	LexTACL.o\
-	LexTADS3.o\
-	LexTAL.o\
-	LexTCL.o\
-	LexTCMD.o\
-	LexTeX.o\
-	LexTxt2tags.o\
-	LexVB.o\
-	LexVerilog.o\
-	LexVHDL.o\
-	LexYAML.o
+	lexers/LexA68k.o\
+	lexers/LexAbaqus.o\
+	lexers/LexAda.o\
+	lexers/LexAPDL.o\
+	lexers/LexAsm.o\
+	lexers/LexAsn1.o\
+	lexers/LexASY.o\
+	lexers/LexAU3.o\
+	lexers/LexAVE.o\
+	lexers/LexAVS.o\
+	lexers/LexBaan.o\
+	lexers/LexBash.o\
+	lexers/LexBasic.o\
+	lexers/LexBullant.o\
+	lexers/LexCaml.o\
+	lexers/LexCLW.o\
+	lexers/LexCmake.o\
+	lexers/LexCOBOL.o\
+	lexers/LexCoffeeScript.o\
+	lexers/LexConf.o\
+	lexers/LexCPP.o\
+	lexers/LexCrontab.o\
+	lexers/LexCsound.o\
+	lexers/LexCSS.o\
+	lexers/LexD.o\
+	lexers/LexEiffel.o\
+	lexers/LexErlang.o\
+	lexers/LexEScript.o\
+	lexers/LexFlagship.o\
+	lexers/LexForth.o\
+	lexers/LexFortran.o\
+	lexers/LexGAP.o\
+	lexers/LexGui4Cli.o\
+	lexers/LexHaskell.o\
+	lexers/LexHTML.o\
+	lexers/LexInno.o\
+	lexers/LexKix.o\
+	lexers/LexLisp.o\
+	lexers/LexLout.o\
+	lexers/LexLua.o\
+	lexers/LexMagik.o\
+	lexers/LexMarkdown.o\
+	lexers/LexMatlab.o\
+	lexers/LexMetapost.o\
+	lexers/LexMMIXAL.o\
+	lexers/LexModula.o\
+	lexers/LexMPT.o\
+	lexers/LexMSSQL.o\
+	lexers/LexMySQL.o\
+	lexers/LexNimrod.o\
+	lexers/LexNsis.o\
+	lexers/LexOpal.o\
+	lexers/LexOthers.o\
+	lexers/LexPascal.o\
+	lexers/LexPB.o\
+	lexers/LexPerl.o\
+	lexers/LexPLM.o\
+	lexers/LexPOV.o\
+	lexers/LexPowerPro.o\
+	lexers/LexPowerShell.o\
+	lexers/LexProgress.o\
+	lexers/LexPS.o\
+	lexers/LexPython.o\
+	lexers/LexR.o\
+	lexers/LexRebol.o\
+	lexers/LexRuby.o\
+	lexers/LexScriptol.o\
+	lexers/LexSmalltalk.o\
+	lexers/LexSML.o\
+	lexers/LexSorcus.o\
+	lexers/LexSpecman.o\
+	lexers/LexSpice.o\
+	lexers/LexSQL.o\
+	lexers/LexTACL.o\
+	lexers/LexTADS3.o\
+	lexers/LexTAL.o\
+	lexers/LexTCL.o\
+	lexers/LexTCMD.o\
+	lexers/LexTeX.o\
+	lexers/LexTxt2tags.o\
+	lexers/LexVB.o\
+	lexers/LexVerilog.o\
+	lexers/LexVHDL.o\
+	lexers/LexYAML.o
 
 LEXER_SRCS = \
-	LexerNoExceptions.h\
-	LexA68k.cxx\
-	LexAbaqus.cxx\
-	LexAda.cxx\
-	LexAPDL.cxx\
-	LexAsm.cxx\
-	LexAsn1.cxx\
-	LexASY.cxx\
-	LexAU3.cxx\
-	LexAVE.cxx\
-	LexAVS.cxx\
-	LexBaan.cxx\
-	LexBash.cxx\
-	LexBasic.cxx\
-	LexBullant.cxx\
-	LexCaml.cxx\
-	LexCLW.cxx\
-	LexCmake.cxx\
-	LexCOBOL.cxx\
-	LexCoffeeScript.cxx\
-	LexConf.cxx\
-	LexCPP.cxx\
-	LexCrontab.cxx\
-	LexCsound.cxx\
-	LexCSS.cxx\
-	LexD.cxx\
-	LexEiffel.cxx\
-	LexerBase.cxx\
-	LexErlang.cxx\
-	LexerModule.cxx\
-	LexerNoExceptions.cxx\
-	LexerSimple.cxx\
-	LexEScript.cxx\
-	LexFlagship.cxx\
-	LexForth.cxx\
-	LexFortran.cxx\
-	LexGAP.cxx\
-	LexGui4Cli.cxx\
-	LexHaskell.cxx\
-	LexHTML.cxx\
-	LexInno.cxx\
-	LexKix.cxx\
-	LexLisp.cxx\
-	LexLout.cxx\
-	LexLua.cxx\
-	LexMagik.cxx\
-	LexMarkdown.cxx\
-	LexMatlab.cxx\
-	LexMetapost.cxx\
-	LexMMIXAL.cxx\
-	LexModula.cxx\
-	LexMPT.cxx\
-	LexMSSQL.cxx\
-	LexMySQL.cxx\
-	LexNimrod.cxx\
-	LexNsis.cxx\
-	LexOpal.cxx\
-	LexOthers.cxx\
-	LexPascal.cxx\
-	LexPB.cxx\
-	LexPerl.cxx\
-	LexPLM.cxx\
-	LexPOV.cxx\
-	LexPowerPro.cxx\
-	LexPowerShell.cxx\
-	LexProgress.cxx\
-	LexPS.cxx\
-	LexPython.cxx\
-	LexR.cxx\
-	LexRebol.cxx\
-	LexRuby.cxx\
-	LexScriptol.cxx\
-	LexSmalltalk.cxx\
-	LexSML.cxx\
-	LexSorcus.cxx\
-	LexSpecman.cxx\
-	LexSpice.cxx\
-	LexSQL.cxx\
-	LexTACL.cxx\
-	LexTADS3.cxx\
-	LexTAL.cxx\
-	LexTCL.cxx\
-	LexTCMD.cxx\
-	LexTeX.cxx\
-	LexTxt2tags.cxx\
-	LexVB.cxx\
-	LexVerilog.cxx\
-	LexVHDL.cxx\
-	LexYAML.cxx
+	lexers/LexA68k.cxx\
+	lexers/LexAbaqus.cxx\
+	lexers/LexAda.cxx\
+	lexers/LexAPDL.cxx\
+	lexers/LexAsm.cxx\
+	lexers/LexAsn1.cxx\
+	lexers/LexASY.cxx\
+	lexers/LexAU3.cxx\
+	lexers/LexAVE.cxx\
+	lexers/LexAVS.cxx\
+	lexers/LexBaan.cxx\
+	lexers/LexBash.cxx\
+	lexers/LexBasic.cxx\
+	lexers/LexBullant.cxx\
+	lexers/LexCaml.cxx\
+	lexers/LexCLW.cxx\
+	lexers/LexCmake.cxx\
+	lexers/LexCOBOL.cxx\
+	lexers/LexCoffeeScript.cxx\
+	lexers/LexConf.cxx\
+	lexers/LexCPP.cxx\
+	lexers/LexCrontab.cxx\
+	lexers/LexCsound.cxx\
+	lexers/LexCSS.cxx\
+	lexers/LexD.cxx\
+	lexers/LexEiffel.cxx\
+	lexers/LexErlang.cxx\
+	lexers/LexEScript.cxx\
+	lexers/LexFlagship.cxx\
+	lexers/LexForth.cxx\
+	lexers/LexFortran.cxx\
+	lexers/LexGAP.cxx\
+	lexers/LexGui4Cli.cxx\
+	lexers/LexHaskell.cxx\
+	lexers/LexHTML.cxx\
+	lexers/LexInno.cxx\
+	lexers/LexKix.cxx\
+	lexers/LexLisp.cxx\
+	lexers/LexLout.cxx\
+	lexers/LexLua.cxx\
+	lexers/LexMagik.cxx\
+	lexers/LexMarkdown.cxx\
+	lexers/LexMatlab.cxx\
+	lexers/LexMetapost.cxx\
+	lexers/LexMMIXAL.cxx\
+	lexers/LexModula.cxx\
+	lexers/LexMPT.cxx\
+	lexers/LexMSSQL.cxx\
+	lexers/LexMySQL.cxx\
+	lexers/LexNimrod.cxx\
+	lexers/LexNsis.cxx\
+	lexers/LexOpal.cxx\
+	lexers/LexOthers.cxx\
+	lexers/LexPascal.cxx\
+	lexers/LexPB.cxx\
+	lexers/LexPerl.cxx\
+	lexers/LexPLM.cxx\
+	lexers/LexPOV.cxx\
+	lexers/LexPowerPro.cxx\
+	lexers/LexPowerShell.cxx\
+	lexers/LexProgress.cxx\
+	lexers/LexPS.cxx\
+	lexers/LexPython.cxx\
+	lexers/LexR.cxx\
+	lexers/LexRebol.cxx\
+	lexers/LexRuby.cxx\
+	lexers/LexScriptol.cxx\
+	lexers/LexSmalltalk.cxx\
+	lexers/LexSML.cxx\
+	lexers/LexSorcus.cxx\
+	lexers/LexSpecman.cxx\
+	lexers/LexSpice.cxx\
+	lexers/LexSQL.cxx\
+	lexers/LexTACL.cxx\
+	lexers/LexTADS3.cxx\
+	lexers/LexTAL.cxx\
+	lexers/LexTCL.cxx\
+	lexers/LexTCMD.cxx\
+	lexers/LexTeX.cxx\
+	lexers/LexTxt2tags.cxx\
+	lexers/LexVB.cxx\
+	lexers/LexVerilog.cxx\
+	lexers/LexVHDL.cxx\
+	lexers/LexYAML.cxx
diff --git a/plugins/scintilla/scintilla/LexA68k.cxx b/plugins/scintilla/scintilla/lexers/LexA68k.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexA68k.cxx
rename to plugins/scintilla/scintilla/lexers/LexA68k.cxx
diff --git a/plugins/scintilla/scintilla/LexAPDL.cxx b/plugins/scintilla/scintilla/lexers/LexAPDL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAPDL.cxx
rename to plugins/scintilla/scintilla/lexers/LexAPDL.cxx
diff --git a/plugins/scintilla/scintilla/LexASY.cxx b/plugins/scintilla/scintilla/lexers/LexASY.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexASY.cxx
rename to plugins/scintilla/scintilla/lexers/LexASY.cxx
diff --git a/plugins/scintilla/scintilla/LexAU3.cxx b/plugins/scintilla/scintilla/lexers/LexAU3.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAU3.cxx
rename to plugins/scintilla/scintilla/lexers/LexAU3.cxx
diff --git a/plugins/scintilla/scintilla/LexAVE.cxx b/plugins/scintilla/scintilla/lexers/LexAVE.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAVE.cxx
rename to plugins/scintilla/scintilla/lexers/LexAVE.cxx
diff --git a/plugins/scintilla/scintilla/LexAVS.cxx b/plugins/scintilla/scintilla/lexers/LexAVS.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAVS.cxx
rename to plugins/scintilla/scintilla/lexers/LexAVS.cxx
diff --git a/plugins/scintilla/scintilla/LexAbaqus.cxx b/plugins/scintilla/scintilla/lexers/LexAbaqus.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAbaqus.cxx
rename to plugins/scintilla/scintilla/lexers/LexAbaqus.cxx
diff --git a/plugins/scintilla/scintilla/LexAda.cxx b/plugins/scintilla/scintilla/lexers/LexAda.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAda.cxx
rename to plugins/scintilla/scintilla/lexers/LexAda.cxx
diff --git a/plugins/scintilla/scintilla/LexAsm.cxx b/plugins/scintilla/scintilla/lexers/LexAsm.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAsm.cxx
rename to plugins/scintilla/scintilla/lexers/LexAsm.cxx
diff --git a/plugins/scintilla/scintilla/LexAsn1.cxx b/plugins/scintilla/scintilla/lexers/LexAsn1.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexAsn1.cxx
rename to plugins/scintilla/scintilla/lexers/LexAsn1.cxx
diff --git a/plugins/scintilla/scintilla/LexBaan.cxx b/plugins/scintilla/scintilla/lexers/LexBaan.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexBaan.cxx
rename to plugins/scintilla/scintilla/lexers/LexBaan.cxx
diff --git a/plugins/scintilla/scintilla/LexBash.cxx b/plugins/scintilla/scintilla/lexers/LexBash.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexBash.cxx
rename to plugins/scintilla/scintilla/lexers/LexBash.cxx
diff --git a/plugins/scintilla/scintilla/LexBasic.cxx b/plugins/scintilla/scintilla/lexers/LexBasic.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexBasic.cxx
rename to plugins/scintilla/scintilla/lexers/LexBasic.cxx
diff --git a/plugins/scintilla/scintilla/LexBullant.cxx b/plugins/scintilla/scintilla/lexers/LexBullant.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexBullant.cxx
rename to plugins/scintilla/scintilla/lexers/LexBullant.cxx
diff --git a/plugins/scintilla/scintilla/LexCLW.cxx b/plugins/scintilla/scintilla/lexers/LexCLW.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCLW.cxx
rename to plugins/scintilla/scintilla/lexers/LexCLW.cxx
diff --git a/plugins/scintilla/scintilla/LexCOBOL.cxx b/plugins/scintilla/scintilla/lexers/LexCOBOL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCOBOL.cxx
rename to plugins/scintilla/scintilla/lexers/LexCOBOL.cxx
diff --git a/plugins/scintilla/scintilla/LexCPP.cxx b/plugins/scintilla/scintilla/lexers/LexCPP.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCPP.cxx
rename to plugins/scintilla/scintilla/lexers/LexCPP.cxx
diff --git a/plugins/scintilla/scintilla/LexCSS.cxx b/plugins/scintilla/scintilla/lexers/LexCSS.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCSS.cxx
rename to plugins/scintilla/scintilla/lexers/LexCSS.cxx
diff --git a/plugins/scintilla/scintilla/LexCaml.cxx b/plugins/scintilla/scintilla/lexers/LexCaml.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCaml.cxx
rename to plugins/scintilla/scintilla/lexers/LexCaml.cxx
diff --git a/plugins/scintilla/scintilla/LexCmake.cxx b/plugins/scintilla/scintilla/lexers/LexCmake.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCmake.cxx
rename to plugins/scintilla/scintilla/lexers/LexCmake.cxx
diff --git a/plugins/scintilla/scintilla/LexCoffeeScript.cxx b/plugins/scintilla/scintilla/lexers/LexCoffeeScript.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCoffeeScript.cxx
rename to plugins/scintilla/scintilla/lexers/LexCoffeeScript.cxx
diff --git a/plugins/scintilla/scintilla/LexConf.cxx b/plugins/scintilla/scintilla/lexers/LexConf.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexConf.cxx
rename to plugins/scintilla/scintilla/lexers/LexConf.cxx
diff --git a/plugins/scintilla/scintilla/LexCrontab.cxx b/plugins/scintilla/scintilla/lexers/LexCrontab.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCrontab.cxx
rename to plugins/scintilla/scintilla/lexers/LexCrontab.cxx
diff --git a/plugins/scintilla/scintilla/LexCsound.cxx b/plugins/scintilla/scintilla/lexers/LexCsound.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexCsound.cxx
rename to plugins/scintilla/scintilla/lexers/LexCsound.cxx
diff --git a/plugins/scintilla/scintilla/LexD.cxx b/plugins/scintilla/scintilla/lexers/LexD.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexD.cxx
rename to plugins/scintilla/scintilla/lexers/LexD.cxx
diff --git a/plugins/scintilla/scintilla/LexEScript.cxx b/plugins/scintilla/scintilla/lexers/LexEScript.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexEScript.cxx
rename to plugins/scintilla/scintilla/lexers/LexEScript.cxx
diff --git a/plugins/scintilla/scintilla/LexEiffel.cxx b/plugins/scintilla/scintilla/lexers/LexEiffel.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexEiffel.cxx
rename to plugins/scintilla/scintilla/lexers/LexEiffel.cxx
diff --git a/plugins/scintilla/scintilla/LexErlang.cxx b/plugins/scintilla/scintilla/lexers/LexErlang.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexErlang.cxx
rename to plugins/scintilla/scintilla/lexers/LexErlang.cxx
diff --git a/plugins/scintilla/scintilla/LexFlagship.cxx b/plugins/scintilla/scintilla/lexers/LexFlagship.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexFlagship.cxx
rename to plugins/scintilla/scintilla/lexers/LexFlagship.cxx
diff --git a/plugins/scintilla/scintilla/LexForth.cxx b/plugins/scintilla/scintilla/lexers/LexForth.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexForth.cxx
rename to plugins/scintilla/scintilla/lexers/LexForth.cxx
diff --git a/plugins/scintilla/scintilla/LexFortran.cxx b/plugins/scintilla/scintilla/lexers/LexFortran.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexFortran.cxx
rename to plugins/scintilla/scintilla/lexers/LexFortran.cxx
diff --git a/plugins/scintilla/scintilla/LexGAP.cxx b/plugins/scintilla/scintilla/lexers/LexGAP.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexGAP.cxx
rename to plugins/scintilla/scintilla/lexers/LexGAP.cxx
diff --git a/plugins/scintilla/scintilla/LexGui4Cli.cxx b/plugins/scintilla/scintilla/lexers/LexGui4Cli.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexGui4Cli.cxx
rename to plugins/scintilla/scintilla/lexers/LexGui4Cli.cxx
diff --git a/plugins/scintilla/scintilla/LexHTML.cxx b/plugins/scintilla/scintilla/lexers/LexHTML.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexHTML.cxx
rename to plugins/scintilla/scintilla/lexers/LexHTML.cxx
diff --git a/plugins/scintilla/scintilla/LexHaskell.cxx b/plugins/scintilla/scintilla/lexers/LexHaskell.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexHaskell.cxx
rename to plugins/scintilla/scintilla/lexers/LexHaskell.cxx
diff --git a/plugins/scintilla/scintilla/LexInno.cxx b/plugins/scintilla/scintilla/lexers/LexInno.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexInno.cxx
rename to plugins/scintilla/scintilla/lexers/LexInno.cxx
diff --git a/plugins/scintilla/scintilla/LexKix.cxx b/plugins/scintilla/scintilla/lexers/LexKix.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexKix.cxx
rename to plugins/scintilla/scintilla/lexers/LexKix.cxx
diff --git a/plugins/scintilla/scintilla/LexLisp.cxx b/plugins/scintilla/scintilla/lexers/LexLisp.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexLisp.cxx
rename to plugins/scintilla/scintilla/lexers/LexLisp.cxx
diff --git a/plugins/scintilla/scintilla/LexLout.cxx b/plugins/scintilla/scintilla/lexers/LexLout.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexLout.cxx
rename to plugins/scintilla/scintilla/lexers/LexLout.cxx
diff --git a/plugins/scintilla/scintilla/LexLua.cxx b/plugins/scintilla/scintilla/lexers/LexLua.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexLua.cxx
rename to plugins/scintilla/scintilla/lexers/LexLua.cxx
diff --git a/plugins/scintilla/scintilla/LexMMIXAL.cxx b/plugins/scintilla/scintilla/lexers/LexMMIXAL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMMIXAL.cxx
rename to plugins/scintilla/scintilla/lexers/LexMMIXAL.cxx
diff --git a/plugins/scintilla/scintilla/LexMPT.cxx b/plugins/scintilla/scintilla/lexers/LexMPT.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMPT.cxx
rename to plugins/scintilla/scintilla/lexers/LexMPT.cxx
diff --git a/plugins/scintilla/scintilla/LexMSSQL.cxx b/plugins/scintilla/scintilla/lexers/LexMSSQL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMSSQL.cxx
rename to plugins/scintilla/scintilla/lexers/LexMSSQL.cxx
diff --git a/plugins/scintilla/scintilla/LexMagik.cxx b/plugins/scintilla/scintilla/lexers/LexMagik.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMagik.cxx
rename to plugins/scintilla/scintilla/lexers/LexMagik.cxx
diff --git a/plugins/scintilla/scintilla/LexMarkdown.cxx b/plugins/scintilla/scintilla/lexers/LexMarkdown.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMarkdown.cxx
rename to plugins/scintilla/scintilla/lexers/LexMarkdown.cxx
diff --git a/plugins/scintilla/scintilla/LexMatlab.cxx b/plugins/scintilla/scintilla/lexers/LexMatlab.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMatlab.cxx
rename to plugins/scintilla/scintilla/lexers/LexMatlab.cxx
diff --git a/plugins/scintilla/scintilla/LexMetapost.cxx b/plugins/scintilla/scintilla/lexers/LexMetapost.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMetapost.cxx
rename to plugins/scintilla/scintilla/lexers/LexMetapost.cxx
diff --git a/plugins/scintilla/scintilla/LexModula.cxx b/plugins/scintilla/scintilla/lexers/LexModula.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexModula.cxx
rename to plugins/scintilla/scintilla/lexers/LexModula.cxx
diff --git a/plugins/scintilla/scintilla/LexMySQL.cxx b/plugins/scintilla/scintilla/lexers/LexMySQL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexMySQL.cxx
rename to plugins/scintilla/scintilla/lexers/LexMySQL.cxx
diff --git a/plugins/scintilla/scintilla/LexNimrod.cxx b/plugins/scintilla/scintilla/lexers/LexNimrod.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexNimrod.cxx
rename to plugins/scintilla/scintilla/lexers/LexNimrod.cxx
diff --git a/plugins/scintilla/scintilla/LexNsis.cxx b/plugins/scintilla/scintilla/lexers/LexNsis.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexNsis.cxx
rename to plugins/scintilla/scintilla/lexers/LexNsis.cxx
diff --git a/plugins/scintilla/scintilla/LexOpal.cxx b/plugins/scintilla/scintilla/lexers/LexOpal.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexOpal.cxx
rename to plugins/scintilla/scintilla/lexers/LexOpal.cxx
diff --git a/plugins/scintilla/scintilla/LexOthers.cxx b/plugins/scintilla/scintilla/lexers/LexOthers.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexOthers.cxx
rename to plugins/scintilla/scintilla/lexers/LexOthers.cxx
diff --git a/plugins/scintilla/scintilla/LexPB.cxx b/plugins/scintilla/scintilla/lexers/LexPB.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPB.cxx
rename to plugins/scintilla/scintilla/lexers/LexPB.cxx
diff --git a/plugins/scintilla/scintilla/LexPLM.cxx b/plugins/scintilla/scintilla/lexers/LexPLM.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPLM.cxx
rename to plugins/scintilla/scintilla/lexers/LexPLM.cxx
diff --git a/plugins/scintilla/scintilla/LexPOV.cxx b/plugins/scintilla/scintilla/lexers/LexPOV.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPOV.cxx
rename to plugins/scintilla/scintilla/lexers/LexPOV.cxx
diff --git a/plugins/scintilla/scintilla/LexPS.cxx b/plugins/scintilla/scintilla/lexers/LexPS.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPS.cxx
rename to plugins/scintilla/scintilla/lexers/LexPS.cxx
diff --git a/plugins/scintilla/scintilla/LexPascal.cxx b/plugins/scintilla/scintilla/lexers/LexPascal.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPascal.cxx
rename to plugins/scintilla/scintilla/lexers/LexPascal.cxx
diff --git a/plugins/scintilla/scintilla/LexPerl.cxx b/plugins/scintilla/scintilla/lexers/LexPerl.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPerl.cxx
rename to plugins/scintilla/scintilla/lexers/LexPerl.cxx
diff --git a/plugins/scintilla/scintilla/LexPowerPro.cxx b/plugins/scintilla/scintilla/lexers/LexPowerPro.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPowerPro.cxx
rename to plugins/scintilla/scintilla/lexers/LexPowerPro.cxx
diff --git a/plugins/scintilla/scintilla/LexPowerShell.cxx b/plugins/scintilla/scintilla/lexers/LexPowerShell.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPowerShell.cxx
rename to plugins/scintilla/scintilla/lexers/LexPowerShell.cxx
diff --git a/plugins/scintilla/scintilla/LexProgress.cxx b/plugins/scintilla/scintilla/lexers/LexProgress.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexProgress.cxx
rename to plugins/scintilla/scintilla/lexers/LexProgress.cxx
diff --git a/plugins/scintilla/scintilla/LexPython.cxx b/plugins/scintilla/scintilla/lexers/LexPython.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexPython.cxx
rename to plugins/scintilla/scintilla/lexers/LexPython.cxx
diff --git a/plugins/scintilla/scintilla/LexR.cxx b/plugins/scintilla/scintilla/lexers/LexR.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexR.cxx
rename to plugins/scintilla/scintilla/lexers/LexR.cxx
diff --git a/plugins/scintilla/scintilla/LexRebol.cxx b/plugins/scintilla/scintilla/lexers/LexRebol.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexRebol.cxx
rename to plugins/scintilla/scintilla/lexers/LexRebol.cxx
diff --git a/plugins/scintilla/scintilla/LexRuby.cxx b/plugins/scintilla/scintilla/lexers/LexRuby.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexRuby.cxx
rename to plugins/scintilla/scintilla/lexers/LexRuby.cxx
diff --git a/plugins/scintilla/scintilla/LexSML.cxx b/plugins/scintilla/scintilla/lexers/LexSML.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexSML.cxx
rename to plugins/scintilla/scintilla/lexers/LexSML.cxx
diff --git a/plugins/scintilla/scintilla/LexSQL.cxx b/plugins/scintilla/scintilla/lexers/LexSQL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexSQL.cxx
rename to plugins/scintilla/scintilla/lexers/LexSQL.cxx
diff --git a/plugins/scintilla/scintilla/LexScriptol.cxx b/plugins/scintilla/scintilla/lexers/LexScriptol.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexScriptol.cxx
rename to plugins/scintilla/scintilla/lexers/LexScriptol.cxx
diff --git a/plugins/scintilla/scintilla/LexSmalltalk.cxx b/plugins/scintilla/scintilla/lexers/LexSmalltalk.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexSmalltalk.cxx
rename to plugins/scintilla/scintilla/lexers/LexSmalltalk.cxx
diff --git a/plugins/scintilla/scintilla/LexSorcus.cxx b/plugins/scintilla/scintilla/lexers/LexSorcus.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexSorcus.cxx
rename to plugins/scintilla/scintilla/lexers/LexSorcus.cxx
diff --git a/plugins/scintilla/scintilla/LexSpecman.cxx b/plugins/scintilla/scintilla/lexers/LexSpecman.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexSpecman.cxx
rename to plugins/scintilla/scintilla/lexers/LexSpecman.cxx
diff --git a/plugins/scintilla/scintilla/LexSpice.cxx b/plugins/scintilla/scintilla/lexers/LexSpice.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexSpice.cxx
rename to plugins/scintilla/scintilla/lexers/LexSpice.cxx
diff --git a/plugins/scintilla/scintilla/LexTACL.cxx b/plugins/scintilla/scintilla/lexers/LexTACL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexTACL.cxx
rename to plugins/scintilla/scintilla/lexers/LexTACL.cxx
diff --git a/plugins/scintilla/scintilla/LexTADS3.cxx b/plugins/scintilla/scintilla/lexers/LexTADS3.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexTADS3.cxx
rename to plugins/scintilla/scintilla/lexers/LexTADS3.cxx
diff --git a/plugins/scintilla/scintilla/LexTAL.cxx b/plugins/scintilla/scintilla/lexers/LexTAL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexTAL.cxx
rename to plugins/scintilla/scintilla/lexers/LexTAL.cxx
diff --git a/plugins/scintilla/scintilla/LexTCL.cxx b/plugins/scintilla/scintilla/lexers/LexTCL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexTCL.cxx
rename to plugins/scintilla/scintilla/lexers/LexTCL.cxx
diff --git a/plugins/scintilla/scintilla/LexTCMD.cxx b/plugins/scintilla/scintilla/lexers/LexTCMD.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexTCMD.cxx
rename to plugins/scintilla/scintilla/lexers/LexTCMD.cxx
diff --git a/plugins/scintilla/scintilla/LexTeX.cxx b/plugins/scintilla/scintilla/lexers/LexTeX.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexTeX.cxx
rename to plugins/scintilla/scintilla/lexers/LexTeX.cxx
diff --git a/plugins/scintilla/scintilla/LexTxt2tags.cxx b/plugins/scintilla/scintilla/lexers/LexTxt2tags.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexTxt2tags.cxx
rename to plugins/scintilla/scintilla/lexers/LexTxt2tags.cxx
diff --git a/plugins/scintilla/scintilla/LexVB.cxx b/plugins/scintilla/scintilla/lexers/LexVB.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexVB.cxx
rename to plugins/scintilla/scintilla/lexers/LexVB.cxx
diff --git a/plugins/scintilla/scintilla/LexVHDL.cxx b/plugins/scintilla/scintilla/lexers/LexVHDL.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexVHDL.cxx
rename to plugins/scintilla/scintilla/lexers/LexVHDL.cxx
diff --git a/plugins/scintilla/scintilla/LexVerilog.cxx b/plugins/scintilla/scintilla/lexers/LexVerilog.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexVerilog.cxx
rename to plugins/scintilla/scintilla/lexers/LexVerilog.cxx
diff --git a/plugins/scintilla/scintilla/LexYAML.cxx b/plugins/scintilla/scintilla/lexers/LexYAML.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexYAML.cxx
rename to plugins/scintilla/scintilla/lexers/LexYAML.cxx
diff --git a/plugins/scintilla/scintilla/Accessor.cxx b/plugins/scintilla/scintilla/lexlib/Accessor.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Accessor.cxx
rename to plugins/scintilla/scintilla/lexlib/Accessor.cxx
diff --git a/plugins/scintilla/scintilla/Accessor.h b/plugins/scintilla/scintilla/lexlib/Accessor.h
similarity index 100%
rename from plugins/scintilla/scintilla/Accessor.h
rename to plugins/scintilla/scintilla/lexlib/Accessor.h
diff --git a/plugins/scintilla/scintilla/CharacterSet.cxx b/plugins/scintilla/scintilla/lexlib/CharacterSet.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/CharacterSet.cxx
rename to plugins/scintilla/scintilla/lexlib/CharacterSet.cxx
diff --git a/plugins/scintilla/scintilla/CharacterSet.h b/plugins/scintilla/scintilla/lexlib/CharacterSet.h
similarity index 100%
rename from plugins/scintilla/scintilla/CharacterSet.h
rename to plugins/scintilla/scintilla/lexlib/CharacterSet.h
diff --git a/plugins/scintilla/scintilla/LexAccessor.h b/plugins/scintilla/scintilla/lexlib/LexAccessor.h
similarity index 100%
rename from plugins/scintilla/scintilla/LexAccessor.h
rename to plugins/scintilla/scintilla/lexlib/LexAccessor.h
diff --git a/plugins/scintilla/scintilla/LexerBase.cxx b/plugins/scintilla/scintilla/lexlib/LexerBase.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexerBase.cxx
rename to plugins/scintilla/scintilla/lexlib/LexerBase.cxx
diff --git a/plugins/scintilla/scintilla/LexerBase.h b/plugins/scintilla/scintilla/lexlib/LexerBase.h
similarity index 100%
rename from plugins/scintilla/scintilla/LexerBase.h
rename to plugins/scintilla/scintilla/lexlib/LexerBase.h
diff --git a/plugins/scintilla/scintilla/LexerModule.cxx b/plugins/scintilla/scintilla/lexlib/LexerModule.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexerModule.cxx
rename to plugins/scintilla/scintilla/lexlib/LexerModule.cxx
diff --git a/plugins/scintilla/scintilla/LexerModule.h b/plugins/scintilla/scintilla/lexlib/LexerModule.h
similarity index 100%
rename from plugins/scintilla/scintilla/LexerModule.h
rename to plugins/scintilla/scintilla/lexlib/LexerModule.h
diff --git a/plugins/scintilla/scintilla/LexerNoExceptions.cxx b/plugins/scintilla/scintilla/lexlib/LexerNoExceptions.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexerNoExceptions.cxx
rename to plugins/scintilla/scintilla/lexlib/LexerNoExceptions.cxx
diff --git a/plugins/scintilla/scintilla/LexerNoExceptions.h b/plugins/scintilla/scintilla/lexlib/LexerNoExceptions.h
similarity index 100%
rename from plugins/scintilla/scintilla/LexerNoExceptions.h
rename to plugins/scintilla/scintilla/lexlib/LexerNoExceptions.h
diff --git a/plugins/scintilla/scintilla/LexerSimple.cxx b/plugins/scintilla/scintilla/lexlib/LexerSimple.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LexerSimple.cxx
rename to plugins/scintilla/scintilla/lexlib/LexerSimple.cxx
diff --git a/plugins/scintilla/scintilla/LexerSimple.h b/plugins/scintilla/scintilla/lexlib/LexerSimple.h
similarity index 100%
rename from plugins/scintilla/scintilla/LexerSimple.h
rename to plugins/scintilla/scintilla/lexlib/LexerSimple.h
diff --git a/plugins/scintilla/scintilla/OptionSet.h b/plugins/scintilla/scintilla/lexlib/OptionSet.h
similarity index 100%
rename from plugins/scintilla/scintilla/OptionSet.h
rename to plugins/scintilla/scintilla/lexlib/OptionSet.h
diff --git a/plugins/scintilla/scintilla/PropSetSimple.cxx b/plugins/scintilla/scintilla/lexlib/PropSetSimple.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/PropSetSimple.cxx
rename to plugins/scintilla/scintilla/lexlib/PropSetSimple.cxx
diff --git a/plugins/scintilla/scintilla/PropSetSimple.h b/plugins/scintilla/scintilla/lexlib/PropSetSimple.h
similarity index 100%
rename from plugins/scintilla/scintilla/PropSetSimple.h
rename to plugins/scintilla/scintilla/lexlib/PropSetSimple.h
diff --git a/plugins/scintilla/scintilla/SparseState.h b/plugins/scintilla/scintilla/lexlib/SparseState.h
similarity index 100%
rename from plugins/scintilla/scintilla/SparseState.h
rename to plugins/scintilla/scintilla/lexlib/SparseState.h
diff --git a/plugins/scintilla/scintilla/StyleContext.cxx b/plugins/scintilla/scintilla/lexlib/StyleContext.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/StyleContext.cxx
rename to plugins/scintilla/scintilla/lexlib/StyleContext.cxx
diff --git a/plugins/scintilla/scintilla/StyleContext.h b/plugins/scintilla/scintilla/lexlib/StyleContext.h
similarity index 100%
rename from plugins/scintilla/scintilla/StyleContext.h
rename to plugins/scintilla/scintilla/lexlib/StyleContext.h
diff --git a/plugins/scintilla/scintilla/WordList.cxx b/plugins/scintilla/scintilla/lexlib/WordList.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/WordList.cxx
rename to plugins/scintilla/scintilla/lexlib/WordList.cxx
diff --git a/plugins/scintilla/scintilla/WordList.h b/plugins/scintilla/scintilla/lexlib/WordList.h
similarity index 100%
rename from plugins/scintilla/scintilla/WordList.h
rename to plugins/scintilla/scintilla/lexlib/WordList.h
diff --git a/plugins/scintilla/scintilla/AutoComplete.cxx b/plugins/scintilla/scintilla/src/AutoComplete.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/AutoComplete.cxx
rename to plugins/scintilla/scintilla/src/AutoComplete.cxx
diff --git a/plugins/scintilla/scintilla/AutoComplete.h b/plugins/scintilla/scintilla/src/AutoComplete.h
similarity index 100%
rename from plugins/scintilla/scintilla/AutoComplete.h
rename to plugins/scintilla/scintilla/src/AutoComplete.h
diff --git a/plugins/scintilla/scintilla/CallTip.cxx b/plugins/scintilla/scintilla/src/CallTip.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/CallTip.cxx
rename to plugins/scintilla/scintilla/src/CallTip.cxx
diff --git a/plugins/scintilla/scintilla/CallTip.h b/plugins/scintilla/scintilla/src/CallTip.h
similarity index 100%
rename from plugins/scintilla/scintilla/CallTip.h
rename to plugins/scintilla/scintilla/src/CallTip.h
diff --git a/plugins/scintilla/scintilla/Catalogue.cxx b/plugins/scintilla/scintilla/src/Catalogue.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Catalogue.cxx
rename to plugins/scintilla/scintilla/src/Catalogue.cxx
diff --git a/plugins/scintilla/scintilla/Catalogue.h b/plugins/scintilla/scintilla/src/Catalogue.h
similarity index 100%
rename from plugins/scintilla/scintilla/Catalogue.h
rename to plugins/scintilla/scintilla/src/Catalogue.h
diff --git a/plugins/scintilla/scintilla/CellBuffer.cxx b/plugins/scintilla/scintilla/src/CellBuffer.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/CellBuffer.cxx
rename to plugins/scintilla/scintilla/src/CellBuffer.cxx
diff --git a/plugins/scintilla/scintilla/CellBuffer.h b/plugins/scintilla/scintilla/src/CellBuffer.h
similarity index 100%
rename from plugins/scintilla/scintilla/CellBuffer.h
rename to plugins/scintilla/scintilla/src/CellBuffer.h
diff --git a/plugins/scintilla/scintilla/CharClassify.cxx b/plugins/scintilla/scintilla/src/CharClassify.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/CharClassify.cxx
rename to plugins/scintilla/scintilla/src/CharClassify.cxx
diff --git a/plugins/scintilla/scintilla/CharClassify.h b/plugins/scintilla/scintilla/src/CharClassify.h
similarity index 100%
rename from plugins/scintilla/scintilla/CharClassify.h
rename to plugins/scintilla/scintilla/src/CharClassify.h
diff --git a/plugins/scintilla/scintilla/ContractionState.cxx b/plugins/scintilla/scintilla/src/ContractionState.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/ContractionState.cxx
rename to plugins/scintilla/scintilla/src/ContractionState.cxx
diff --git a/plugins/scintilla/scintilla/ContractionState.h b/plugins/scintilla/scintilla/src/ContractionState.h
similarity index 100%
rename from plugins/scintilla/scintilla/ContractionState.h
rename to plugins/scintilla/scintilla/src/ContractionState.h
diff --git a/plugins/scintilla/scintilla/Decoration.cxx b/plugins/scintilla/scintilla/src/Decoration.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Decoration.cxx
rename to plugins/scintilla/scintilla/src/Decoration.cxx
diff --git a/plugins/scintilla/scintilla/Decoration.h b/plugins/scintilla/scintilla/src/Decoration.h
similarity index 100%
rename from plugins/scintilla/scintilla/Decoration.h
rename to plugins/scintilla/scintilla/src/Decoration.h
diff --git a/plugins/scintilla/scintilla/Document.cxx b/plugins/scintilla/scintilla/src/Document.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Document.cxx
rename to plugins/scintilla/scintilla/src/Document.cxx
diff --git a/plugins/scintilla/scintilla/Document.h b/plugins/scintilla/scintilla/src/Document.h
similarity index 100%
rename from plugins/scintilla/scintilla/Document.h
rename to plugins/scintilla/scintilla/src/Document.h
diff --git a/plugins/scintilla/scintilla/Editor.cxx b/plugins/scintilla/scintilla/src/Editor.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Editor.cxx
rename to plugins/scintilla/scintilla/src/Editor.cxx
diff --git a/plugins/scintilla/scintilla/Editor.h b/plugins/scintilla/scintilla/src/Editor.h
similarity index 100%
rename from plugins/scintilla/scintilla/Editor.h
rename to plugins/scintilla/scintilla/src/Editor.h
diff --git a/plugins/scintilla/scintilla/ExternalLexer.cxx b/plugins/scintilla/scintilla/src/ExternalLexer.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/ExternalLexer.cxx
rename to plugins/scintilla/scintilla/src/ExternalLexer.cxx
diff --git a/plugins/scintilla/scintilla/ExternalLexer.h b/plugins/scintilla/scintilla/src/ExternalLexer.h
similarity index 100%
rename from plugins/scintilla/scintilla/ExternalLexer.h
rename to plugins/scintilla/scintilla/src/ExternalLexer.h
diff --git a/plugins/scintilla/scintilla/src/FontQuality.h b/plugins/scintilla/scintilla/src/FontQuality.h
new file mode 100644
index 0000000..45600c3
--- /dev/null
+++ b/plugins/scintilla/scintilla/src/FontQuality.h
@@ -0,0 +1,15 @@
+// Scintilla source code edit control
+/** @file FontQuality.h
+ ** Definitions to control font anti-aliasing.
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh scintilla org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#define SC_EFF_QUALITY_MASK            0xF
+#define SC_EFF_QUALITY_DEFAULT           0
+#define SC_EFF_QUALITY_NON_ANTIALIASED   1
+#define SC_EFF_QUALITY_ANTIALIASED       2
+#define SC_EFF_QUALITY_LCD_OPTIMIZED     3
+
+#define SCWIN_TECH_GDI 0
+#define SCWIN_TECH_DIRECTWRITE 1
diff --git a/plugins/scintilla/scintilla/Indicator.cxx b/plugins/scintilla/scintilla/src/Indicator.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Indicator.cxx
rename to plugins/scintilla/scintilla/src/Indicator.cxx
diff --git a/plugins/scintilla/scintilla/Indicator.h b/plugins/scintilla/scintilla/src/Indicator.h
similarity index 100%
rename from plugins/scintilla/scintilla/Indicator.h
rename to plugins/scintilla/scintilla/src/Indicator.h
diff --git a/plugins/scintilla/scintilla/KeyMap.cxx b/plugins/scintilla/scintilla/src/KeyMap.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/KeyMap.cxx
rename to plugins/scintilla/scintilla/src/KeyMap.cxx
diff --git a/plugins/scintilla/scintilla/KeyMap.h b/plugins/scintilla/scintilla/src/KeyMap.h
similarity index 100%
rename from plugins/scintilla/scintilla/KeyMap.h
rename to plugins/scintilla/scintilla/src/KeyMap.h
diff --git a/plugins/scintilla/scintilla/LexGen.py b/plugins/scintilla/scintilla/src/LexGen.py
similarity index 100%
rename from plugins/scintilla/scintilla/LexGen.py
rename to plugins/scintilla/scintilla/src/LexGen.py
diff --git a/plugins/scintilla/scintilla/LineMarker.cxx b/plugins/scintilla/scintilla/src/LineMarker.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/LineMarker.cxx
rename to plugins/scintilla/scintilla/src/LineMarker.cxx
diff --git a/plugins/scintilla/scintilla/LineMarker.h b/plugins/scintilla/scintilla/src/LineMarker.h
similarity index 100%
rename from plugins/scintilla/scintilla/LineMarker.h
rename to plugins/scintilla/scintilla/src/LineMarker.h
diff --git a/plugins/scintilla/scintilla/Partitioning.h b/plugins/scintilla/scintilla/src/Partitioning.h
similarity index 100%
rename from plugins/scintilla/scintilla/Partitioning.h
rename to plugins/scintilla/scintilla/src/Partitioning.h
diff --git a/plugins/scintilla/scintilla/PerLine.cxx b/plugins/scintilla/scintilla/src/PerLine.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/PerLine.cxx
rename to plugins/scintilla/scintilla/src/PerLine.cxx
diff --git a/plugins/scintilla/scintilla/PerLine.h b/plugins/scintilla/scintilla/src/PerLine.h
similarity index 100%
rename from plugins/scintilla/scintilla/PerLine.h
rename to plugins/scintilla/scintilla/src/PerLine.h
diff --git a/plugins/scintilla/scintilla/PositionCache.cxx b/plugins/scintilla/scintilla/src/PositionCache.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/PositionCache.cxx
rename to plugins/scintilla/scintilla/src/PositionCache.cxx
diff --git a/plugins/scintilla/scintilla/PositionCache.h b/plugins/scintilla/scintilla/src/PositionCache.h
similarity index 100%
rename from plugins/scintilla/scintilla/PositionCache.h
rename to plugins/scintilla/scintilla/src/PositionCache.h
diff --git a/plugins/scintilla/scintilla/RESearch.cxx b/plugins/scintilla/scintilla/src/RESearch.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/RESearch.cxx
rename to plugins/scintilla/scintilla/src/RESearch.cxx
diff --git a/plugins/scintilla/scintilla/RESearch.h b/plugins/scintilla/scintilla/src/RESearch.h
similarity index 100%
rename from plugins/scintilla/scintilla/RESearch.h
rename to plugins/scintilla/scintilla/src/RESearch.h
diff --git a/plugins/scintilla/scintilla/RunStyles.cxx b/plugins/scintilla/scintilla/src/RunStyles.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/RunStyles.cxx
rename to plugins/scintilla/scintilla/src/RunStyles.cxx
diff --git a/plugins/scintilla/scintilla/RunStyles.h b/plugins/scintilla/scintilla/src/RunStyles.h
similarity index 100%
rename from plugins/scintilla/scintilla/RunStyles.h
rename to plugins/scintilla/scintilla/src/RunStyles.h
diff --git a/plugins/scintilla/scintilla/SVector.h b/plugins/scintilla/scintilla/src/SVector.h
similarity index 100%
rename from plugins/scintilla/scintilla/SVector.h
rename to plugins/scintilla/scintilla/src/SVector.h
diff --git a/plugins/scintilla/scintilla/ScintillaBase.cxx b/plugins/scintilla/scintilla/src/ScintillaBase.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/ScintillaBase.cxx
rename to plugins/scintilla/scintilla/src/ScintillaBase.cxx
diff --git a/plugins/scintilla/scintilla/ScintillaBase.h b/plugins/scintilla/scintilla/src/ScintillaBase.h
similarity index 100%
rename from plugins/scintilla/scintilla/ScintillaBase.h
rename to plugins/scintilla/scintilla/src/ScintillaBase.h
diff --git a/plugins/scintilla/scintilla/Selection.cxx b/plugins/scintilla/scintilla/src/Selection.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Selection.cxx
rename to plugins/scintilla/scintilla/src/Selection.cxx
diff --git a/plugins/scintilla/scintilla/Selection.h b/plugins/scintilla/scintilla/src/Selection.h
similarity index 100%
rename from plugins/scintilla/scintilla/Selection.h
rename to plugins/scintilla/scintilla/src/Selection.h
diff --git a/plugins/scintilla/scintilla/SplitVector.h b/plugins/scintilla/scintilla/src/SplitVector.h
similarity index 100%
rename from plugins/scintilla/scintilla/SplitVector.h
rename to plugins/scintilla/scintilla/src/SplitVector.h
diff --git a/plugins/scintilla/scintilla/Style.cxx b/plugins/scintilla/scintilla/src/Style.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/Style.cxx
rename to plugins/scintilla/scintilla/src/Style.cxx
diff --git a/plugins/scintilla/scintilla/Style.h b/plugins/scintilla/scintilla/src/Style.h
similarity index 100%
rename from plugins/scintilla/scintilla/Style.h
rename to plugins/scintilla/scintilla/src/Style.h
diff --git a/plugins/scintilla/scintilla/UniConversion.cxx b/plugins/scintilla/scintilla/src/UniConversion.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/UniConversion.cxx
rename to plugins/scintilla/scintilla/src/UniConversion.cxx
diff --git a/plugins/scintilla/scintilla/UniConversion.h b/plugins/scintilla/scintilla/src/UniConversion.h
similarity index 100%
rename from plugins/scintilla/scintilla/UniConversion.h
rename to plugins/scintilla/scintilla/src/UniConversion.h
diff --git a/plugins/scintilla/scintilla/ViewStyle.cxx b/plugins/scintilla/scintilla/src/ViewStyle.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/ViewStyle.cxx
rename to plugins/scintilla/scintilla/src/ViewStyle.cxx
diff --git a/plugins/scintilla/scintilla/ViewStyle.h b/plugins/scintilla/scintilla/src/ViewStyle.h
similarity index 100%
rename from plugins/scintilla/scintilla/ViewStyle.h
rename to plugins/scintilla/scintilla/src/ViewStyle.h
diff --git a/plugins/scintilla/scintilla/XPM.cxx b/plugins/scintilla/scintilla/src/XPM.cxx
similarity index 100%
rename from plugins/scintilla/scintilla/XPM.cxx
rename to plugins/scintilla/scintilla/src/XPM.cxx
diff --git a/plugins/scintilla/scintilla/XPM.h b/plugins/scintilla/scintilla/src/XPM.h
similarity index 100%
rename from plugins/scintilla/scintilla/XPM.h
rename to plugins/scintilla/scintilla/src/XPM.h