diff --git a/src/Makefile.am b/src/Makefile.am
index b87c91c561..a0252309c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,6 +165,7 @@ dist-hook:
 	@mkdir -p $(distdir)/tests/efreet/data $(distdir)/tests/edje/data
 	@mkdir -p $(distdir)/tests/emotion/data $(distdir)/tests/evas/meshes/md2
 	@mkdir -p $(distdir)/tests/evas/meshes/obj $(distdir)/tests/efreet/data/sub
+	@mkdir -p $(distdir)/tests/efl_mono
 	@mkdir -p $(distdir)/scripts/eina $(distdir)/scripts/elua/modules
 	@mkdir -p $(distdir)/scripts/elua/core $(distdir)/scripts/elua/apps/docgen
 	@mkdir -p $(distdir)/lib/evas/common/evas_op_add $(distdir)/lib/evas/common/evas_op_copy
@@ -173,6 +174,11 @@ dist-hook:
 	@mkdir -p $(distdir)/static_libs/http-parser/contrib $(distdir)/bindings/luajit/eina
 	@mkdir -p $(distdir)/wayland_protocol $(distdir)/lib/efl_wl/
 	@mkdir -p $(distdir)/modules/evas/engines/software_generic/filters/blur
+	@mkdir -p $(distdir)/bindings/mono/ecore_evas_mono
+	@mkdir -p $(distdir)/bindings/mono/efl_mono
+	@mkdir -p $(distdir)/bindings/mono/eina_mono
+	@mkdir -p $(distdir)/bindings/mono/eldbus_mono
+	@mkdir -p $(distdir)/bindings/mono/eo_mono
 	for F in $(EXTRA_DIST2); do cp -f $(srcdir)/$$F $(distdir)/$$F; done
 
 clean-local:
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index 96d8bf74be..ac7c68604f 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -3,7 +3,6 @@ efl_custom_exports_mono_files = \
 	lib/efl_mono/efl_custom_exports_mono.c
 
 efl_eo_mono_files = \
-	bindings/mono/eo_mono/object.cs \
 	bindings/mono/eo_mono/iwrapper.cs \
 	bindings/mono/eo_mono/workaround.cs
 
@@ -37,6 +36,8 @@ efl_eldbus_mono_files = \
 efl_ecore_evas_mono_files = \
 	bindings/mono/ecore_evas_mono/ecore_evas.cs
 
+# Static C# source files don't go into a _SOURCES var as the dll target
+# is custom built instead of through _LTLIBRARIES/_LIBRARIES
 lib_efl_mono_libefl_mono_dll_sources = \
 	bindings/mono/efl_mono/efl_all.cs \
 	$(efl_eo_mono_files) \
@@ -44,16 +45,47 @@ lib_efl_mono_libefl_mono_dll_sources = \
 	$(efl_eldbus_mono_files) \
 	$(efl_ecore_evas_mono_files)
 
+efl_mono_test_files = \
+	tests/efl_mono/test_testing.eo \
+	tests/efl_mono/test_numberwrapper.eo \
+	tests/efl_mono/mono_test_driver.sh
+
 EXTRA_DIST2 += \
-bindings/mono/efl_mono/efl_libs.cs.in \
-bindings/mono/efl_mono/efl_libs.csv.in
+	$(lib_efl_mono_libefl_mono_dll_sources) \
+	$(efl_mono_test_files) \
+	bindings/mono/efl_mono/efl_libs.cs.in \
+	bindings/mono/efl_mono/efl_libs.csv.in
 
 if HAVE_CSHARP
 
 bin_PROGRAMS += bin/eolian_mono/eolian_mono
 
 bin_eolian_mono_eolian_mono_SOURCES = \
