diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index f5514d9..485e30c 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -23,7 +23,7 @@
 
 AM_YFLAGS = -d
 LIBS =
-BUILT_SOURCES = thrifty.cc
+BUILT_SOURCES = src/thrifty.cc
 
 bin_PROGRAMS = thrift
 
diff --git a/configure.ac b/configure.ac
index bc257a3..9af7f65 100755
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 
 AC_CONFIG_AUX_DIR([.])
 
-AM_INIT_AUTOMAKE([1.13 tar-ustar])
+AM_INIT_AUTOMAKE([1.13 subdir-objects tar-ustar])
 PKG_PROG_PKG_CONFIG
 
 AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am
index a9842da..0e8de86 100755
--- a/lib/c_glib/test/Makefile.am
+++ b/lib/c_glib/test/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-AUTOMAKE_OPTIONS = serial-tests
+AUTOMAKE_OPTIONS = subdir-objects serial-tests
 
 SUBDIRS =
 
@@ -58,70 +58,70 @@
 
 testapplicationexception_SOURCES = testapplicationexception.c
 testapplicationexception_LDADD = \
-    ../libthrift_c_glib_la-thrift_application_exception.o \
-    ../libthrift_c_glib_la-thrift_protocol.o \
-    ../libthrift_c_glib_la-thrift_struct.o \
-    ../libthrift_c_glib_la-thrift_transport.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_application_exception.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_struct.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
 
 testtransportsocket_SOURCES = testtransportsocket.c
 testtransportsocket_LDADD = \
-    ../libthrift_c_glib_la-thrift_transport.o \
-    ../libthrift_c_glib_la-thrift_buffered_transport.o \
-    ../libthrift_c_glib_la-thrift_server_transport.o \
-    ../libthrift_c_glib_la-thrift_server_socket.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_buffered_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
 
 testbinaryprotocol_SOURCES = testbinaryprotocol.c
 testbinaryprotocol_LDADD = \
-    ../libthrift_c_glib_la-thrift_protocol.o \
-    ../libthrift_c_glib_la-thrift_transport.o \
-    ../libthrift_c_glib_la-thrift_socket.o \
-    ../libthrift_c_glib_la-thrift_server_transport.o \
-    ../libthrift_c_glib_la-thrift_server_socket.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
 
 testbufferedtransport_SOURCES = testbufferedtransport.c
 testbufferedtransport_LDADD = \
-    ../libthrift_c_glib_la-thrift_transport.o \
-    ../libthrift_c_glib_la-thrift_socket.o \
-    ../libthrift_c_glib_la-thrift_server_transport.o \
-    ../libthrift_c_glib_la-thrift_server_socket.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
 
 testframedtransport_SOURCES = testframedtransport.c
 testframedtransport_LDADD = \
-    ../libthrift_c_glib_la-thrift_transport.o \
-    ../libthrift_c_glib_la-thrift_socket.o \
-    ../libthrift_c_glib_la-thrift_server_transport.o \
-    ../libthrift_c_glib_la-thrift_server_socket.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
 
 testmemorybuffer_SOURCES = testmemorybuffer.c
 testmemorybuffer_LDADD = \
-    ../libthrift_c_glib_la-thrift_transport.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
 
 teststruct_SOURCES = teststruct.c
 teststruct_LDADD = \
-    ../libthrift_c_glib_la-thrift_protocol.o \
-    ../libthrift_c_glib_la-thrift_transport.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
 
 testsimpleserver_SOURCES = testsimpleserver.c
 testsimpleserver_LDADD = \
-    ../libthrift_c_glib_la-thrift_protocol.o \
-    ../libthrift_c_glib_la-thrift_transport.o \
-    ../libthrift_c_glib_la-thrift_transport_factory.o \
-    ../libthrift_c_glib_la-thrift_processor.o \
-    ../libthrift_c_glib_la-thrift_protocol_factory.o \
-    ../libthrift_c_glib_la-thrift_binary_protocol.o \
-    ../libthrift_c_glib_la-thrift_binary_protocol_factory.o \
-    ../libthrift_c_glib_la-thrift_socket.o \
-    ../libthrift_c_glib_la-thrift_server_transport.o \
-    ../libthrift_c_glib_la-thrift_server_socket.o \
-    ../libthrift_c_glib_la-thrift_server.o
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport_factory.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/processor/libthrift_c_glib_la-thrift_processor.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol_factory.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol_factory.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/server/libthrift_c_glib_la-thrift_server.o
 
 testdebugproto_SOURCES = testdebugproto.c
 testdebugproto_LDADD = libtestgenc.la
 
 testoptionalrequired_SOURCES = testoptionalrequired.c
 testoptionalrequired_LDADD = \
-    ../libthrift_c_glib_la-thrift_protocol.o \
-    ../libthrift_c_glib_la-thrift_transport.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
+    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
     libtestgenc.la
 
 testthrifttest_SOURCES = testthrifttest.c