diff --git a/docs/argus/index.html b/docs/argus/index.html
index 407acc3b8..4da467705 100644
--- a/docs/argus/index.html
+++ b/docs/argus/index.html
@@ -55,10 +55,10 @@
     
     
     
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,700|Roboto&#43;Mono">
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Brandon%20Grotesque:400,700|Roboto&#43;Mono">
     <style>
       body, input {
-        font-family: 'Roboto', Helvetica, Arial, sans-serif;
+        font-family: 'Brandon Grotesque', Helvetica, Arial, sans-serif;
       }
       pre, code {
         font-family: 'Roboto Mono', 'Courier New', 'Courier', monospace;
diff --git a/docs/getting-started/index.html b/docs/getting-started/index.html
index 0a2d5191e..9c32c5198 100644
--- a/docs/getting-started/index.html
+++ b/docs/getting-started/index.html
@@ -55,10 +55,10 @@
     
     
     
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,700|Roboto&#43;Mono">
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Brandon%20Grotesque:400,700|Roboto&#43;Mono">
     <style>
       body, input {
-        font-family: 'Roboto', Helvetica, Arial, sans-serif;
+        font-family: 'Brandon Grotesque', Helvetica, Arial, sans-serif;
       }
       pre, code {
         font-family: 'Roboto Mono', 'Courier New', 'Courier', monospace;
diff --git a/docs/images/logo.png b/docs/images/logo.png
index f08e46732..ffb11a61c 100644
Binary files a/docs/images/logo.png and b/docs/images/logo.png differ
diff --git a/docs/index.html b/docs/index.html
index 8c03d1f80..979eb0439 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -55,10 +55,10 @@
     
     
     
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,700|Roboto&#43;Mono">
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Brandon%20Grotesque:400,700|Roboto&#43;Mono">
     <style>
       body, input {
-        font-family: 'Roboto', Helvetica, Arial, sans-serif;
+        font-family: 'Brandon Grotesque', Helvetica, Arial, sans-serif;
       }
       pre, code {
         font-family: 'Roboto Mono', 'Courier New', 'Courier', monospace;
diff --git a/docs/roadmap/index.html b/docs/roadmap/index.html
index 115d24754..b33f13bcd 100644
--- a/docs/roadmap/index.html
+++ b/docs/roadmap/index.html
@@ -55,10 +55,10 @@
     
     
     
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,700|Roboto&#43;Mono">
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Brandon%20Grotesque:400,700|Roboto&#43;Mono">
     <style>
       body, input {
-        font-family: 'Roboto', Helvetica, Arial, sans-serif;
+        font-family: 'Brandon Grotesque', Helvetica, Arial, sans-serif;
       }
       pre, code {
         font-family: 'Roboto Mono', 'Courier New', 'Courier', monospace;
diff --git a/docs/roadmap/v0.1.0/index.html b/docs/roadmap/v0.1.0/index.html
index e713be807..5e464ee10 100644
--- a/docs/roadmap/v0.1.0/index.html
+++ b/docs/roadmap/v0.1.0/index.html
@@ -55,10 +55,10 @@
     
     
     
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:400,700|Roboto&#43;Mono">
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Brandon%20Grotesque:400,700|Roboto&#43;Mono">
     <style>
       body, input {
-        font-family: 'Roboto', Helvetica, Arial, sans-serif;
+        font-family: 'Brandon Grotesque', Helvetica, Arial, sans-serif;
       }
       pre, code {
         font-family: 'Roboto Mono', 'Courier New', 'Courier', monospace;
diff --git a/docs/source/config.toml b/docs/source/config.toml
index 6933d4878..a0009d130 100644
--- a/docs/source/config.toml
+++ b/docs/source/config.toml
@@ -36,7 +36,7 @@ publishDir = "../../docs"
     	accent  = "deep-purple"
 
     [params.font]
-    	text = "Roboto"
+    	text = "Brandon Grotesque"
     	code = "Roboto Mono"
 
 
diff --git a/docs/source/static/images/logo.png b/docs/source/static/images/logo.png
index f08e46732..ffb11a61c 100644
Binary files a/docs/source/static/images/logo.png and b/docs/source/static/images/logo.png differ
diff --git a/pkg/argus.go b/pkg/argus.go
index 441a2175b..ae253d8fa 100644
--- a/pkg/argus.go
+++ b/pkg/argus.go
@@ -6,10 +6,10 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/collector"
 	"github.com/logicmonitor/k8s-argus/pkg/config"
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
+	"github.com/logicmonitor/k8s-argus/pkg/device"
 	"github.com/logicmonitor/k8s-argus/pkg/etcd"
 	"github.com/logicmonitor/k8s-argus/pkg/tree"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
-	"github.com/logicmonitor/k8s-argus/pkg/watch"
 	"github.com/logicmonitor/k8s-argus/pkg/watch/namespace"
 	"github.com/logicmonitor/k8s-argus/pkg/watch/node"
 	"github.com/logicmonitor/k8s-argus/pkg/watch/pod"
@@ -25,7 +25,7 @@ import (
 // Argus represents the Argus cli.
 type Argus struct {
 	*types.Base
-	Watchers []watch.Watcher
+	Watchers []types.Watcher
 }
 
 func newLMClient(id, key, company string) *lm.DefaultApi {
@@ -67,6 +67,10 @@ func NewArgus(base *types.Base) (*Argus, error) {
 		Base: base,
 	}
 
+	deviceManager := &device.Manager{
+		Base: base,
+	}
+
 	deviceTree := &tree.DeviceTree{
 		Base: base,
 	}
@@ -82,26 +86,26 @@ func NewArgus(base *types.Base) (*Argus, error) {
 	}
 
 	etcdController := etcd.Controller{
-		Base: base,
+		DeviceManager: deviceManager,
 	}
 	_, err = etcdController.DiscoverByToken()
 	if err != nil {
 		return nil, err
 	}
 
-	argus.Watchers = []watch.Watcher{
-		namespace.Watcher{
+	argus.Watchers = []types.Watcher{
+		&namespace.Watcher{
 			Base:         base,
 			DeviceGroups: deviceGroups,
 		},
-		node.Watcher{
-			Base: base,
+		&node.Watcher{
+			DeviceManager: deviceManager,
 		},
-		service.Watcher{
-			Base: base,
+		&service.Watcher{
+			DeviceManager: deviceManager,
 		},
-		pod.Watcher{
-			Base: base,
+		&pod.Watcher{
+			DeviceManager: deviceManager,
 		},
 	}
 
diff --git a/pkg/device/builder/builder.go b/pkg/device/builder/builder.go
new file mode 100644
index 000000000..ea07cf324
--- /dev/null
+++ b/pkg/device/builder/builder.go
@@ -0,0 +1,52 @@
+package builder
+
+import (
+	"github.com/logicmonitor/k8s-argus/pkg/types"
+	lm "github.com/logicmonitor/lm-sdk-go"
+)
+
+// Builder implements types.DeviceBuilder
+type Builder struct {
+	types.DeviceBuilder
+}
+
+// Name implements types.DeviceBuilder.
+func (b *Builder) Name(name string) types.DeviceOption {
+	return func(device *lm.RestDevice) {
+		device.Name = name
+	}
+}
+
+// DisplayName implements types.DeviceBuilder.
+func (b *Builder) DisplayName(name string) types.DeviceOption {
+	return func(device *lm.RestDevice) {
+		device.DisplayName = name
+	}
+}
+
+// CollectorID implements types.DeviceBuilder.
+func (b *Builder) CollectorID(id int32) types.DeviceOption {
+	return func(device *lm.RestDevice) {
+		device.PreferredCollectorId = id
+	}
+}
+
+// SystemCategories implements types.DeviceBuilder.
+func (b *Builder) SystemCategories(categories string) types.DeviceOption {
+	return func(device *lm.RestDevice) {
+		device.CustomProperties = append(device.CustomProperties, lm.NameAndValue{
+			Name:  "system.categories",
+			Value: categories,
+		})
+	}
+}
+
+// Auto implements types.DeviceBuilder.
+func (b *Builder) Auto(name, value string) types.DeviceOption {
+	return func(device *lm.RestDevice) {
+		device.CustomProperties = append(device.CustomProperties, lm.NameAndValue{
+			Name:  "auto." + name,
+			Value: value,
+		})
+	}
+}
diff --git a/pkg/device/device.go b/pkg/device/device.go
new file mode 100644
index 000000000..422cbd9dd
--- /dev/null
+++ b/pkg/device/device.go
@@ -0,0 +1,161 @@
+package device
+
+import (
+	"fmt"
+
+	"github.com/logicmonitor/k8s-argus/pkg/config"
+	"github.com/logicmonitor/k8s-argus/pkg/device/builder"
+	"github.com/logicmonitor/k8s-argus/pkg/types"
+
+	"github.com/logicmonitor/k8s-argus/pkg/utilities"
+	lm "github.com/logicmonitor/lm-sdk-go"
+)
+
+// Manager implements types.DeviceManager
+type Manager struct {
+	*types.Base
+	*builder.Builder
+}
+
+func buildDevice(c *config.Config, options ...types.DeviceOption) *lm.RestDevice {
+	device := &lm.RestDevice{
+		CustomProperties: []lm.NameAndValue{
+			{
+				Name:  "auto.clustername",
+				Value: c.ClusterName,
+			},
+		},
+		DisableAlerting:      c.DisableAlerting,
+		HostGroupIds:         "1",
+		PreferredCollectorId: c.PreferredCollector,
+	}
+
+	for _, option := range options {
+		option(device)
+	}
+
+	return device
+}
+
+// FindByName implements types.DeviceManager.
+func (m *Manager) FindByName(name string) (*lm.RestDevice, error) {
+	return find("name", name, m.LMClient)
+}
+
+// FindByDisplayName implements types.DeviceManager.
+func (m *Manager) FindByDisplayName(name string) (*lm.RestDevice, error) {
+	return find("displayName", name, m.LMClient)
+}
+
+// Add implements types.DeviceManager.
+func (m *Manager) Add(options ...types.DeviceOption) (*lm.RestDevice, error) {
+	device := buildDevice(m.Config(), options...)
+	restResponse, apiResponse, err := m.LMClient.AddDevice(*device, false)
+	if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
+		return nil, err
+	}
+
+	return &restResponse.Data, nil
+}
+
+// UpdateAndReplaceByID implements types.DeviceManager.
+func (m *Manager) UpdateAndReplaceByID(id int32, options ...types.DeviceOption) (*lm.RestDevice, error) {
+	device := buildDevice(m.Config(), options...)
+	restResponse, apiResponse, err := m.LMClient.UpdateDevice(*device, id, "replace")
+	if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
+		return nil, err
+	}
+
+	return &restResponse.Data, nil
+}
+
+// UpdateAndReplaceByName implements types.DeviceManager.
+func (m *Manager) UpdateAndReplaceByName(name string, options ...types.DeviceOption) (*lm.RestDevice, error) {
+	d, err := m.FindByDisplayName(name)
+	if err != nil {
+		return nil, err
+	}
+
+	if d == nil {
+		return nil, nil
+	}
+
+	// Update the device.
+	device, err := m.UpdateAndReplaceByID(d.Id, options...)
+	if err != nil {
+		return nil, err
+	}
+
+	return device, nil
+}
+
+// UpdateAndReplaceFieldByID implements types.DeviceManager.
+func (m *Manager) UpdateAndReplaceFieldByID(id int32, field string, options ...types.DeviceOption) (*lm.RestDevice, error) {
+	device := buildDevice(m.Config(), options...)
+	restResponse, apiResponse, err := m.LMClient.PatchDeviceById(*device, id, "replace", field)
+	if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
+		return nil, err
+	}
+
+	return &restResponse.Data, nil
+}
+
+// UpdateAndReplaceFieldByName implements types.DeviceManager.
+func (m *Manager) UpdateAndReplaceFieldByName(name string, field string, options ...types.DeviceOption) (*lm.RestDevice, error) {
+	d, err := m.FindByDisplayName(name)
+	if err != nil {
+		return nil, err
+	}
+
+	if d == nil {
+		return nil, nil
+	}
+
+	// Update the device.
+	device, err := m.UpdateAndReplaceFieldByID(d.Id, field, options...)
+	if err != nil {
+		return nil, err
+	}
+
+	return device, nil
+}
+
+// DeleteByID implements types.DeviceManager.
+func (m *Manager) DeleteByID(id int32) error {
+	restResponse, apiResponse, err := m.LMClient.DeleteDevice(id)
+	return utilities.CheckAllErrors(restResponse, apiResponse, err)
+}
+
+// DeleteByName implements types.DeviceManager.
+func (m *Manager) DeleteByName(name string) error {
+	d, err := m.FindByDisplayName(name)
+	if err != nil {
+		return err
+	}
+
+	// TODO: Should this return an error?
+	if d == nil {
+		return nil
+	}
+
+	restResponse, apiResponse, err := m.LMClient.DeleteDevice(d.Id)
+	return utilities.CheckAllErrors(restResponse, apiResponse, err)
+}
+
+// Config implements types.DeviceManager.
+func (m *Manager) Config() *config.Config {
+	return m.Base.Config
+}
+
+func find(field, name string, client *lm.DefaultApi) (*lm.RestDevice, error) {
+	filter := fmt.Sprintf("%s:%s", field, name)
+	restResponse, apiResponse, err := client.GetDeviceList("", -1, 0, filter)
+	if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
+		return nil, _err
+	}
+	if restResponse.Data.Total == 1 {
+		return &restResponse.Data.Items[0], nil
+	}
+
+	return nil, nil
+}
diff --git a/pkg/tree/devicegroup/devicegroup.go b/pkg/devicegroup/devicegroup.go
similarity index 90%
rename from pkg/tree/devicegroup/devicegroup.go
rename to pkg/devicegroup/devicegroup.go
index 3fcb77fc4..aba482dac 100644
--- a/pkg/tree/devicegroup/devicegroup.go
+++ b/pkg/devicegroup/devicegroup.go
@@ -128,6 +128,20 @@ func Find(parentID int32, name string, client *lm.DefaultApi) (*lm.RestDeviceGro
 	return deviceGroup, nil
 }
 
+// DeleteSubGroup deletes a subgroup from a device group with the specified
+// name.
+func DeleteSubGroup(deviceGroup *lm.RestDeviceGroup, name string, client *lm.DefaultApi) error {
+	for _, subGroup := range deviceGroup.SubGroups {
+		if subGroup.Name != name {
+			continue
+		}
+		restResponse, apiResponse, err := client.DeleteDeviceGroupById(subGroup.Id, true)
+		return utilities.CheckAllErrors(restResponse, apiResponse, err)
+	}
+
+	return nil
+}
+
 func create(name, appliesTo string, disableAlerting bool, parentID int32, client *lm.DefaultApi) (*lm.RestDeviceGroup, error) {
 	restResponse, apiResponse, err := client.AddDeviceGroup(lm.RestDeviceGroup{
 		Name:            name,
diff --git a/pkg/tree/devicegroup/devicegroup_test.go b/pkg/devicegroup/devicegroup_test.go
similarity index 100%
rename from pkg/tree/devicegroup/devicegroup_test.go
rename to pkg/devicegroup/devicegroup_test.go
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
index 64164acda..986cef181 100644
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -7,18 +7,17 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/logicmonitor/k8s-argus/pkg/tree/device"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
+	"github.com/logicmonitor/k8s-argus/pkg/utilities"
 
 	"github.com/coreos/etcd/client"
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
-	lm "github.com/logicmonitor/lm-sdk-go"
 	log "github.com/sirupsen/logrus"
 )
 
 // Controller is the etcd controller for discovering etcd nodes.
 type Controller struct {
-	*types.Base
+	types.DeviceManager
 }
 
 // Member is a discovered etcd member.
@@ -30,7 +29,7 @@ type Member struct {
 // DiscoverByToken discovers the etcd node IP addresses using the etcd discovery service.
 func (c *Controller) DiscoverByToken() ([]*Member, error) {
 	members := []*Member{}
-	response, err := http.Get(c.Config.EtcdDiscoveryToken)
+	response, err := http.Get(c.Config().EtcdDiscoveryToken)
 	if err != nil {
 		return nil, err
 	}
@@ -65,48 +64,38 @@ func (c *Controller) DiscoverByToken() ([]*Member, error) {
 
 func (c *Controller) addDevice(member *Member) {
 	// Check if the etcd member has already been added.
-	d, err := device.FindByName(member.URL.Hostname(), c.LMClient)
+	d, err := c.FindByName(member.URL.Hostname())
 	if err != nil {
 		log.Errorf("Failed to find etcd member %q: %v", member.Name, err)
 		return
 	}
 
+	if d != nil {
+		return
+	}
+
 	// Add the etcd member.
-	if d == nil {
-		newDevice := c.makeDeviceObject(member)
-		err = device.Add(newDevice, c.LMClient)
-		if err != nil {
-			log.Errorf("Failed to add etcd member %q: %v", newDevice.DisplayName, err)
-		}
+	if _, err := c.Add(
+		c.args(member, constants.EtcdCategory)...,
+	); err != nil {
+		log.Errorf("Failed to add etcd member %q: %v", member.URL.Hostname(), err)
+		return
 	}
 
 	log.Infof("Added etcd member %q", member.Name)
 }
 
-func (c *Controller) makeDeviceObject(member *Member) *lm.RestDevice {
-	categories := constants.EtcdCategory
-
-	d := &lm.RestDevice{
-		Name:                 member.URL.Hostname(),
-		DisplayName:          member.Name + "-" + c.Config.ClusterName,
-		DisableAlerting:      c.Config.DisableAlerting,
-		HostGroupIds:         "1",
-		PreferredCollectorId: c.Config.PreferredCollector,
-		CustomProperties: []lm.NameAndValue{
-			{
-				Name:  "system.categories",
-				Value: categories,
-			},
-			{
-				Name:  "auto.clustername",
-				Value: c.Config.ClusterName,
-			},
-			{
-				Name:  "auto.clientport",
-				Value: member.URL.Port(),
-			},
-		},
+// nolint: unparam
+func (c *Controller) args(member *Member, category string) []types.DeviceOption {
+	categories := utilities.BuildSystemCategoriesFromLabels(category, nil)
+	return []types.DeviceOption{
+		c.Name(member.URL.Hostname()),
+		c.DisplayName(fmtMemberDisplayName(member)),
+		c.SystemCategories(categories),
+		c.Auto("clientport", member.URL.Port()),
 	}
+}
 
-	return d
+func fmtMemberDisplayName(member *Member) string {
+	return member.Name + "-" + member.URL.Hostname()
 }
diff --git a/pkg/tree/device/device.go b/pkg/tree/device/device.go
deleted file mode 100644
index fd2e94b00..000000000
--- a/pkg/tree/device/device.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package device
-
-import (
-	"fmt"
-
-	"github.com/logicmonitor/k8s-argus/pkg/utilities"
-	lm "github.com/logicmonitor/lm-sdk-go"
-)
-
-// FindByName searches for a device by it's name. It will return a device if and only
-// if one device was found, and return nil otherwise.
-func FindByName(name string, client *lm.DefaultApi) (*lm.RestDevice, error) {
-	return find("name", name, client)
-}
-
-// FindByDisplayName searches for a device by it's display name. It will return a device if and only if
-// one device was found, and return nil otherwise.
-func FindByDisplayName(name string, client *lm.DefaultApi) (*lm.RestDevice, error) {
-	return find("displayName", name, client)
-}
-
-func find(field, name string, client *lm.DefaultApi) (*lm.RestDevice, error) {
-	filter := fmt.Sprintf("%s:%s", field, name)
-	restResponse, apiResponse, err := client.GetDeviceList("", -1, 0, filter)
-	if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
-		return nil, _err
-	}
-	if restResponse.Data.Total == 1 {
-		return &restResponse.Data.Items[0], nil
-	}
-
-	return nil, nil
-}
-
-// Add adds a device to a LogicMonitor account.
-func Add(d *lm.RestDevice, client *lm.DefaultApi) error {
-	restResponse, apiResponse, err := client.AddDevice(*d, false)
-	return utilities.CheckAllErrors(restResponse, apiResponse, err)
-}
-
-// UpdateAndReplace updatess a device using the 'replace' OpType.
-func UpdateAndReplace(d *lm.RestDevice, id int32, client *lm.DefaultApi) error {
-	restResponse, apiResponse, err := client.UpdateDevice(*d, id, "replace")
-	return utilities.CheckAllErrors(restResponse, apiResponse, err)
-}
-
-// UpdateAndReplaceField updatess a device using the 'replace' OpType for a
-// specific field of a device.
-func UpdateAndReplaceField(d *lm.RestDevice, id int32, field string, client *lm.DefaultApi) error {
-	restResponse, apiResponse, err := client.PatchDeviceById(*d, id, "replace", field)
-	return utilities.CheckAllErrors(restResponse, apiResponse, err)
-}
-
-// Delete deletes a device by device ID.
-func Delete(d *lm.RestDevice, client *lm.DefaultApi) error {
-	restResponse, apiResponse, err := client.DeleteDevice(d.Id)
-	return utilities.CheckAllErrors(restResponse, apiResponse, err)
-}
-
-// BuildSystemCategoriesFromLabels formats a system.categories string.
-func BuildSystemCategoriesFromLabels(categories string, labels map[string]string) string {
-	for k, v := range labels {
-		categories += "," + k + "=" + v
-
-	}
-
-	return categories
-}
diff --git a/pkg/tree/tree.go b/pkg/tree/tree.go
index 61a618b71..427fbf327 100644
--- a/pkg/tree/tree.go
+++ b/pkg/tree/tree.go
@@ -2,7 +2,7 @@ package tree
 
 import (
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
-	"github.com/logicmonitor/k8s-argus/pkg/tree/devicegroup"
+	"github.com/logicmonitor/k8s-argus/pkg/devicegroup"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
 )
 
diff --git a/pkg/types/types.go b/pkg/types/types.go
index 2be0c64dd..9c516458f 100644
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -4,6 +4,7 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/config"
 	lm "github.com/logicmonitor/lm-sdk-go"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/pkg/runtime"
 )
 
 // Base is a struct for embedding
@@ -12,3 +13,65 @@ type Base struct {
 	K8sClient *kubernetes.Clientset
 	Config    *config.Config
 }
+
+// Watcher is the LogicMonitor Watcher interface.
+type Watcher interface {
+	Resource() string
+	ObjType() runtime.Object
+	AddFunc() func(obj interface{})
+	DeleteFunc() func(obj interface{})
+	UpdateFunc() func(oldObj, newObj interface{})
+}
+
+// DeviceManager is an interface that describes how resources in Kubernetes
+// are mapped into LogicMonitor as devices.
+type DeviceManager interface {
+	DeviceMapper
+	DeviceBuilder
+}
+
+// DeviceMapper is the interface responsible for mapping a Kubernetes resource to
+// a LogicMonitor device.
+type DeviceMapper interface {
+	// Config returns the Argus config.
+	Config() *config.Config
+	// FindByName searches for a device by it's name. It will return a device if and only
+	// if one device was found, and return nil otherwise.
+	FindByName(string) (*lm.RestDevice, error)
+	// FindByDisplayName searches for a device by it's display name. It will return a device if and only if
+	// one device was found, and return nil otherwise.
+	FindByDisplayName(string) (*lm.RestDevice, error)
+	// Add adds a device to a LogicMonitor account.
+	Add(...DeviceOption) (*lm.RestDevice, error)
+	// UpdateAndReplaceByID updates a device using the 'replace' OpType.
+	UpdateAndReplaceByID(int32, ...DeviceOption) (*lm.RestDevice, error)
+	// UpdateAndReplaceByName updates a device using the 'replace' OpType if and onlt if it does not already exist.
+	UpdateAndReplaceByName(string, ...DeviceOption) (*lm.RestDevice, error)
+	// UpdateAndReplaceFieldByID updates a device using the 'replace' OpType for a
+	// specific field of a device.
+	UpdateAndReplaceFieldByID(int32, string, ...DeviceOption) (*lm.RestDevice, error)
+	// UpdateAndReplaceFieldByName updates a device using the 'replace' OpType for a
+	// specific field of a device.
+	UpdateAndReplaceFieldByName(string, string, ...DeviceOption) (*lm.RestDevice, error)
+	// DeleteByID deletes a device by device ID.
+	DeleteByID(int32) error
+	// DeleteByName deletes a device by device name.
+	DeleteByName(string) error
+}
+
+// DeviceOption is the function definition for the functional options pattern.
+type DeviceOption func(*lm.RestDevice)
+
+// DeviceBuilder is the interface responsible for building a device struct.
+type DeviceBuilder interface {
+	// Name sets the device name.
+	Name(string) DeviceOption
+	// DisplayName sets the device name.
+	DisplayName(string) DeviceOption
+	// CollectorID sets the preferred collector ID for the device.
+	CollectorID(int32) DeviceOption
+	// SystemCategories sets the system.categories property on the device.
+	SystemCategories(string) DeviceOption
+	// Auto adds an auto property to the device.
+	Auto(string, string) DeviceOption
+}
diff --git a/pkg/utilities/utilities.go b/pkg/utilities/utilities.go
index dbbf7e456..73e0c53b7 100644
--- a/pkg/utilities/utilities.go
+++ b/pkg/utilities/utilities.go
@@ -10,6 +10,16 @@ import (
 	"github.com/logicmonitor/lm-sdk-go"
 )
 
+// BuildSystemCategoriesFromLabels formats a system.categories string.
+func BuildSystemCategoriesFromLabels(categories string, labels map[string]string) string {
+	for k, v := range labels {
+		categories += "," + k + "=" + v
+
+	}
+
+	return categories
+}
+
 // CheckAllErrors is a helper function to deal with the number of possible places that an API call can fail.
 func CheckAllErrors(restResponse interface{}, apiResponse *logicmonitor.APIResponse, err error) error {
 	var restResponseMessage string
diff --git a/pkg/watch/namespace/namespace.go b/pkg/watch/namespace/namespace.go
index df69c6c86..8762ebc1c 100644
--- a/pkg/watch/namespace/namespace.go
+++ b/pkg/watch/namespace/namespace.go
@@ -1,10 +1,8 @@
 package namespace
 
 import (
-	"github.com/logicmonitor/k8s-argus/pkg/tree/devicegroup"
-	"github.com/logicmonitor/k8s-argus/pkg/utilities"
-
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
+	"github.com/logicmonitor/k8s-argus/pkg/devicegroup"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/pkg/api/v1"
@@ -18,6 +16,7 @@ const (
 // Watcher represents a watcher type that watches namespaces.
 type Watcher struct {
 	*types.Base
+	// TODO: This should be thread safe.
 	DeviceGroups map[string]int32
 }
 
@@ -84,19 +83,18 @@ func (w Watcher) DeleteFunc() func(obj interface{}) {
 			deviceGroup, err := devicegroup.Find(parentID, name, w.LMClient)
 			if err != nil {
 				log.Printf("Failed to find namespace %s: %v", name, err)
-
 				return
 			}
-			for _, subGroup := range deviceGroup.SubGroups {
-				if subGroup.Name == namespace.Name {
-					restResponse, apiResponse, err := w.LMClient.DeleteDeviceGroupById(subGroup.Id, true)
-					if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
-						log.Errorf("Failed to delete namespace %q: %v", subGroup.Name, _err)
-
-						return
-					}
-				}
+			// We should only be returned a device group if it is namespaced.
+			if deviceGroup == nil {
+				continue
+			}
+			err = devicegroup.DeleteSubGroup(deviceGroup, namespace.Name, w.LMClient)
+			if err != nil {
+				log.Errorf("Failed to delete namespace %q: %v", namespace.Name, err)
+				return
 			}
 		}
+
 	}
 }
diff --git a/pkg/watch/node/node.go b/pkg/watch/node/node.go
index c7c72e388..aff830263 100644
--- a/pkg/watch/node/node.go
+++ b/pkg/watch/node/node.go
@@ -1,10 +1,11 @@
+// Package node provides the logic for mapping a Kubernetes Node to a
+// LogicMonitor device.
 package node
 
 import (
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
-	"github.com/logicmonitor/k8s-argus/pkg/tree/device"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
-	lm "github.com/logicmonitor/lm-sdk-go"
+	"github.com/logicmonitor/k8s-argus/pkg/utilities"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/pkg/runtime"
@@ -16,179 +17,111 @@ const (
 
 // Watcher represents a watcher type that watches nodes.
 type Watcher struct {
-	*types.Base
+	types.DeviceManager
 }
 
 // Resource is a function that implements the Watcher interface.
-func (w Watcher) Resource() string {
+func (w *Watcher) Resource() string {
 	return resource
 }
 
 // ObjType is a function that implements the Watcher interface.
-func (w Watcher) ObjType() runtime.Object {
+func (w *Watcher) ObjType() runtime.Object {
 	return &v1.Node{}
 }
 
 // AddFunc is a function that implements the Watcher interface.
-// nolint: dupl
-func (w Watcher) AddFunc() func(obj interface{}) {
+func (w *Watcher) AddFunc() func(obj interface{}) {
 	return func(obj interface{}) {
 		node := obj.(*v1.Node)
-
-		// We need an IP address.
-		if GetInternalAddress(node.Status.Addresses) == nil {
-			return
-		}
-
-		// Check if the node has already been added.
-		d, err := device.FindByDisplayName(node.Name, w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to find node %q: %v", node.Name, err)
+		// Require an IP address.
+		if getInternalAddress(node.Status.Addresses) == nil {
 			return
 		}
-
-		// Add the node.
-		if d == nil {
-			newDevice := w.makeDeviceObject(node)
-			err = device.Add(newDevice, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to add node %q: %v", newDevice.DisplayName, err)
-			}
-		}
+		w.add(node)
 	}
 }
 
 // UpdateFunc is a function that implements the Watcher interface.
-// nolint: dupl
-func (w Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
+func (w *Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
 	return func(oldObj, newObj interface{}) {
-		oldNode := oldObj.(*v1.Node)
-		newNode := newObj.(*v1.Node)
-
+		old := oldObj.(*v1.Node)
+		new := newObj.(*v1.Node)
 		// If the old node does not have an IP, then there is no way we could
 		// have added it to LogicMonitor. Therefore, it must be a new device.
-		oldInternalAddress := GetInternalAddress(oldNode.Status.Addresses)
-		newInternalAddress := GetInternalAddress(oldNode.Status.Addresses)
+		oldInternalAddress := getInternalAddress(old.Status.Addresses)
+		newInternalAddress := getInternalAddress(new.Status.Addresses)
 		if oldInternalAddress == nil && newInternalAddress != nil {
-			d := w.makeDeviceObject(newNode)
-			err := device.Add(d, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to add node %s: %s", d.DisplayName, err)
-				return
-			}
-			log.Infof("Added node %s", d.DisplayName)
-			return
+			w.add(new)
 		}
-
-		// Covers the case when a node has been terminated (new ip doesn't exist)
-		// and if a node needs to be added.
+		// Covers the case when the old node is in the process of terminating
+		// and the new node is coming up to replace it.
 		if oldInternalAddress.Address != newInternalAddress.Address {
-			oldDevice, err := device.FindByDisplayName(oldNode.Name, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to find node %q: %v", oldNode.Name, err)
-				return
-			}
-
-			// Update the node.
-			if oldDevice != nil {
-				newDevice := w.makeDeviceObject(newNode)
-				err := device.UpdateAndReplace(newDevice, oldDevice.Id, w.LMClient)
-				if err != nil {
-					log.Errorf("Failed to update node %s: %v", oldDevice.DisplayName, err)
-					return
-				}
-			}
-
-			log.Infof("Updated node %s with id %d", oldDevice.DisplayName, oldDevice.Id)
+			w.update(old, new)
 		}
 	}
 }
 
 // DeleteFunc is a function that implements the Watcher interface.
 // nolint: dupl
-func (w Watcher) DeleteFunc() func(obj interface{}) {
+func (w *Watcher) DeleteFunc() func(obj interface{}) {
 	return func(obj interface{}) {
 		node := obj.(*v1.Node)
-		d, err := device.FindByDisplayName(node.Name, w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to find node %q: %v", node.Name, err)
-			return
-		}
 
-		if d == nil {
-			return
-		}
-
-		// Delete the device
-		if w.Config.DeleteDevices {
-			err = device.Delete(d, w.LMClient)
-			if err != nil {
+		// Delete the node.
+		if w.Config().DeleteDevices {
+			if err := w.DeleteByName(node.Name); err != nil {
 				log.Errorf("Failed to delete node: %v", err)
 				return
 			}
-			log.Infof("Deleted node %s with id %d", d.DisplayName, d.Id)
+			log.Infof("Deleted node %s", node.Name)
 			return
 		}
 
-		// Move the device
+		// Move the node.
+		w.move(node)
+	}
+}
 
-		categories := device.BuildSystemCategoriesFromLabels(constants.NodeDeletedCategory, node.Labels)
-		newDevice := &lm.RestDevice{
-			CustomProperties: []lm.NameAndValue{
-				{
-					Name:  "system.categories",
-					Value: categories,
-				},
-			},
-		}
-		err = device.UpdateAndReplaceField(newDevice, d.Id, constants.CustomPropertiesFieldName, w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to move node %s: %s", d.DisplayName, err)
-			return
-		}
+// nolint: dupl
+func (w *Watcher) add(node *v1.Node) {
+	if _, err := w.Add(w.args(node, constants.NodeCategory)...); err != nil {
+		log.Errorf("Failed to add node %q: %v", node.Name, err)
+		return
+	}
+	log.Infof("Added node %q", node.Name)
+}
 
-		log.Infof("Moved node %s with id %d to deleted group", d.DisplayName, d.Id)
+func (w *Watcher) update(old, new *v1.Node) {
+	if _, err := w.UpdateAndReplaceByName(old.Name, w.args(new, constants.NodeCategory)...); err != nil {
+		log.Errorf("Failed to update node %q: %v", new.Name, err)
+		return
 	}
+	log.Infof("Updated node %q", old.Name)
 }
 
-func (w Watcher) makeDeviceObject(node *v1.Node) *lm.RestDevice {
-	categories := device.BuildSystemCategoriesFromLabels(constants.NodeCategory, node.Labels)
-
-	d := &lm.RestDevice{
-		Name:                 GetInternalAddress(node.Status.Addresses).Address,
-		DisplayName:          node.Name,
-		DisableAlerting:      w.Config.DisableAlerting,
-		HostGroupIds:         "1",
-		PreferredCollectorId: w.Config.PreferredCollector,
-		CustomProperties: []lm.NameAndValue{
-			{
-				Name:  "system.categories",
-				Value: categories,
-			},
-			{
-				Name:  "auto.clustername",
-				Value: w.Config.ClusterName,
-			},
-			{
-				Name:  "auto.selflink",
-				Value: node.SelfLink,
-			},
-			{
-				Name:  "auto.name",
-				Value: node.Name,
-			},
-			{
-				Name:  "auto.uid",
-				Value: string(node.UID),
-			},
-		},
+func (w *Watcher) move(node *v1.Node) {
+	if _, err := w.UpdateAndReplaceFieldByName(node.Name, constants.CustomPropertiesFieldName, w.args(node, constants.NodeDeletedCategory)...); err != nil {
+		log.Errorf("Failed to move node %q: %v", node.Name, err)
+		return
 	}
+	log.Infof("Moved node %q", node.Name)
+}
 
-	return d
+func (w *Watcher) args(node *v1.Node, category string) []types.DeviceOption {
+	categories := utilities.BuildSystemCategoriesFromLabels(category, node.Labels)
+	return []types.DeviceOption{
+		w.Name(getInternalAddress(node.Status.Addresses).Address),
+		w.DisplayName(node.Name),
+		w.SystemCategories(categories),
+		w.Auto("name", node.Name),
+		w.Auto("selflink", node.SelfLink),
+		w.Auto("uid", string(node.UID)),
+	}
 }
 
-// GetInternalAddress finds the node's internal address.
-func GetInternalAddress(addresses []v1.NodeAddress) *v1.NodeAddress {
+// getInternalAddress finds the node's internal address.
+func getInternalAddress(addresses []v1.NodeAddress) *v1.NodeAddress {
 	for _, address := range addresses {
 		if address.Type == v1.NodeInternalIP {
 			return &address
diff --git a/pkg/watch/pod/pod.go b/pkg/watch/pod/pod.go
index 0f2f7ebff..564f2d58b 100644
--- a/pkg/watch/pod/pod.go
+++ b/pkg/watch/pod/pod.go
@@ -1,10 +1,11 @@
+// Package pod provides the logic for mapping a Kubernetes Pod to a
+// LogicMonitor w.
 package pod
 
 import (
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
-	"github.com/logicmonitor/k8s-argus/pkg/tree/device"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
-	lm "github.com/logicmonitor/lm-sdk-go"
+	"github.com/logicmonitor/k8s-argus/pkg/utilities"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/pkg/runtime"
@@ -16,184 +17,117 @@ const (
 
 // Watcher represents a watcher type that watches pods.
 type Watcher struct {
-	*types.Base
+	types.DeviceManager
 }
 
 // Resource is a function that implements the Watcher interface.
-func (w Watcher) Resource() string {
+func (w *Watcher) Resource() string {
 	return resource
 }
 
 // ObjType is a function that implements the Watcher interface.
-func (w Watcher) ObjType() runtime.Object {
+func (w *Watcher) ObjType() runtime.Object {
 	return &v1.Pod{}
 }
 
 // AddFunc is a function that implements the Watcher interface.
-// nolint: dupl
-func (w Watcher) AddFunc() func(obj interface{}) {
+func (w *Watcher) AddFunc() func(obj interface{}) {
 	return func(obj interface{}) {
 		pod := obj.(*v1.Pod)
-
-		// We need an IP address.
+		// Require an IP address.
 		if pod.Status.PodIP == "" {
 			return
 		}
-
-		// Check if the pod has already been added.
-		d, err := device.FindByDisplayName(pod.Name, w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to find pod %q: %v", pod.Name, err)
-			return
-		}
-
-		// Add the pod.
-		if d == nil {
-			newDevice := w.makeDeviceObject(pod)
-			err = device.Add(newDevice, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to add pod %q: %v", newDevice.DisplayName, err)
-			}
-			log.Infof("Added pod %s", newDevice.DisplayName)
-		}
+		w.add(pod)
 	}
 }
 
 // UpdateFunc is a function that implements the Watcher interface.
-// nolint: dupl
-func (w Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
+func (w *Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
 	return func(oldObj, newObj interface{}) {
-		oldPod := oldObj.(*v1.Pod)
-		newPod := newObj.(*v1.Pod)
+		old := oldObj.(*v1.Pod)
+		new := newObj.(*v1.Pod)
 
 		// If the old pod does not have an IP, then there is no way we could
-		// have added it to LogicMonitor. Therefore, it must be a new device.
-		if oldPod.Status.PodIP == "" && newPod.Status.PodIP != "" {
-			d := w.makeDeviceObject(newPod)
-			err := device.Add(d, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to add pod %s: %s", d.DisplayName, err)
-				return
-			}
-			log.Infof("Added pod %s", d.DisplayName)
-			return
+		// have added it to LogicMonitor. Therefore, it must be a new w.
+		if old.Status.PodIP == "" && new.Status.PodIP != "" {
+			w.add(new)
 		}
 
-		// Covers the case when a pod has been terminated (new ip doesn't exist)
-		// and if a pod needs to be added.
-		if oldPod.Status.PodIP != "" && newPod.Status.PodIP != "" {
-			oldDevice, err := device.FindByDisplayName(oldPod.Name, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to find pod %q: %v", oldPod.Name, err)
-				return
-			}
-
-			// Update the pod.
-			if oldDevice != nil {
-				newDevice := w.makeDeviceObject(newPod)
-				err := device.UpdateAndReplace(newDevice, oldDevice.Id, w.LMClient)
-				if err != nil {
-					log.Errorf("Failed to update pod %s: %v", oldDevice.DisplayName, err)
-					return
-				}
-			}
-
-			log.Infof("Updated pod %s with id %d", oldDevice.DisplayName, oldDevice.Id)
+		// Covers the case when the old pod is in the process of terminating
+		// and the new pod is coming up to replace it.
+		if old.Status.PodIP != "" && new.Status.PodIP != "" {
+			w.update(old, new)
 		}
 	}
 }
 
 // DeleteFunc is a function that implements the Watcher interface.
 // nolint: dupl
-func (w Watcher) DeleteFunc() func(obj interface{}) {
+func (w *Watcher) DeleteFunc() func(obj interface{}) {
 	return func(obj interface{}) {
 		pod := obj.(*v1.Pod)
-		d, err := device.FindByDisplayName(pod.Name, w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to find pod %q: %v", pod.Name, err)
-			return
-		}
-
-		if d == nil {
-			return
-		}
 
-		// Delete the device
-		if w.Config.DeleteDevices {
-			err = device.Delete(d, w.LMClient)
-			if err != nil {
+		// Delete the pod.
+		if w.Config().DeleteDevices {
+			if err := w.DeleteByName(pod.Name); err != nil {
 				log.Errorf("Failed to delete pod: %v", err)
 				return
 			}
-			log.Infof("Deleted pod %s with id %d", d.DisplayName, d.Id)
+			log.Infof("Deleted pod %s", pod.Name)
 			return
 		}
 
-		// Move the device
+		// Move the pod.
+		w.move(pod)
+	}
+}
 
-		categories := device.BuildSystemCategoriesFromLabels(constants.PodDeletedCategory, pod.Labels)
-		newDevice := &lm.RestDevice{
-			CustomProperties: []lm.NameAndValue{
-				{
-					Name:  "system.categories",
-					Value: categories,
-				},
-			},
-		}
-		err = device.UpdateAndReplaceField(newDevice, d.Id, constants.CustomPropertiesFieldName, w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to move pod %s: %s", d.DisplayName, err)
-			return
-		}
+// nolint: dupl
+func (w *Watcher) add(pod *v1.Pod) {
+	if _, err := w.Add(
+		w.args(pod, constants.PodCategory)...,
+	); err != nil {
+		log.Errorf("Failed to add pod %q: %v", pod.Name, err)
+		return
+	}
+	log.Infof("Added pod %q", pod.Name)
+}
 
-		log.Infof("Moved pod %s with id %d to deleted group", d.DisplayName, d.Id)
+func (w *Watcher) update(old, new *v1.Pod) {
+	if _, err := w.UpdateAndReplaceByName(
+		old.Name,
+		w.args(new, constants.PodCategory)...,
+	); err != nil {
+		log.Errorf("Failed to update pod %q: %v", new.Name, err)
+		return
 	}
+	log.Infof("Updated pod %q", old.Name)
 }
 
-func (w Watcher) makeDeviceObject(pod *v1.Pod) *lm.RestDevice {
-	categories := device.BuildSystemCategoriesFromLabels(constants.PodCategory, pod.Labels)
-
-	d := &lm.RestDevice{
-		Name:                 pod.Name,
-		DisplayName:          pod.Name,
-		DisableAlerting:      w.Config.DisableAlerting,
-		HostGroupIds:         "1",
-		PreferredCollectorId: w.Config.PreferredCollector,
-		CustomProperties: []lm.NameAndValue{
-			{
-				Name:  "system.categories",
-				Value: categories,
-			},
-			{
-				Name:  "auto.clustername",
-				Value: w.Config.ClusterName,
-			},
-			{
-				Name:  "auto.selflink",
-				Value: pod.SelfLink,
-			},
-			{
-				Name:  "auto.nodename",
-				Value: pod.Spec.NodeName,
-			},
-			{
-				Name:  "auto.name",
-				Value: pod.Name,
-			},
-			{
-				Name:  "auto.namespace",
-				Value: pod.Namespace,
-			},
-			{
-				Name:  "auto.uid",
-				Value: string(pod.UID),
-			},
-			{
-				Name:  "auto.ip",
-				Value: pod.Status.PodIP,
-			},
-		},
+func (w *Watcher) move(pod *v1.Pod) {
+	if _, err := w.UpdateAndReplaceFieldByName(
+		pod.Name,
+		constants.CustomPropertiesFieldName,
+		w.args(pod, constants.PodDeletedCategory)...,
+	); err != nil {
+		log.Errorf("Failed to move pod %q: %v", pod.Name, err)
+		return
 	}
+	log.Infof("Moved pod %q", pod.Name)
+}
 
-	return d
+func (w *Watcher) args(pod *v1.Pod, category string) []types.DeviceOption {
+	categories := utilities.BuildSystemCategoriesFromLabels(category, pod.Labels)
+	return []types.DeviceOption{
+		w.Name(pod.Name),
+		w.DisplayName(pod.Name),
+		w.SystemCategories(categories),
+		w.Auto("name", pod.Name),
+		w.Auto("namespace", pod.Namespace),
+		w.Auto("nodename", pod.Spec.NodeName),
+		w.Auto("selflink", pod.SelfLink),
+		w.Auto("uid", string(pod.UID)),
+		w.Auto("ip", pod.Status.PodIP),
+	}
 }
diff --git a/pkg/watch/service/service.go b/pkg/watch/service/service.go
index 428d08dec..f8a37cefa 100644
--- a/pkg/watch/service/service.go
+++ b/pkg/watch/service/service.go
@@ -1,10 +1,11 @@
+// Package service provides the logic for mapping a Kubernetes Service to a
+// LogicMonitor w.
 package service
 
 import (
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
-	"github.com/logicmonitor/k8s-argus/pkg/tree/device"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
-	lm "github.com/logicmonitor/lm-sdk-go"
+	"github.com/logicmonitor/k8s-argus/pkg/utilities"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/pkg/runtime"
@@ -16,188 +17,125 @@ const (
 
 // Watcher represents a watcher type that watches services.
 type Watcher struct {
-	*types.Base
+	types.DeviceManager
 }
 
 // Resource is a function that implements the Watcher interface.
-func (w Watcher) Resource() string {
+func (w *Watcher) Resource() string {
 	return resource
 }
 
 // ObjType is a function that implements the Watcher interface.
-func (w Watcher) ObjType() runtime.Object {
+func (w *Watcher) ObjType() runtime.Object {
 	return &v1.Service{}
 }
 
 // AddFunc is a function that implements the Watcher interface.
-// nolint: dupl
-func (w Watcher) AddFunc() func(obj interface{}) {
+func (w *Watcher) AddFunc() func(obj interface{}) {
 	return func(obj interface{}) {
 		service := obj.(*v1.Service)
-
-		// Only add the service if it is of the type 'ClusterIP'.
+		// Only add the service if it is has a ClusterIP.
 		if service.Spec.Type != v1.ServiceTypeClusterIP {
 			return
 		}
-
-		// We need an IP address.
+		// Require an IP address.
 		if service.Spec.ClusterIP == "" {
 			return
 		}
-
-		// Check if the service has already been added.
-		d, err := device.FindByDisplayName(fmtServiceDisplayName(service), w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to find service %q: %v", service.Name, err)
-			return
-		}
-
-		// Add the service.
-		if d == nil {
-			newDevice := w.makeDeviceObject(service)
-			err = device.Add(newDevice, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to add service %q: %v", newDevice.DisplayName, err)
-			}
-			log.Infof("Added service %s", newDevice.DisplayName)
-		}
+		w.add(service)
 	}
 }
 
 // UpdateFunc is a function that implements the Watcher interface.
-// nolint: dupl
-func (w Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
+func (w *Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
 	return func(oldObj, newObj interface{}) {
-		oldService := oldObj.(*v1.Service)
-		newService := newObj.(*v1.Service)
+		old := oldObj.(*v1.Service)
+		new := newObj.(*v1.Service)
 
-		// Only add the service if it is of the type 'ClusterIP'.
-		if newService.Spec.Type != v1.ServiceTypeClusterIP {
+		// Only add the service if it is has a ClusterIP.
+		if new.Spec.Type != v1.ServiceTypeClusterIP {
 			return
 		}
 
 		// If the old service does not have an IP, then there is no way we could
-		// have added it to LogicMonitor. Therefore, it must be a new device.
-		if oldService.Spec.ClusterIP == "" && newService.Spec.ClusterIP != "" {
-			d := w.makeDeviceObject(newService)
-			err := device.Add(d, w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to add service %s: %s", d.DisplayName, err)
-				return
-			}
-			log.Infof("Added service %s", d.DisplayName)
-			return
+		// have added it to LogicMonitor. Therefore, it must be a new w.
+		if old.Spec.ClusterIP == "" && new.Spec.ClusterIP != "" {
+			w.add(new)
 		}
 
-		// Covers the case when a service has been terminated (new ip doesn't exist)
-		// and if a service needs to be added.
-		if oldService.Spec.ClusterIP != "" && newService.Spec.ClusterIP != "" {
-			oldDevice, err := device.FindByDisplayName(fmtServiceDisplayName(oldService), w.LMClient)
-			if err != nil {
-				log.Errorf("Failed to find service %q: %v", oldService.Name, err)
-				return
-			}
-
-			// Update the service.
-			if oldDevice != nil {
-				newDevice := w.makeDeviceObject(newService)
-				err := device.UpdateAndReplace(newDevice, oldDevice.Id, w.LMClient)
-				if err != nil {
-					log.Errorf("Failed to update service %s: %v", oldDevice.DisplayName, err)
-					return
-				}
-			}
-
-			log.Infof("Updated service %s with id %d", oldDevice.DisplayName, oldDevice.Id)
+		// Covers the case when the old service is in the process of terminating
+		// and the new service is coming up to replace it.
+		if old.Spec.ClusterIP != "" && new.Spec.ClusterIP != "" {
+			w.update(old, new)
 		}
 	}
 }
 
 // DeleteFunc is a function that implements the Watcher interface.
-// nolint: dupl
-func (w Watcher) DeleteFunc() func(obj interface{}) {
+func (w *Watcher) DeleteFunc() func(obj interface{}) {
 	return func(obj interface{}) {
 		service := obj.(*v1.Service)
-		d, err := device.FindByDisplayName(fmtServiceDisplayName(service), w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to find service %q: %v", service.Name, err)
-			return
-		}
 
-		if d == nil {
-			return
-		}
-
-		// Delete the device
-		if w.Config.DeleteDevices {
-			err = device.Delete(d, w.LMClient)
-			if err != nil {
+		// Delete the service.
+		if w.Config().DeleteDevices {
+			if err := w.DeleteByName(fmtServiceName(service)); err != nil {
 				log.Errorf("Failed to delete service: %v", err)
 				return
 			}
-			log.Infof("Deleted service %s with id %d", d.DisplayName, d.Id)
+			log.Infof("Deleted service %s", service.Name)
 			return
 		}
 
-		// Move the device
+		// Move the service.
+		w.move(service)
+	}
+}
 
-		categories := device.BuildSystemCategoriesFromLabels(constants.ServiceDeletedCategory, service.Labels)
-		newDevice := &lm.RestDevice{
-			CustomProperties: []lm.NameAndValue{
-				{
-					Name:  "system.categories",
-					Value: categories,
-				},
-			},
-		}
-		err = device.UpdateAndReplaceField(newDevice, d.Id, constants.CustomPropertiesFieldName, w.LMClient)
-		if err != nil {
-			log.Errorf("Failed to move service %s: %s", d.DisplayName, err)
-			return
-		}
+// nolint: dupl
+func (w *Watcher) add(service *v1.Service) {
+	if _, err := w.Add(
+		w.args(service, constants.ServiceCategory)...,
+	); err != nil {
+		log.Errorf("Failed to add service %q: %v", service.Name, err)
+		return
+	}
+	log.Infof("Added service %q", service.Name)
+}
 
-		log.Infof("Moved service %s with id %d to deleted group", d.DisplayName, d.Id)
+func (w *Watcher) update(old, new *v1.Service) {
+	if _, err := w.UpdateAndReplaceByName(
+		old.Name,
+		w.args(new, constants.ServiceCategory)...,
+	); err != nil {
+		log.Errorf("Failed to update service %q: %v", new.Name, err)
+		return
 	}
+	log.Infof("Updated service %q", old.Name)
 }
 
-func (w Watcher) makeDeviceObject(service *v1.Service) *lm.RestDevice {
-	categories := device.BuildSystemCategoriesFromLabels(constants.ServiceCategory, service.Labels)
-
-	d := &lm.RestDevice{
-		Name:                 fmtServiceName(service),
-		DisplayName:          fmtServiceDisplayName(service),
-		DisableAlerting:      true,
-		HostGroupIds:         "1",
-		PreferredCollectorId: w.Config.PreferredCollector,
-		CustomProperties: []lm.NameAndValue{
-			{
-				Name:  "system.categories",
-				Value: categories,
-			},
-			{
-				Name:  "auto.clustername",
-				Value: w.Config.ClusterName,
-			},
-			{
-				Name:  "auto.selflink",
-				Value: service.SelfLink,
-			},
-			{
-				Name:  "auto.name",
-				Value: service.Name,
-			},
-			{
-				Name:  "auto.namespace",
-				Value: service.Namespace,
-			},
-			{
-				Name:  "auto.uid",
-				Value: string(service.UID),
-			},
-		},
+func (w *Watcher) move(service *v1.Service) {
+	if _, err := w.UpdateAndReplaceFieldByName(
+		service.Name,
+		constants.CustomPropertiesFieldName,
+		w.args(service, constants.ServiceDeletedCategory)...,
+	); err != nil {
+		log.Errorf("Failed to move service %q: %v", service.Name, err)
+		return
 	}
+	log.Infof("Moved service %q", service.Name)
+}
 
-	return d
+func (w *Watcher) args(service *v1.Service, category string) []types.DeviceOption {
+	categories := utilities.BuildSystemCategoriesFromLabels(category, service.Labels)
+	return []types.DeviceOption{
+		w.Name(fmtServiceName(service)),
+		w.DisplayName(fmtServiceDisplayName(service)),
+		w.SystemCategories(categories),
+		w.Auto("name", service.Name),
+		w.Auto("namespace", service.Namespace),
+		w.Auto("selflink", service.SelfLink),
+		w.Auto("uid", string(service.UID)),
+	}
 }
 
 func fmtServiceName(service *v1.Service) string {
diff --git a/pkg/watch/watch.go b/pkg/watch/watch.go
deleted file mode 100644
index 0a196f32c..000000000
--- a/pkg/watch/watch.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package watch
-
-import "k8s.io/client-go/pkg/runtime"
-
-// Watcher is the LogicMonitor Watcher interface.
-type Watcher interface {
-	Resource() string
-	ObjType() runtime.Object
-	AddFunc() func(obj interface{})
-	DeleteFunc() func(obj interface{})
-	UpdateFunc() func(oldObj, newObj interface{})
-}