-	bin/eolian_mono/eolian_mono.cc
+	bin/eolian_mono/eolian_mono.cc \
+	bin/eolian_mono/eolian/mono/documentation.hh \
+	bin/eolian_mono/eolian/mono/type.hh \
+	bin/eolian_mono/eolian/mono/marshall_annotation.hh \
+	bin/eolian_mono/eolian/mono/function_pointer.hh \
+	bin/eolian_mono/eolian/mono/namespace.hh \
+	bin/eolian_mono/eolian/mono/function_blacklist.hh \
+	bin/eolian_mono/eolian/mono/function_definition.hh \
+	bin/eolian_mono/eolian/mono/name_helpers.hh \
+	bin/eolian_mono/eolian/mono/function_declaration.hh \
+	bin/eolian_mono/eolian/mono/helpers.hh \
+	bin/eolian_mono/eolian/mono/function_helpers.hh \
+	bin/eolian_mono/eolian/mono/marshall_type_impl.hh \
+	bin/eolian_mono/eolian/mono/keyword.hh \
+	bin/eolian_mono/eolian/mono/function_registration.hh \
+	bin/eolian_mono/eolian/mono/enum_definition.hh \
+	bin/eolian_mono/eolian/mono/struct_definition.hh \
+	bin/eolian_mono/eolian/mono/parameter.hh \
+	bin/eolian_mono/eolian/mono/utils.hh \
+	bin/eolian_mono/eolian/mono/using_decl.hh \
+	bin/eolian_mono/eolian/mono/marshall_type.hh \
+	bin/eolian_mono/eolian/mono/klass.hh \
+	bin/eolian_mono/eolian/mono/type_impl.hh \
+	bin/eolian_mono/eolian/mono/generation_contexts.hh
+
 bin_eolian_mono_eolian_mono_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/eolian_cxx/ \
 -I$(top_srcdir)/src/bin/eolian_mono/ \
@@ -134,6 +166,13 @@ lib/elementary/elm_genlist_item.eo.cs \
 lib/elementary/elm_gengrid.eo.cs \
 lib/elementary/elm_glview.eo.cs
 
+efl_mono_blacklisted_files = \
+$(evas_eolian_blacklisted_files) \
+$(efl_eolian_blacklisted_files) \
+$(ecore_eolian_blacklisted_files) \
+$(eo_eolian_blacklisted_files) \
+$(elementary_eolian_blacklisted_files)
+
 efl_eolian_mono_files = \
 $(filter-out $(eo_eolian_blacklisted_files),$(eo_eolian_files:%.eo=%.eo.cs)) \
 $(filter-out $(ecore_eolian_blacklisted_files),$(ecore_eolian_files_public:%.eo=%.eo.cs)) \
@@ -155,7 +194,6 @@ $(evas_canvas_eolian_type_files:%.eot=%.eot.cs) \
 lib/eo/eina_types.eot.cs
 
 efl_mono_files_gen =\
-$(lib_efl_mono_libefl_mono_dll_sources) \
 $(efl_eolian_mono_files) \
 $(builddir)/bindings/mono/efl_mono/efl_libs.cs
 
@@ -163,7 +201,10 @@ $(builddir)/bindings/mono/efl_mono/efl_libs.cs
 installed_eflmonomainheadersdir = $(includedir)/efl-mono-@VMAJ@/
 nodist_installed_eflmonomainheaders_DATA = $(efl_eolian_files:%.eo=%.eo.cs) $(builddir)/bindings/mono/efl_mono/efl_libs.csv
 
-CLEANFILES += $(efl_mono_files_gen)
+CLEANFILES += $(efl_mono_files_gen) $(efl_mono_blacklisted_files) \
+	      $(builddir)/lib/efl_mono/libefl_mono.dll \
+	      $(builddir)/lib/efl_mono/libefl_mono.xml \
+	      $(builddir)/lib/efl_mono/libefl_mono.dll.config
 
 if HAVE_WIN32
 
@@ -192,7 +233,7 @@ lib_efl_mono_libeflcustomexportsmono_la_DEPENDENCIES = @EFL_CUSTOM_EXPORTS_MONO_
 
 libefl_mono_dll_MCS_FLAGS = -doc:lib/efl_mono/libefl_mono.xml
 
-lib/efl_mono/libefl_mono.dll: $(efl_mono_files_dist) lib/efl_mono/$(am__dirstamp) $(efl_mono_files_gen) lib/efl_mono/libefl_mono.dll.config
+lib/efl_mono/libefl_mono.dll: $(efl_mono_files_dist) lib/efl_mono/$(am__dirstamp) $(lib_efl_mono_libefl_mono_dll_sources) $(efl_mono_files_gen) lib/efl_mono/libefl_mono.dll.config
 	@rm -f lib/efl_mono/libefl_mono.dll
 	$(AM_V_MCS) $(MCS) $(MCS_FLAGS) $(libefl_mono_dll_MCS_FLAGS) -out:$@ -t:library $(filter %.cs, $(^))
 
