diff --git a/Makefile.am b/Makefile.am
index 04e4a87e..6dd6e437 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tagmanager scintilla src plugins icons po doc data tests
+SUBDIRS = ctags scintilla src plugins icons po doc data tests
 
 AUTOMAKE_OPTIONS =	1.7
 
diff --git a/configure.ac b/configure.ac
index d921e957..40c4671a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,13 +147,13 @@ AC_CONFIG_FILES([
 		icons/tango/32x32/Makefile
 		icons/tango/48x48/Makefile
 		icons/tango/scalable/Makefile
-		tagmanager/Makefile
-		tagmanager/ctags/Makefile
-		tagmanager/mio/Makefile
-		tagmanager/src/Makefile
+		ctags/Makefile
+		ctags/main/Makefile
+		ctags/mio/Makefile
 		scintilla/Makefile
 		scintilla/include/Makefile
 		src/Makefile
+		src/tagmanager/Makefile
 		plugins/Makefile
 		po/Makefile.in
 		data/Makefile
diff --git a/tagmanager/Makefile.am b/ctags/Makefile.am
similarity index 71%
rename from tagmanager/Makefile.am
rename to ctags/Makefile.am
index 45b7a412..570d3320 100644
--- a/tagmanager/Makefile.am
+++ b/ctags/Makefile.am
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = mio ctags src
+SUBDIRS = mio main
diff --git a/tagmanager/ctags/Makefile.am b/ctags/main/Makefile.am
similarity index 100%
rename from tagmanager/ctags/Makefile.am
rename to ctags/main/Makefile.am
diff --git a/tagmanager/ctags/abaqus.c b/ctags/main/abaqus.c
similarity index 100%
rename from tagmanager/ctags/abaqus.c
rename to ctags/main/abaqus.c
diff --git a/tagmanager/ctags/abc.c b/ctags/main/abc.c
similarity index 100%
rename from tagmanager/ctags/abc.c
rename to ctags/main/abc.c
diff --git a/tagmanager/ctags/actionscript.c b/ctags/main/actionscript.c
similarity index 100%
rename from tagmanager/ctags/actionscript.c
rename to ctags/main/actionscript.c
diff --git a/tagmanager/ctags/args.c b/ctags/main/args.c
similarity index 100%
rename from tagmanager/ctags/args.c
rename to ctags/main/args.c
diff --git a/tagmanager/ctags/args.h b/ctags/main/args.h
similarity index 100%
rename from tagmanager/ctags/args.h
rename to ctags/main/args.h
diff --git a/tagmanager/ctags/asciidoc.c b/ctags/main/asciidoc.c
similarity index 100%
rename from tagmanager/ctags/asciidoc.c
rename to ctags/main/asciidoc.c
diff --git a/tagmanager/ctags/asm.c b/ctags/main/asm.c
similarity index 100%
rename from tagmanager/ctags/asm.c
rename to ctags/main/asm.c
diff --git a/tagmanager/ctags/basic.c b/ctags/main/basic.c
similarity index 100%
rename from tagmanager/ctags/basic.c
rename to ctags/main/basic.c
diff --git a/tagmanager/ctags/c.c b/ctags/main/c.c
similarity index 100%
rename from tagmanager/ctags/c.c
rename to ctags/main/c.c
diff --git a/tagmanager/ctags/cobol.c b/ctags/main/cobol.c
similarity index 100%
rename from tagmanager/ctags/cobol.c
rename to ctags/main/cobol.c
diff --git a/tagmanager/ctags/conf.c b/ctags/main/conf.c
similarity index 100%
rename from tagmanager/ctags/conf.c
rename to ctags/main/conf.c
diff --git a/tagmanager/ctags/css.c b/ctags/main/css.c
similarity index 100%
rename from tagmanager/ctags/css.c
rename to ctags/main/css.c
diff --git a/tagmanager/ctags/ctags.c b/ctags/main/ctags.c
similarity index 100%
rename from tagmanager/ctags/ctags.c
rename to ctags/main/ctags.c
diff --git a/tagmanager/ctags/ctags.h b/ctags/main/ctags.h
similarity index 100%
rename from tagmanager/ctags/ctags.h
rename to ctags/main/ctags.h
diff --git a/tagmanager/ctags/diff.c b/ctags/main/diff.c
similarity index 100%
rename from tagmanager/ctags/diff.c
rename to ctags/main/diff.c
diff --git a/tagmanager/ctags/docbook.c b/ctags/main/docbook.c
similarity index 100%
rename from tagmanager/ctags/docbook.c
rename to ctags/main/docbook.c
diff --git a/tagmanager/ctags/entry.c b/ctags/main/entry.c
similarity index 100%
rename from tagmanager/ctags/entry.c
rename to ctags/main/entry.c
diff --git a/tagmanager/ctags/entry.h b/ctags/main/entry.h
similarity index 100%
rename from tagmanager/ctags/entry.h
rename to ctags/main/entry.h
diff --git a/tagmanager/ctags/erlang.c b/ctags/main/erlang.c
similarity index 100%
rename from tagmanager/ctags/erlang.c
rename to ctags/main/erlang.c
diff --git a/tagmanager/ctags/fortran.c b/ctags/main/fortran.c
similarity index 100%
rename from tagmanager/ctags/fortran.c
rename to ctags/main/fortran.c
diff --git a/tagmanager/ctags/general.h b/ctags/main/general.h
similarity index 100%
rename from tagmanager/ctags/general.h
rename to ctags/main/general.h
diff --git a/tagmanager/ctags/get.c b/ctags/main/get.c
similarity index 100%
rename from tagmanager/ctags/get.c
rename to ctags/main/get.c
diff --git a/tagmanager/ctags/get.h b/ctags/main/get.h
similarity index 100%
rename from tagmanager/ctags/get.h
rename to ctags/main/get.h
diff --git a/tagmanager/ctags/go.c b/ctags/main/go.c
similarity index 100%
rename from tagmanager/ctags/go.c
rename to ctags/main/go.c
diff --git a/tagmanager/ctags/haskell.c b/ctags/main/haskell.c
similarity index 100%
rename from tagmanager/ctags/haskell.c
rename to ctags/main/haskell.c
diff --git a/tagmanager/ctags/haxe.c b/ctags/main/haxe.c
similarity index 100%
rename from tagmanager/ctags/haxe.c
rename to ctags/main/haxe.c
diff --git a/tagmanager/ctags/html.c b/ctags/main/html.c
similarity index 100%
rename from tagmanager/ctags/html.c
rename to ctags/main/html.c
diff --git a/tagmanager/ctags/js.c b/ctags/main/js.c
similarity index 100%
rename from tagmanager/ctags/js.c
rename to ctags/main/js.c
diff --git a/tagmanager/ctags/json.c b/ctags/main/json.c
similarity index 100%
rename from tagmanager/ctags/json.c
rename to ctags/main/json.c
diff --git a/tagmanager/ctags/keyword.c b/ctags/main/keyword.c
similarity index 100%
rename from tagmanager/ctags/keyword.c
rename to ctags/main/keyword.c
diff --git a/tagmanager/ctags/keyword.h b/ctags/main/keyword.h
similarity index 100%
rename from tagmanager/ctags/keyword.h
rename to ctags/main/keyword.h
diff --git a/tagmanager/ctags/latex.c b/ctags/main/latex.c
similarity index 100%
rename from tagmanager/ctags/latex.c
rename to ctags/main/latex.c
diff --git a/tagmanager/ctags/lregex.c b/ctags/main/lregex.c
similarity index 100%
rename from tagmanager/ctags/lregex.c
rename to ctags/main/lregex.c
diff --git a/tagmanager/ctags/lua.c b/ctags/main/lua.c
similarity index 100%
rename from tagmanager/ctags/lua.c
rename to ctags/main/lua.c
diff --git a/tagmanager/ctags/main.h b/ctags/main/main.h
similarity index 100%
rename from tagmanager/ctags/main.h
rename to ctags/main/main.h
diff --git a/tagmanager/ctags/make.c b/ctags/main/make.c
similarity index 100%
rename from tagmanager/ctags/make.c
rename to ctags/main/make.c
diff --git a/tagmanager/ctags/makefile.win32 b/ctags/main/makefile.win32
similarity index 100%
rename from tagmanager/ctags/makefile.win32
rename to ctags/main/makefile.win32
diff --git a/tagmanager/ctags/markdown.c b/ctags/main/markdown.c
similarity index 100%
rename from tagmanager/ctags/markdown.c
rename to ctags/main/markdown.c
diff --git a/tagmanager/ctags/matlab.c b/ctags/main/matlab.c
similarity index 100%
rename from tagmanager/ctags/matlab.c
rename to ctags/main/matlab.c
diff --git a/tagmanager/ctags/nestlevel.c b/ctags/main/nestlevel.c
similarity index 100%
rename from tagmanager/ctags/nestlevel.c
rename to ctags/main/nestlevel.c
diff --git a/tagmanager/ctags/nestlevel.h b/ctags/main/nestlevel.h
similarity index 100%
rename from tagmanager/ctags/nestlevel.h
rename to ctags/main/nestlevel.h
diff --git a/tagmanager/ctags/nsis.c b/ctags/main/nsis.c
similarity index 100%
rename from tagmanager/ctags/nsis.c
rename to ctags/main/nsis.c
diff --git a/tagmanager/ctags/objc.c b/ctags/main/objc.c
similarity index 100%
rename from tagmanager/ctags/objc.c
rename to ctags/main/objc.c
diff --git a/tagmanager/ctags/options.c b/ctags/main/options.c
similarity index 100%
rename from tagmanager/ctags/options.c
rename to ctags/main/options.c
diff --git a/tagmanager/ctags/options.h b/ctags/main/options.h
similarity index 100%
rename from tagmanager/ctags/options.h
rename to ctags/main/options.h
diff --git a/tagmanager/ctags/parse.c b/ctags/main/parse.c
similarity index 100%
rename from tagmanager/ctags/parse.c
rename to ctags/main/parse.c
diff --git a/tagmanager/ctags/parse.h b/ctags/main/parse.h
similarity index 100%
rename from tagmanager/ctags/parse.h
rename to ctags/main/parse.h
diff --git a/tagmanager/ctags/parsers.h b/ctags/main/parsers.h
similarity index 100%
rename from tagmanager/ctags/parsers.h
rename to ctags/main/parsers.h
diff --git a/tagmanager/ctags/pascal.c b/ctags/main/pascal.c
similarity index 100%
rename from tagmanager/ctags/pascal.c
rename to ctags/main/pascal.c
diff --git a/tagmanager/ctags/perl.c b/ctags/main/perl.c
similarity index 100%
rename from tagmanager/ctags/perl.c
rename to ctags/main/perl.c
diff --git a/tagmanager/ctags/php.c b/ctags/main/php.c
similarity index 100%
rename from tagmanager/ctags/php.c
rename to ctags/main/php.c
diff --git a/tagmanager/ctags/powershell.c b/ctags/main/powershell.c
similarity index 100%
rename from tagmanager/ctags/powershell.c
rename to ctags/main/powershell.c
diff --git a/tagmanager/ctags/python.c b/ctags/main/python.c
similarity index 100%
rename from tagmanager/ctags/python.c
rename to ctags/main/python.c
diff --git a/tagmanager/ctags/r.c b/ctags/main/r.c
similarity index 100%
rename from tagmanager/ctags/r.c
rename to ctags/main/r.c
diff --git a/tagmanager/ctags/read.c b/ctags/main/read.c
similarity index 100%
rename from tagmanager/ctags/read.c
rename to ctags/main/read.c
diff --git a/tagmanager/ctags/read.h b/ctags/main/read.h
similarity index 100%
rename from tagmanager/ctags/read.h
rename to ctags/main/read.h
diff --git a/tagmanager/ctags/rest.c b/ctags/main/rest.c
similarity index 100%
rename from tagmanager/ctags/rest.c
rename to ctags/main/rest.c
diff --git a/tagmanager/ctags/ruby.c b/ctags/main/ruby.c
similarity index 100%
rename from tagmanager/ctags/ruby.c
rename to ctags/main/ruby.c
diff --git a/tagmanager/ctags/rust.c b/ctags/main/rust.c
similarity index 100%
rename from tagmanager/ctags/rust.c
rename to ctags/main/rust.c
diff --git a/tagmanager/ctags/sh.c b/ctags/main/sh.c
similarity index 100%
rename from tagmanager/ctags/sh.c
rename to ctags/main/sh.c
diff --git a/tagmanager/ctags/sort.c b/ctags/main/sort.c
similarity index 100%
rename from tagmanager/ctags/sort.c
rename to ctags/main/sort.c
diff --git a/tagmanager/ctags/sort.h b/ctags/main/sort.h
similarity index 100%
rename from tagmanager/ctags/sort.h
rename to ctags/main/sort.h
diff --git a/tagmanager/ctags/sql.c b/ctags/main/sql.c
similarity index 100%
rename from tagmanager/ctags/sql.c
rename to ctags/main/sql.c
diff --git a/tagmanager/ctags/strlist.c b/ctags/main/strlist.c
similarity index 100%
rename from tagmanager/ctags/strlist.c
rename to ctags/main/strlist.c
diff --git a/tagmanager/ctags/strlist.h b/ctags/main/strlist.h
similarity index 100%
rename from tagmanager/ctags/strlist.h
rename to ctags/main/strlist.h
diff --git a/tagmanager/ctags/tcl.c b/ctags/main/tcl.c
similarity index 100%
rename from tagmanager/ctags/tcl.c
rename to ctags/main/tcl.c
diff --git a/tagmanager/ctags/txt2tags.c b/ctags/main/txt2tags.c
similarity index 100%
rename from tagmanager/ctags/txt2tags.c
rename to ctags/main/txt2tags.c
diff --git a/tagmanager/ctags/verilog.c b/ctags/main/verilog.c
similarity index 100%
rename from tagmanager/ctags/verilog.c
rename to ctags/main/verilog.c
diff --git a/tagmanager/ctags/vhdl.c b/ctags/main/vhdl.c
similarity index 100%
rename from tagmanager/ctags/vhdl.c
rename to ctags/main/vhdl.c
diff --git a/tagmanager/ctags/vstring.c b/ctags/main/vstring.c
similarity index 100%
rename from tagmanager/ctags/vstring.c
rename to ctags/main/vstring.c
diff --git a/tagmanager/ctags/vstring.h b/ctags/main/vstring.h
similarity index 100%
rename from tagmanager/ctags/vstring.h
rename to ctags/main/vstring.h
diff --git a/tagmanager/mio/COPYING b/ctags/mio/COPYING
similarity index 100%
rename from tagmanager/mio/COPYING
rename to ctags/mio/COPYING
diff --git a/tagmanager/mio/Makefile.am b/ctags/mio/Makefile.am
similarity index 100%
rename from tagmanager/mio/Makefile.am
rename to ctags/mio/Makefile.am
diff --git a/tagmanager/mio/README b/ctags/mio/README
similarity index 100%
rename from tagmanager/mio/README
rename to ctags/mio/README
diff --git a/tagmanager/mio/makefile.win32 b/ctags/mio/makefile.win32
similarity index 100%
rename from tagmanager/mio/makefile.win32
rename to ctags/mio/makefile.win32
diff --git a/tagmanager/mio/mio-file.c b/ctags/mio/mio-file.c
similarity index 100%
rename from tagmanager/mio/mio-file.c
rename to ctags/mio/mio-file.c
diff --git a/tagmanager/mio/mio-memory.c b/ctags/mio/mio-memory.c
similarity index 100%
rename from tagmanager/mio/mio-memory.c
rename to ctags/mio/mio-memory.c
diff --git a/tagmanager/mio/mio.c b/ctags/mio/mio.c
similarity index 100%
rename from tagmanager/mio/mio.c
rename to ctags/mio/mio.c
diff --git a/tagmanager/mio/mio.h b/ctags/mio/mio.h
similarity index 100%
rename from tagmanager/mio/mio.h
rename to ctags/mio/mio.h
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 36847000..c5f2382d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -74,7 +74,7 @@ endif
 AM_CPPFLAGS += \
 	-DGTK \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/tagmanager/src \
+	-I$(top_srcdir)/src/tagmanager \
 	-I$(top_srcdir)/scintilla/include \
 	$(GTK_CFLAGS) \
 	$(PLUGIN_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index bf13d28e..a4b533eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = tagmanager
 
 EXTRA_DIST = \
 	gb.c \
@@ -15,7 +16,7 @@ EXTRA_DIST = \
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/scintilla/include \
-	-I$(top_srcdir)/tagmanager/src \
+	-I$(srcdir)/tagmanager \
 	-DGTK \
 	-DGEANY_PRIVATE \
 	-DG_LOG_DOMAIN=\""Geany"\" \
@@ -120,7 +121,7 @@ libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@
 
 libgeany_la_LIBADD = \
 	$(top_builddir)/scintilla/libscintilla.la \
-	$(top_builddir)/tagmanager/src/libtagmanager.la \
+	$(builddir)/tagmanager/libtagmanager.la \
 	@GTK_LIBS@ \
 	@GTHREAD_LIBS@ \
 	$(MAC_INTEGRATION_LIBS) \
diff --git a/tagmanager/src/Makefile.am b/src/tagmanager/Makefile.am
similarity index 80%
rename from tagmanager/src/Makefile.am
rename to src/tagmanager/Makefile.am
index 70614178..465fe887 100644
--- a/tagmanager/src/Makefile.am
+++ b/src/tagmanager/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
 	-I$(srcdir) \
-	-I$(srcdir)/.. \
-	-I$(srcdir)/../ctags \
+	-I$(top_srcdir)/ctags \
+	-I$(top_srcdir)/ctags/main \
 	-DGEANY_PRIVATE \
 	-DG_LOG_DOMAIN=\"Tagmanager\"
 AM_CFLAGS = \
@@ -33,4 +33,4 @@ libtagmanager_la_SOURCES =\
 	tm_ctags_wrappers.h \
 	tm_ctags_wrappers.c
 
-libtagmanager_la_LIBADD = ../ctags/libctags.la $(GTK_LIBS)
+libtagmanager_la_LIBADD = $(top_builddir)/ctags/main/libctags.la $(GTK_LIBS)
diff --git a/tagmanager/src/makefile.win32 b/src/tagmanager/makefile.win32
similarity index 100%
rename from tagmanager/src/makefile.win32
rename to src/tagmanager/makefile.win32
diff --git a/tagmanager/src/tm_ctags_wrappers.c b/src/tagmanager/tm_ctags_wrappers.c
similarity index 100%
rename from tagmanager/src/tm_ctags_wrappers.c
rename to src/tagmanager/tm_ctags_wrappers.c
diff --git a/tagmanager/src/tm_ctags_wrappers.h b/src/tagmanager/tm_ctags_wrappers.h
similarity index 100%
rename from tagmanager/src/tm_ctags_wrappers.h
rename to src/tagmanager/tm_ctags_wrappers.h
diff --git a/tagmanager/src/tm_parser.c b/src/tagmanager/tm_parser.c
similarity index 100%
rename from tagmanager/src/tm_parser.c
rename to src/tagmanager/tm_parser.c
diff --git a/tagmanager/src/tm_parser.h b/src/tagmanager/tm_parser.h
similarity index 100%
rename from tagmanager/src/tm_parser.h
rename to src/tagmanager/tm_parser.h
diff --git a/tagmanager/src/tm_source_file.c b/src/tagmanager/tm_source_file.c
similarity index 100%
rename from tagmanager/src/tm_source_file.c
rename to src/tagmanager/tm_source_file.c
diff --git a/tagmanager/src/tm_source_file.h b/src/tagmanager/tm_source_file.h
similarity index 100%
rename from tagmanager/src/tm_source_file.h
rename to src/tagmanager/tm_source_file.h
diff --git a/tagmanager/src/tm_tag.c b/src/tagmanager/tm_tag.c
similarity index 100%
rename from tagmanager/src/tm_tag.c
rename to src/tagmanager/tm_tag.c
diff --git a/tagmanager/src/tm_tag.h b/src/tagmanager/tm_tag.h
similarity index 100%
rename from tagmanager/src/tm_tag.h
rename to src/tagmanager/tm_tag.h
diff --git a/tagmanager/src/tm_workspace.c b/src/tagmanager/tm_workspace.c
similarity index 100%
rename from tagmanager/src/tm_workspace.c
rename to src/tagmanager/tm_workspace.c
diff --git a/tagmanager/src/tm_workspace.h b/src/tagmanager/tm_workspace.h
similarity index 100%
rename from tagmanager/src/tm_workspace.h
rename to src/tagmanager/tm_workspace.h