diff --git a/.gitignore b/.gitignore
index 256b418..6da54be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,56 +1,3 @@
-# Template from:
-# https://github.com/github/gitignore/blob/master/Autotools.gitignore
-
-# http://www.gnu.org/software/automake
-
-Makefile.in
-/ar-lib
-/mdate-sh
-/py-compile
-/test-driver
-/ylwrap
-
-# http://www.gnu.org/software/autoconf
-
-/autom4te.cache
-/autoscan.log
-/autoscan-*.log
-/aclocal.m4
-/compile
-/config.guess
-/config.h.in
-/config.sub
-/configure
-/configure.scan
-/depcomp
-/install-sh
-/missing
-/stamp-h1
-
-# https://www.gnu.org/software/libtool/
-
-/ltmain.sh
-
-# http://www.gnu.org/software/texinfo
-
-/texinfo.tex
-
-# Repo Specific Items
-.deps
-*.o
-*.la
-*.lo
-*.log
-/config.h
-/config.h.in~
-/config.status
-Makefile
-phosphor-timemanager
-*-libtool
-.libs
-/xyz/openbmc_project/Time/Internal/*
-
-# UT related items
-.dirstamp
-test/test
-test/test.trs
+build*/
+subprojects/*
+!subprojects/*.wrap
diff --git a/meson.build b/meson.build
index ee9a1a4..7d94efb 100644
--- a/meson.build
+++ b/meson.build
@@ -27,10 +27,14 @@
 
 # Find the dependencies
 
-sdbusplus       =   dependency ('sdbusplus')
-logging         =   dependency ('phosphor-logging')
-dbus            =   dependency ('phosphor-dbus-interfaces')
-deps            =   [sdbusplus, logging, dbus]
+sdbusplus_dep = dependency ('sdbusplus')
+phosphor_logging_dep = dependency ('phosphor-logging')
+phosphor_dbus_interfaces_dep = dependency ('phosphor-dbus-interfaces')
+deps = [
+    sdbusplus_dep,
+    phosphor_logging_dep,
+    phosphor_dbus_interfaces_dep,
+]
 
 ###########################################################################
 
diff --git a/subprojects/phosphor-dbus-interfaces.wrap b/subprojects/phosphor-dbus-interfaces.wrap
new file mode 100644
index 0000000..346aa0c
--- /dev/null
+++ b/subprojects/phosphor-dbus-interfaces.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-dbus-interfaces.git
+revision = HEAD
+
+[provide]
+phosphor-dbus-interfaces = phosphor_dbus_interfaces_dep
diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
new file mode 100644
index 0000000..7d2901d
--- /dev/null
+++ b/subprojects/phosphor-logging.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-logging.git
+revision = HEAD
+
+[provide]
+phosphor-logging = phosphor-logging_dep
diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
new file mode 100644
index 0000000..7b076d0
--- /dev/null
+++ b/subprojects/sdbusplus.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/sdbusplus.git
+revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index cacedcd..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CPPFLAGS = -I${top_srcdir}
-check_PROGRAMS =
-
-TESTS = $(check_PROGRAMS)
-
-check_PROGRAMS += test
-
-test_SOURCES = \
-    TestBmcEpoch.cpp \
-    TestManager.cpp \
-    TestUtils.cpp
-
-test_LDADD = $(top_builddir)/libtimemanager.la
-
-test_CPPFLAGS = $(GTEST_CPPFLAGS) \
-                $(GMOCK_CFLAGS) \
-                $(GTEST_MAIN_CFLAGS) \
-                $(AM_CPPFLAGS)
-
-test_CXXFLAGS = $(PTHREAD_CFLAGS) \
-                $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
-                $(SDBUSPLUS_CFLAGS) -flto
-
-test_LDFLAGS = $(GMOCK_LIBS) \
-               $(GTEST_MAIN_LIBS) \
-               $(PTHREAD_LIBS) \
-               $(OESDK_TESTCASE_FLAGS)
-
-test_LDFLAGS += $(PHOSPHOR_DBUS_INTERFACES_LIBS) \
-                $(SDBUSPLUS_LIBS)