diff --git a/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs
index 042a3bf3..5b02c05b 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class AirMediaControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs
new file mode 100644
index 00000000..ac84ee31
--- /dev/null
+++ b/PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
+    public class AppleTvJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Sends up arrow command while high
+        /// </summary>
+        public uint UpArrow { get; set; }
+        /// <summary>
+        /// Sends down arrow command while high
+        /// </summary>
+        public uint DnArrow { get; set; }
+        /// <summary>
+        /// Sends left arrow command while high
+        /// </summary>
+        public uint LeftArrow { get; set; }
+        /// <summary>
+        /// Sends right arrow command while high
+        /// </summary>
+        public uint RightArrow { get; set; }
+        /// <summary>
+        /// Sends menu command
+        /// </summary>
+        public uint Menu { get; set; }
+        /// <summary>
+        /// Sends select command
+        /// </summary>
+        public uint Select { get; set; }
+        /// <summary>
+        /// Sends play/pause command
+        /// </summary>
+        public uint PlayPause { get; set; }
+        #endregion
+
+        public AppleTvJoinMap()
+        {
+            UpArrow = 1;
+            DnArrow = 2;
+            LeftArrow = 3;
+            RightArrow = 4;
+            Menu = 5;
+            Select = 6;
+            PlayPause = 7;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            UpArrow = UpArrow + joinOffset;
+            DnArrow = DnArrow + joinOffset;
+            LeftArrow = LeftArrow + joinOffset;
+            RightArrow = RightArrow + joinOffset;
+            Menu = Menu + joinOffset;
+            Select = Select + joinOffset;
+            PlayPause = PlayPause + joinOffset;
+        }
+    }
+}
\ No newline at end of file
diff --git a/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs
new file mode 100644
index 00000000..bbf8268d
--- /dev/null
+++ b/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+using Crestron.SimplSharp.Reflection;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Bridges
+{
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
+    public class C2nRthsControllerJoinMap:JoinMapBase
+    {
+        public uint IsOnline { get; set; }
+        public uint Name { get; set; }
+        public uint Temperature { get; set; }
+        public uint Humidity { get; set; }
+        public uint TemperatureFormat { get; set; }
+
+        public C2nRthsControllerJoinMap()
+        {
+            //digital
+            IsOnline = 1;
+            TemperatureFormat = 2;
+
+            //Analog
+            Temperature = 2;
+            Humidity = 3;
+
+            //serial
+            Name = 1;
+
+            
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+            var properties =
+                GetType().GetCType().GetProperties().Where(p => p.PropertyType == typeof(uint)).ToList();
+
+            foreach (var propertyInfo in properties)
+            {
+                propertyInfo.SetValue(this, (uint)propertyInfo.GetValue(this, null) + joinOffset, null);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs
index 5a37892f..1546ff23 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs
@@ -11,6 +11,8 @@ namespace PepperDash.Essentials.Bridges
     /// <summary>
     /// Join map for CameraBase devices
     /// </summary>
+    /// 
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class CameraControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("TiltUp")]
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs
index 2b0a1c15..3f4c8c43 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DigitalLoggerJoinMap.cs
@@ -8,6 +8,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DigitalLoggerJoinMap : JoinMapBase
     {
         public uint IsOnline { get; set; }
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs
index ddbec182..48671d24 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DisplayControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs
index 8a245ad2..0779523a 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs
@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DmBladeChassisControllerJoinMap : JoinMapBase {
         #region Digital/Analogs
         #endregion
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs
index ff6a42d9..2e1b8394 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DmChassisControllerJoinMap : JoinMapBase
         {
 #region Digital/Analogs
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
index 7aa8081a..7e1534bf 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DmRmcControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs
index 6d5c2775..f84134a1 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs
@@ -1,7 +1,9 @@
-using PepperDash.Essentials.Core;
+using System;
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DmTxControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs
index faa30775..47c7d50d 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DmpsAudioOutputControllerJoinMap : JoinMapBase
     {
         #region Digital/Analog
diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs
index ba3a8cd0..308dddf0 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class DmpsRoutingControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs
index df5606d0..3bc9b19a 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs
@@ -9,6 +9,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class GenericLightingJoinMap : JoinMapBase
     {
         public uint IsOnline { get; set; }
diff --git a/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs
index 5c91a358..56b50724 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class GenericRelayControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs
index a40913ee..800f516c 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class GlsOccupancySensorBaseJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs
index e88980fe..d9fad27e 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class HdMdxxxCEControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs
index 953bae37..c8939ef8 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class IBasicCommunicationJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs
index 65d4ada4..a4c4aaa9 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs
@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class IDigitalInputJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs
index 36e5b2da..20b0d9a9 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs
@@ -9,6 +9,7 @@ using Crestron.SimplSharp.Reflection;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class SetTopBoxControllerJoinMap : JoinMapBase
     {
         #region Digitals
diff --git a/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs
index ad8f1577..3d8916a7 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs
@@ -1,9 +1,11 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Crestron.SimplSharp.Reflection;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class StatusSignControllerJoinMap:JoinMapBase
     {
         public uint IsOnline { get; set; }
diff --git a/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs
index b2b66263..fe59416a 100644
--- a/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs
+++ b/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs
@@ -1,7 +1,9 @@
-using PepperDash.Essentials.Core;
+using System;
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
+    [Obsolete("Please use version PepperDash.Essentials.Core.Bridges")]
     public class SystemMonitorJoinMap : JoinMapBase
     {
         /// <summary>