9 files changed, 73 insertions, 68 deletions
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index f19fcb5e..e893db63 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -1,71 +1,4 @@
-NULL =
-
-SUBDIRS = docs icons
-
-AM_CPPFLAGS = \
-	${WARN_CFLAGS} \
-	$(MATE_APPLETS4_CFLAGS) \
-	$(GIO_CFLAGS) \
-	-DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/mate-accessx-status-applet"\" \
-	-DACCESSX_RESOURCE_PATH=\""/org/mate/mate-applets/accessx-status/"\" \
-	$(NULL)
-
-libexec_PROGRAMS = accessx-status-applet
-
-BUILT_SOURCES = accessx-status-resources.c accessx-status-resources.h
-nodist_accessx_status_applet_SOURCES = $(BUILT_SOURCES)
-accessx_status_applet_SOURCES = \
-	applet.c \
-	applet.h
-
-accessx_status_applet_LDADD = \
-	$(MATE_APPLETS4_LIBS) \
-	$(GIO_LIBS) \
-	$(X_LIBS)
-
-accessx-status-resources.c: accessx-status-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/accessx-status-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name accessx $<
-
-accessx-status-resources.h: accessx-status-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/accessx-status-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name accessx $<
-
-appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applet_in_files): $(applet_in_files).in Makefile
-	$(AM_V_GEN)sed \
-		-e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
-		$< > $@
-
-$(applet_DATA): $(applet_in_files) Makefile
-	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files)
-	$(AM_V_GEN)sed \
-		-e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-		$< > $@
-
-CLEANFILES = \
-	$(applet_DATA) \
-	$(applet_in_files) \
-	$(service_DATA) \
-	$(ACCESSX_STATUS_APPLET_CLEANFILES) \
-	$(BUILT_SOURCES) \
-	$(NULL)
-
-EXTRA_DIST = \
-	accessx-status-applet-menu.xml \
-	accessx-status-resources.gresource.xml \
-	$(applet_in_files).in \
-	$(service_in_files) \
-	$(NULL)
-
+SUBDIRS = data icons docs src
 
 -include $(top_srcdir)/git.mk
 
diff --git a/accessx-status/data/Makefile.am b/accessx-status/data/Makefile.am
new file mode 100644
index 00000000..58df0294
--- /dev/null
+++ b/accessx-status/data/Makefile.am
@@ -0,0 +1,39 @@
+NULL =
+
+appletdir       = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+	$(AM_V_GEN)sed \
+		-e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+		$< > $@
+
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+		-e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+		$< > $@
+
+CLEANFILES = \
+	$(applet_DATA) \
+	$(applet_in_files) \
+	$(service_DATA) \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(applet_in_files).in \
+	$(service_in_files) \
+	accessx-status-applet-menu.xml \
+	accessx-status-resources.gresource.xml \
+	$(NULL)
+
+
+-include $(top_srcdir)/git.mk
diff --git a/accessx-status/accessx-status-applet-menu.xml b/accessx-status/data/accessx-status-applet-menu.xml
index f4d1c265..f4d1c265 100644
--- a/accessx-status/accessx-status-applet-menu.xml
+++ b/accessx-status/data/accessx-status-applet-menu.xml
diff --git a/accessx-status/accessx-status-resources.gresource.xml b/accessx-status/data/accessx-status-resources.gresource.xml
index 7d7d902f..7d7d902f 100644
--- a/accessx-status/accessx-status-resources.gresource.xml
+++ b/accessx-status/data/accessx-status-resources.gresource.xml
diff --git a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in b/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
index 9d9200a7..9d9200a7 100644
--- a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
+++ b/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
diff --git a/accessx-status/org.mate.panel.applet.AccessxStatusAppletFactory.service.in b/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in
index 7f5d055e..7f5d055e 100644
--- a/accessx-status/org.mate.panel.applet.AccessxStatusAppletFactory.service.in
+++ b/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in
diff --git a/accessx-status/src/Makefile.am b/accessx-status/src/Makefile.am
new file mode 100644
index 00000000..9128ae1b
--- /dev/null
+++ b/accessx-status/src/Makefile.am
@@ -0,0 +1,33 @@
+NULL =
+
+AM_CPPFLAGS = \
+	${WARN_CFLAGS} \
+	$(MATE_APPLETS4_CFLAGS) \
+	$(GIO_CFLAGS) \
+	-DACCESSX_RESOURCE_PATH=\""/org/mate/mate-applets/accessx-status/"\" \
+	$(NULL)
+
+libexec_PROGRAMS = accessx-status-applet
+
+BUILT_SOURCES = accessx-status-resources.c accessx-status-resources.h
+nodist_accessx_status_applet_SOURCES = $(BUILT_SOURCES)
+accessx_status_applet_SOURCES = \
+	applet.c \
+	applet.h
+
+accessx_status_applet_LDADD = \
+	$(MATE_APPLETS4_LIBS) \
+	$(GIO_LIBS) \
+	$(X_LIBS)
+
+accessx-status-resources.c: $(srcdir)/../data/accessx-status-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/accessx-status-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name accessx $<
+
+accessx-status-resources.h: $(srcdir)/../data/accessx-status-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/accessx-status-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name accessx $<
+
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/accessx-status/applet.c b/accessx-status/src/applet.c
index 59256b3e..59256b3e 100644
--- a/accessx-status/applet.c
+++ b/accessx-status/src/applet.c
diff --git a/accessx-status/applet.h b/accessx-status/src/applet.h
index 29569136..29569136 100644
--- a/accessx-status/applet.h
+++ b/accessx-status/src/applet.h