@@ -215,6 +256,12 @@ cp -f $(builddir)/bindings/mono/efl_mono/efl_libs.csv $(DESTDIR)$(datadir)/efl_m
 
 all-local: lib/efl_mono/libefl_mono.dll
 
+uninstall-local:
+	rm -rf @eflmonodlldir@/libefl_mono.dll
+	rm -rf @eflmonodlldir@/libefl_mono.xml
+	rm -rf $(DESTDIR)$(datadir)/efl_mono
+	rm -rf src/tests/efl_mono
+
 
 ### MSBuild
 
@@ -403,7 +450,7 @@ tests/efl_mono/%.eo.cs: tests/efl_mono/%.eo $(_EOLIAN_MONO_DEP)
 	$(MKDIR_P) $(dir $@); \
 	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport "@DLIB_PREFIX_MONO@efl_mono_native_test@DLIB_SUFFIX_MONO@" -o $@ $(ALL_EO_REFS) $<
 
-CLEANFILES += tests/efl_mono/libefl_mono_test.dll tests/efl_mono/test_testing.eo.cs tests/efl_mono/test_numberwrapper.eo.cs tests/efl_mono/test_testing.eo.c tests/efl_mono/test_numberwrapper.eo.c tests/efl_mono/test_testing.eo.h tests/efl_mono/test_numberwrapper.eo.h
+CLEANFILES += tests/efl_mono/libefl_mono_test.dll tests/efl_mono/test_testing.eo.cs tests/efl_mono/test_numberwrapper.eo.cs tests/efl_mono/test_testing.eo.c tests/efl_mono/test_numberwrapper.eo.c tests/efl_mono/test_testing.eo.h tests/efl_mono/test_numberwrapper.eo.h tests/efl_mono/efl_mono.config
 
 endif
 
diff --git a/src/bindings/mono/eo_mono/object.cs b/src/bindings/mono/eo_mono/object.cs
deleted file mode 100644
index 08e1e5f0ef..0000000000
--- a/src/bindings/mono/eo_mono/object.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-namespace efl {
-
-using System;
-    
-// public interface Object : efl.eo.IWrapper
-// {
-// }
-    
-}
diff --git a/src/examples/efl_mono/Makefile.am b/src/examples/efl_mono/Makefile.am
index fe271e9f10..84d93bc6f9 100644
--- a/src/examples/efl_mono/Makefile.am
+++ b/src/examples/efl_mono/Makefile.am
@@ -66,9 +66,9 @@ example_numberwrapper.eo.cs: example_numberwrapper.eo
 	$(AM_V_EOLMONO) \
 	$(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport example_numberwrapper -o $@ -r $(top_builddir)/src/bindings/mono/efl_mono/efl_libs.csv $<
 
-EoInherit01_SOURCES = EoInherit01.cs example_numberwrapper.eo.cs
+EoInherit01_SOURCES = EoInherit01.cs
 #EoInherit01_files = $(EoInherit01_exe_srcs) example_numberwrapper.eo.cs
-EoInherit01$(EXEEXT): $(EoInherit01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la EoInherit01$(EXEEXT).config
+EoInherit01$(EXEEXT): $(EoInherit01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la EoInherit01$(EXEEXT).config example_numberwrapper.eo.cs
 	@rm -f $@
 	$(AM_V_MCS) $(MCS) $(MCS_FLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
 
@@ -87,8 +87,8 @@ EoInherit01$(EXEEXT).config:
 	echo "  </runtime>" >> $@
 	echo "</configuration>" >> $@
 
-FunctionPointer01_SOURCES = FunctionPointer01.cs example_numberwrapper.eo.cs
-FunctionPointer01$(EXEEXT): $(FunctionPointer01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la
+FunctionPointer01_SOURCES = FunctionPointer01.cs
+FunctionPointer01$(EXEEXT): $(FunctionPointer01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la example_numberwrapper.eo.cs
 	@rm -f $@
 	$(AM_V_MCS) $(MCS) $(MCS_FLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))