Revert "Revert "Merge branch 'develop' into remove-deprecated-transport-apis""remove-deprecated-transport-apis

This reverts commit 2e682ca50fdf8c3fe11ab1b9e0dfe5ddc59008b4.

90 files changed, 438 insertions, 994 deletions

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index dcf311dff..721ac4915 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -28,13 +28,13 @@ jobs:
       run: ./android/gradlew -p ./android/hello_sdl_android test
       
     - name: Sdl JavaSE Tests
-      run: ./javaSE/javaSE/gradlew -p ./javaSE/javaSE test
+      run: ./javaSE/gradlew -p ./javaSE/javaSE test
       
     - name: Hello Sdl JavaSE Tests
-      run: ./javaSE/hello_sdl_java/gradlew -p ./javaSE/hello_sdl_java test
+      run: ./javaSE/gradlew -p ./javaSE/hello_sdl_java test
     
     - name: Sdl JavaEE Tests
-      run: ./javaEE/javaEE/gradlew -p ./javaEE/javaEE test
+      run: ./javaEE/gradlew -p ./javaEE/javaEE test
 
     - name: RPC Generator Tests
       run: |
diff --git a/.gitignore b/.gitignore
index 28594f757..e9408b57d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,6 @@ javaSE/javaSE/local.properties
 javaEE/javaEE/out/
 javaEE/javaEE/build/
 javaEE/javaEE/local.properties
-baseAndroid/windows/
-
 
 ##############################
 # OS generated files 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
index c5837c2cb..1d5d12059 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
@@ -12,6 +12,8 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import com.smartdevicelink.SdlConnection.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

 import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

+import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;

+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;

 import com.smartdevicelink.protocol.enums.SessionType;

 import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;

 import com.smartdevicelink.proxy.interfaces.ISdl;

@@ -39,7 +41,9 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

 

 import static org.mockito.ArgumentMatchers.any;

+import static org.mockito.ArgumentMatchers.anyBoolean;

 import static org.mockito.ArgumentMatchers.eq;

+import static org.mockito.ArgumentMatchers.isNull;

 import static org.mockito.Mockito.doAnswer;

 import static org.mockito.Mockito.doReturn;

 import static org.mockito.Mockito.mock;

@@ -65,9 +69,11 @@ public class AudioStreamManagerTest extends TestCase {
 

     public void testCreatingAudioStreamManager() {

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());

 

         new AudioStreamManager(internalInterface, mContext);

     }

@@ -101,9 +107,11 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -289,8 +297,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -517,8 +527,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -594,8 +606,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index 8908346d2..34cc6bf2a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
@@ -248,7 +248,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final List<String> fileNames = new ArrayList<>();
 		fileNames.add("Julian");
@@ -280,7 +280,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestFail).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListDeleteRequestFail).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final List<String> fileNames = new ArrayList<>();
 		fileNames.add("Julian");
@@ -403,7 +403,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -434,7 +434,7 @@ public class FileManagerTests {
 
 			}
 		});
-		verify(internalInterface, times(5)).sendRequests(any(List.class),any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(5)).sendRPCs(any(List.class),any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -552,7 +552,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -573,7 +573,7 @@ public class FileManagerTests {
 				});
 			}
 		});
-		verify(internalInterface, times(0)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(0)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -584,7 +584,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -606,7 +606,7 @@ public class FileManagerTests {
 				});
 			}
 		});
-		verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -702,7 +702,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 
@@ -739,7 +739,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -788,7 +788,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -908,7 +908,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -944,7 +944,7 @@ public class FileManagerTests {
 
 			}
 		});
-		verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
index 109bf6316..a14e98383 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
@@ -960,17 +960,9 @@ public class SystemCapabilityManagerTests {
 		public void startVideoService(VideoStreamingParameters parameters, boolean encrypted) {	}
 
 		@Override
-		public void sendRPCRequest(RPCRequest message) {}
-
-		@Override
 		public void sendRPC(RPCMessage message) {}
 
 		@Override
-		public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
-
-		}
-
-		@Override
 		public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
 
 		}
@@ -1021,12 +1013,6 @@ public class SystemCapabilityManagerTests {
 			return false;
 		}
 
-		@Override
-		public Object getCapability(SystemCapabilityType systemCapabilityType){return null;}
-
-		@Override
-		public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
-		}
 
 		@Override
 		public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
@@ -1034,11 +1020,6 @@ public class SystemCapabilityManagerTests {
 		}
 
 		@Override
-		public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
-			return null;
-		}
-
-		@Override
 		public SdlMsgVersion getSdlMsgVersion() {
 			return null;
 		}
@@ -1048,46 +1029,24 @@ public class SystemCapabilityManagerTests {
 			return new Version(1,0,0);
 		}
 
-
-		@Override
-		public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType){
-			return false;
-		}
-
-		@Override
-		public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { }
-
-		@Override
-		public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { return false; }
-
 		@Override
 		public boolean isTransportForServiceAvailable(SessionType serviceType) {
 			return false;
 		}
 
 		@Override
-		public void startAudioService(boolean isEncrypted, AudioStreamingCodec codec,
-									  AudioStreamingParams params) {}
+		public void startAudioService(boolean encrypted){}
 
 		@Override
-		public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters){
-			return null;
-		}
+		public void startRPCEncryption() {}
 
 		@Override
-		public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec,
-													 AudioStreamingParams params) {
+		public Taskmaster getTaskmaster() {
 			return null;
 		}
 
 		@Override
-		public void startAudioService(boolean encrypted){}
-
-		@Override
-		public void startRPCEncryption() {}
-
-		@Override
-		public Taskmaster getTaskmaster() {
+		public SystemCapabilityManager getSystemCapabilityManager() {
 			return null;
 		}
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
index e5daf375b..b43be2af6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
@@ -3,12 +3,12 @@ package com.smartdevicelink.managers.screen;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.managers.CompletionListener;
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.MultipleFileCompletionListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -51,6 +51,7 @@ import static org.junit.Assert.assertNotEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -89,7 +90,7 @@ public class SoftButtonManagerTests {
         doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
 
 
-        // When internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
+        // When internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
         // inside SoftButtonManager, respond with a fake response to let the SoftButtonManager continue working.
         Answer<Void> onSystemCapabilityAnswer = new Answer<Void>() {
             @Override
@@ -108,8 +109,9 @@ public class SoftButtonManagerTests {
                 return null;
             }
         };
-        doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
-
+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+        doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
 
         // When fileManager.uploadArtworks() is called inside the SoftButtonManager, respond with
         // a fake onComplete() callback to let the SoftButtonManager continue working.
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index 2bb0164fb..e5deb7f30 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
@@ -11,6 +11,7 @@ import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -43,6 +44,7 @@ import static junit.framework.TestCase.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -102,7 +104,9 @@ public class TextAndGraphicManagerTests {
 				return null;
 			}
 		};
-		doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
 
 		textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager, softButtonManager);
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
index a393bf34f..2a09311e9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
@@ -2,20 +2,21 @@ package com.smartdevicelink.managers.video;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
-import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.OnTouchEvent;
@@ -39,13 +40,13 @@ import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
@@ -54,11 +55,11 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 /**
  * This is a unit test class for the SmartDeviceLink video streaming manager class :
@@ -139,6 +140,9 @@ public class VideoStreamManagerTests {
 	public void testHMILevelNotFull(){
 		final ISdl internalInterface = mock(ISdl.class);
 
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+
 		when(internalInterface.getProtocolVersion()).thenReturn((new Version(5,0,0)));
 
 		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
@@ -147,7 +151,7 @@ public class VideoStreamManagerTests {
 		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
 		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
 
-		when(internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
 
 		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 		videoStreamManager.start(new CompletionListener() {
@@ -174,7 +178,10 @@ public class VideoStreamManagerTests {
 		final Set<Object> listenerSet = new HashSet<>();
 
 		when(internalInterface.getProtocolVersion()).thenReturn(new Version(5,0,0));
-		when(internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
 
 		Answer<Void> onGetCapability = new Answer<Void>() {
 			@Override
@@ -186,7 +193,7 @@ public class VideoStreamManagerTests {
 			}
 		};
 
-		doAnswer(onGetCapability).when(internalInterface).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class));
+		doAnswer(onGetCapability).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean());
 
 		Answer<Void> onAddServiceListener = new Answer<Void>() {
 			@Override
@@ -247,14 +254,7 @@ public class VideoStreamManagerTests {
 
 		doAnswer(onRemoveServiceListener).when(internalInterface).removeServiceListener(eq(SessionType.NAV), any(ISdlServiceListener.class));
 
-		when(internalInterface.startVideoStream(anyBoolean(), any(VideoStreamingParameters.class))).thenReturn(new IVideoStreamListener() {
-			@Override
-			public void sendFrame(byte[] data, int offset, int length, long presentationTimeUs) throws ArrayIndexOutOfBoundsException {}
-			@Override
-			public void sendFrame(ByteBuffer data, long presentationTimeUs) {}
-		});
-
-		when(internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
+		when(systemCapabilityManager.getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean())).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
 
 		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 		videoStreamManager.start(new CompletionListener() {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index d9017bd69..c57743a2f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -34,6 +34,8 @@ package com.smartdevicelink.SdlConnection;
 
 import android.content.Context;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.protocol.SdlPacket;
 import com.smartdevicelink.protocol.SdlProtocol;
@@ -50,6 +52,7 @@ import com.smartdevicelink.util.Version;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlSession extends BaseSdlSession {
     private static final String TAG = "SdlSession";
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
index f7cc7b7a5..52b4db580 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
@@ -40,6 +40,7 @@ import android.os.Handler;
 import android.os.Looper;

 import androidx.annotation.IntDef;

 import androidx.annotation.NonNull;

+import androidx.annotation.RestrictTo;

 

 import com.smartdevicelink.SdlConnection.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

@@ -185,6 +186,7 @@ public class AudioStreamManager extends BaseAudioStreamManager {
      * Creates a new object of AudioStreamManager

      * @param internalInterface The internal interface to the connected device.

      */

+    @RestrictTo(RestrictTo.Scope.LIBRARY)

     public AudioStreamManager(@NonNull ISdl internalInterface, @NonNull Context context) {

         super(internalInterface);

         this.queue = new LinkedList<>();

@@ -218,25 +220,28 @@ public class AudioStreamManager extends BaseAudioStreamManager {
     }

 

     private void getAudioStreamingCapabilities(){

-        internalInterface.getCapability(SystemCapabilityType.PCM_STREAMING, new OnSystemCapabilityListener() {

-            @Override

-            public void onCapabilityRetrieved(Object capability) {

-                if(capability != null && capability instanceof AudioPassThruCapabilities){

-                    audioStreamingCapabilities = (AudioPassThruCapabilities) capability;

-                    checkState();

+        if (internalInterface.getSystemCapabilityManager() != null) {

+            internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.PCM_STREAMING, new OnSystemCapabilityListener() {

+                @Override

+                public void onCapabilityRetrieved(Object capability) {

+                    if (capability != null && capability instanceof AudioPassThruCapabilities) {

+                        audioStreamingCapabilities = (AudioPassThruCapabilities) capability;

+                        checkState();

+                    }

                 }

-            }

 

-            @Override

-            public void onError(String info) {

-                DebugTool.logError(TAG, "Error retrieving audio streaming capability: " + info);

-                streamingStateMachine.transitionToState(StreamingStateMachine.ERROR);

-                transitionToState(ERROR);

-            }

-        });

+                @Override

+                public void onError(String info) {

+                    DebugTool.logError(TAG, "Error retrieving audio streaming capability: " + info);

+                    streamingStateMachine.transitionToState(StreamingStateMachine.ERROR);

+                    transitionToState(ERROR);

+                }

+            }, false);

+        }

     }

 

     @Override

+    @RestrictTo(RestrictTo.Scope.LIBRARY)

     public void dispose() {

         stopAudioStream(new CompletionListener() {

             @Override

@@ -268,7 +273,10 @@ public class AudioStreamManager extends BaseAudioStreamManager {
             return;

         }

 

-        AudioPassThruCapabilities capabilities = (AudioPassThruCapabilities) internalInterface.getCapability(SystemCapabilityType.PCM_STREAMING);

+        AudioPassThruCapabilities capabilities = null;

+        if (internalInterface.getSystemCapabilityManager() != null) {

+            capabilities = (AudioPassThruCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.PCM_STREAMING, null, false);

+        }

 

         if (capabilities != null) {

             switch (capabilities.getSamplingRate()) {

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
index f03c24084..0efc3b6ff 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
@@ -36,6 +36,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.net.Uri;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.file.filetypes.SdlFile;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -71,6 +72,7 @@ public class FileManager extends BaseFileManager {
 	 * @param context an instances of Context interface to global information for application
 	 * @param fileManagerConfig an instance of the FileManagerConfig gives access to artworkRetryCount and fileRetryCount to let us if those file types can be re-upload if they fail
 	 */
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public FileManager(ISdl internalInterface, Context context, FileManagerConfig fileManagerConfig) {
 		// setup
 		super(internalInterface, fileManagerConfig);
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
index 48ab19960..06f992875 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
@@ -38,6 +38,8 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
@@ -64,6 +66,7 @@ import java.lang.ref.WeakReference;
  * The LockscreenManager handles the logic of showing and hiding the lock screen. <br>
  *
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class LockScreenManager extends BaseSubManager {
 
 	private static final String TAG = "LockScreenManager";
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
index e3a85bb1b..7430c3143 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.permission;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
@@ -51,6 +52,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
      *
      * @param internalInterface
      */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
     public PermissionManager(@NonNull ISdl internalInterface) {
         super(internalInterface);
     }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
index 5065294a9..31c6da0b1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -44,6 +45,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
 */
 public class ScreenManager extends BaseScreenManager {
 
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
 		super(internalInterface, fileManager);
 	}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
index b7a2e2958..5499d3a5a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -42,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * SoftButtonManager gives the developer the ability to control how soft buttons are displayed on the head unit.<br>
  * Note: This class must be accessed through the SdlManager->ScreenManager. Do not instantiate it by itself.<br>
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class SoftButtonManager extends BaseSoftButtonManager {
 
     /**
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
index b5dafa5fd..9f08bef36 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
@@ -1,6 +1,8 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
 /**
@@ -9,6 +11,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
  *
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class SubscribeButtonManager extends BaseSubscribeButtonManager {
 
     SubscribeButtonManager(@NonNull ISdl internalInterface) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
index 3d05bc7cd..fe216ea5f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.R;
 import com.smartdevicelink.managers.file.FileManager;
@@ -46,6 +47,7 @@ import com.smartdevicelink.proxy.rpc.enums.FileType;
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
  *
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class TextAndGraphicManager extends BaseTextAndGraphicManager {
 
 	TextAndGraphicManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, @NonNull SoftButtonManager softButtonManager) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
index 32ff8c0eb..f0895fe22 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen.choiceset;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -42,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * ChoiceSetManager gives the developer the ability to control how soft choice sets are displayed on the head unit.<br>
  * Note: This class must be accessed through the SdlManager->ScreenManager. Do not instantiate it by itself.<br>
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class ChoiceSetManager extends BaseChoiceSetManager {
 
     /**
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
index 4a28a2792..d29312cdf 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
@@ -32,6 +32,8 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
@@ -42,6 +44,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  *
  * The MenuManager takes MenuCell objects and creates and sends all necessary RPCs to build out a menu
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class MenuManager extends BaseMenuManager {
 
 	public MenuManager(ISdl internalInterface, FileManager fileManager) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
index a892d3a2c..afde7404d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
@@ -32,6 +32,8 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
 /**
@@ -41,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  *
  * The VoiceCommandManager takes a List of VoiceCommand objects and sets them on the Head unit for you.
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class VoiceCommandManager extends BaseVoiceCommandManager {
 
 	public VoiceCommandManager(ISdl internalInterface) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
index f1b9fd4f3..78b6bb03b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
@@ -65,7 +65,7 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager {
             ISdl proxy = proxyHolder.get();
             SendHapticData msg = new SendHapticData();
             msg.setHapticRectData(userHapticData);
-            proxy.sendRPCRequest(msg);
+            proxy.sendRPC(msg);
         }
     }
 
@@ -99,8 +99,10 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager {
 
         if (proxyHolder.get() != null) {
             ISdl proxy = proxyHolder.get();
-            VideoStreamingCapability videoStreamingCapability = (VideoStreamingCapability)
-                    proxy.getCapability(SystemCapabilityType.VIDEO_STREAMING);
+            VideoStreamingCapability videoStreamingCapability = null;
+            if (proxy.getSystemCapabilityManager() != null) {
+                videoStreamingCapability = (VideoStreamingCapability) proxy.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+            }
             if (videoStreamingCapability != null && videoStreamingCapability.getScale() != null) {
                 scale = videoStreamingCapability.getScale();
             }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
index a55cecb4d..77467f429 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
@@ -40,6 +40,8 @@ import android.view.Display;
 import android.view.InputDevice;
 import android.view.MotionEvent;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.SdlConnection.SdlSession;
 import com.smartdevicelink.encoder.VirtualDisplayEncoder;
 import com.smartdevicelink.managers.BaseSubManager;
@@ -121,7 +123,10 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 					stateMachine.transitionToState(StreamingStateMachine.ERROR);
 					return;
 				}
-				VideoStreamingCapability capability = (VideoStreamingCapability) internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING);
+				VideoStreamingCapability capability = null;
+				if (internalInterface.getSystemCapabilityManager() != null) {
+					capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+				}
 				if(capability != null && Boolean.TRUE.equals(capability.getIsHapticSpatialDataSupported())){
 					hapticManager = new HapticInterfaceManager(internalInterface);
 				}
@@ -188,6 +193,7 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 	};
 
 	// MANAGER APIs
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public VideoStreamManager(ISdl internalInterface){
 		super(internalInterface);
 
@@ -232,28 +238,33 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 
 	private void getVideoStreamingParams(){
 		if(internalInterface.getProtocolVersion().getMajor() >= 5) {
-			internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
-				@Override
-				public void onCapabilityRetrieved(Object capability) {
-					VideoStreamingParameters params = new VideoStreamingParameters();
-					params.update((VideoStreamingCapability)capability, vehicleMake);	//Streaming parameters are ready time to stream
-					VideoStreamManager.this.parameters = params;
+			if (internalInterface.getSystemCapabilityManager() != null) {
+				internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
+					@Override
+					public void onCapabilityRetrieved(Object capability) {
+						VideoStreamingParameters params = new VideoStreamingParameters();
+						params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
+						VideoStreamManager.this.parameters = params;
 
-					checkState();
+						checkState();
 
-				}
+					}
 
-				@Override
-				public void onError(String info) {
-					DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
-					stateMachine.transitionToState(StreamingStateMachine.ERROR);
-					transitionToState(ERROR);
-				}
-			});
+					@Override
+					public void onError(String info) {
+						DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
+						stateMachine.transitionToState(StreamingStateMachine.ERROR);
+						transitionToState(ERROR);
+					}
+				}, false);
+			}
 		}else{
 			//We just use default video streaming params
 			VideoStreamingParameters params = new VideoStreamingParameters();
-			DisplayCapabilities dispCap = (DisplayCapabilities)internalInterface.getCapability(SystemCapabilityType.DISPLAY);
+			DisplayCapabilities dispCap = null;
+			if (internalInterface.getSystemCapabilityManager() != null) {
+				dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+			}
 			if(dispCap !=null){
 				params.setResolution(dispCap.getScreenParams().getImageResolution());
 			}
@@ -277,31 +288,37 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 		this.context = new WeakReference<>(context);
 		this.remoteDisplayClass = remoteDisplayClass;
 		int majorProtocolVersion = internalInterface.getProtocolVersion().getMajor();
-		if(majorProtocolVersion >= 5 && !internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)){
+		boolean isCapabilitySupported = internalInterface.getSystemCapabilityManager() != null && internalInterface.getSystemCapabilityManager().isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING);
+		if(majorProtocolVersion >= 5 && !isCapabilitySupported){
 			DebugTool.logError(TAG, "Video streaming not supported on this module");
 			stateMachine.transitionToState(StreamingStateMachine.ERROR);
 			return;
 		}
 		if(parameters == null){
 			if(majorProtocolVersion >= 5) {
-				internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
-					@Override
-					public void onCapabilityRetrieved(Object capability) {
-						VideoStreamingParameters params = new VideoStreamingParameters();
-						params.update((VideoStreamingCapability)capability, vehicleMake);	//Streaming parameters are ready time to stream
-						startStreaming(params, encrypted);
-					}
+				if (internalInterface.getSystemCapabilityManager() != null) {
+					internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
+						@Override
+						public void onCapabilityRetrieved(Object capability) {
+							VideoStreamingParameters params = new VideoStreamingParameters();
+							params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
+							startStreaming(params, encrypted);
+						}
 
-					@Override
-					public void onError(String info) {
-						stateMachine.transitionToState(StreamingStateMachine.ERROR);
-						DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
-					}
-				});
+						@Override
+						public void onError(String info) {
+							stateMachine.transitionToState(StreamingStateMachine.ERROR);
+							DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
+						}
+					}, false);
+				}
 			}else{
 				//We just use default video streaming params
 				VideoStreamingParameters params = new VideoStreamingParameters();
-				DisplayCapabilities dispCap = (DisplayCapabilities)internalInterface.getCapability(SystemCapabilityType.DISPLAY);
+				DisplayCapabilities dispCap = null;
+				if (internalInterface.getSystemCapabilityManager() != null) {
+					dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+				}
 				if(dispCap !=null){
 					params.setResolution(dispCap.getScreenParams().getImageResolution());
 				}
@@ -378,6 +395,7 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 	 * Stops streaming, ends video streaming service and removes service listeners.
 	 */
 	@Override
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public void dispose(){
 		stopStreaming();
 
@@ -465,14 +483,20 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 					//Get touch scalars
 					ImageResolution resolution = null;
 					if(internalInterface.getProtocolVersion().getMajor() >= 5){ //At this point we should already have the capability
-						VideoStreamingCapability capability = (VideoStreamingCapability) internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING);
+						VideoStreamingCapability capability = null;
+						if (internalInterface.getSystemCapabilityManager() != null) {
+							capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+						}
 						if(capability != null){
 							resolution = capability.getPreferredResolution();
 						}
 					}
 
 					if(resolution == null){ //Either the protocol version is too low to access video streaming caps, or they were null
-						DisplayCapabilities dispCap = (DisplayCapabilities) internalInterface.getCapability(SystemCapabilityType.DISPLAY);
+						DisplayCapabilities dispCap = null;
+						if (internalInterface.getSystemCapabilityManager() != null) {
+							dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+						}
 						if (dispCap != null) {
 							resolution = (dispCap.getScreenParams().getImageResolution());
 						}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
index 21a34c695..723af1939 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
@@ -3,9 +3,12 @@ package com.smartdevicelink.protocol;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.transport.utl.TransportRecord;
 import com.smartdevicelink.util.DebugTool;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlPacket extends BaseSdlPacket implements Parcelable {
     private static final String TAG = "SdlPacket";
     private static final int EXTRA_PARCEL_DATA_LENGTH 			= 24;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
index 9825900e9..fd6ac275f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.protocol;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
@@ -45,6 +46,7 @@ import java.util.Collections;
 
 
 @SuppressWarnings("WeakerAccess")
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlProtocol extends SdlProtocolBase {
     private static final String TAG ="SdlProtocol";
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
index ce314595d..dd65cc3a4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
@@ -1,41 +1,43 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.protocol.heartbeat;

 

 

 import android.os.Handler;

 import android.os.Looper;

 

+import androidx.annotation.RestrictTo;

 

+@RestrictTo(RestrictTo.Scope.LIBRARY)

 public class HeartbeatMonitor implements IHeartbeatMonitor {

 

 	public static final int HEARTBEAT_INTERVAL = 5000;

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
index 2c98413d7..6ad5fb001 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
@@ -1,37 +1,39 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.protocol.heartbeat;

 

+import androidx.annotation.RestrictTo;

 

+@RestrictTo(RestrictTo.Scope.LIBRARY)

 public interface IHeartbeatMonitor {

     /**

      * Starts the monitor. If the monitor is already started, nothing happens.

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
index da814f3ee..26f3535b2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
@@ -29,24 +29,28 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.smartdevicelink.protocol.heartbeat;

-

-/**

- * Listener (aka delegate) that actually knows how to work with the outside

- * world.

- */

-public interface IHeartbeatMonitorListener {

-    /**

-     * The listener should create and send a heartbeat message.

-     *

-     * @param monitor the caller

-     */

-    public void sendHeartbeat(IHeartbeatMonitor monitor);

-

-    /**

-     * Notifies the listener that the heartbeat timed out.

-     *

-     * @param monitor the caller

-     */

-    public void heartbeatTimedOut(IHeartbeatMonitor monitor);

-}

+package com.smartdevicelink.protocol.heartbeat;
+
+import androidx.annotation.RestrictTo;
+
+/**
+ * Listener (aka delegate) that actually knows how to work with the outside
+ * world.
+ */
+
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+public interface IHeartbeatMonitorListener {
+    /**
+     * The listener should create and send a heartbeat message.
+     *
+     * @param monitor the caller
+     */
+    public void sendHeartbeat(IHeartbeatMonitor monitor);
+
+    /**
+     * Notifies the listener that the heartbeat timed out.
+     *
+     * @param monitor the caller
+     */
+    public void heartbeatTimedOut(IHeartbeatMonitor monitor);
+}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index 1a1ee4156..24608ecfe 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -31,6 +31,8 @@
  */

 package com.smartdevicelink.streaming;

 

+import androidx.annotation.RestrictTo;

+

 import com.smartdevicelink.SdlConnection.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

 import com.smartdevicelink.protocol.ProtocolMessage;

@@ -45,6 +47,7 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.BlockingQueue;

 import java.util.concurrent.LinkedBlockingQueue;

 

+@RestrictTo(RestrictTo.Scope.LIBRARY)

 public class StreamPacketizer extends AbstractPacketizer implements IVideoStreamListener, IAudioStreamListener, Runnable{

 

 	public final static String TAG = "StreamPacketizer";

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index 7d7a3d676..bad3ccc2e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
@@ -51,6 +51,8 @@ import android.os.Looper;
 import android.os.Parcelable;
 import android.util.AndroidRuntimeException;
 
+import androidx.annotation.CallSuper;
+
 import com.smartdevicelink.R;
 import com.smartdevicelink.transport.RouterServiceValidator.TrustedListCallback;
 import com.smartdevicelink.transport.enums.TransportType;
@@ -96,6 +98,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{
 	}
 	
 	@Override
+	@CallSuper
 	public void onReceive(Context context, Intent intent) {
 		//Log.i(TAG, "Sdl Receiver Activated");
 		final String action = intent.getAction();
diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java b/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java
index 09e959b90..135c0cc9e 100644
--- a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java
+++ b/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java
@@ -32,6 +32,8 @@
 
 package com.smartdevicelink.SdlConnection;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.managers.lifecycle.RpcConverter;
 import com.smartdevicelink.protocol.ISdlProtocol;
@@ -56,6 +58,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializedListener {
 
     private static final String TAG = "SdlSession";
diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java
index 74aebda5a..f5f875467 100644
--- a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java
@@ -31,7 +31,9 @@
  */
 package com.smartdevicelink.managers;
 
+import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.transport.utl.TransportRecord;
@@ -47,6 +49,7 @@ import java.util.List;
  *
  * 1. <br>
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public abstract class BaseSubManager {
 
 	// states - if this gets more complicated we can move elsewhere
@@ -65,6 +68,7 @@ public abstract class BaseSubManager {
 	 * Starts up a BaseSubManager, and calls provided callback once BaseSubManager is done setting up or failed setup.
 	 * @param listener CompletionListener that is called once the BaseSubManager's state is READY, LIMITED, or ERROR
 	 */
+	@CallSuper
 	public void start(CompletionListener listener){
 		this.completionListener = listener;
 		int state = getState();
@@ -77,6 +81,7 @@ public abstract class BaseSubManager {
 	/**
 	 * <p>Called when manager is being torn down</p>
 	 */
+	@CallSuper
 	public void dispose(){
 		transitionToState(SHUTDOWN);
 	}
diff --git a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
index 87cb05eb4..e1a5414a1 100644
--- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
@@ -34,6 +34,7 @@ package com.smartdevicelink.managers.file;
 
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
@@ -101,6 +102,7 @@ abstract class BaseFileManager extends BaseSubManager {
 	}
 
 	@Override
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public void start(CompletionListener listener) {
 		// prepare manager - don't set state to ready until we have list of files
 		retrieveRemoteFiles();
@@ -299,7 +301,7 @@ abstract class BaseFileManager extends BaseSubManager {
 				}
 			}
 		};
-		internalInterface.sendRequests(requests, onMultipleRequestListener);
+		internalInterface.sendRPCs(requests, onMultipleRequestListener);
 	}
 
 	/**
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index d780ef244..c8566dbad 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -50,10 +50,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCNotification;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
-import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 import com.smartdevicelink.proxy.rpc.GenericResponse;
 import com.smartdevicelink.proxy.rpc.OnAppInterfaceUnregistered;
 import com.smartdevicelink.proxy.rpc.OnButtonEvent;
@@ -78,15 +76,12 @@ import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 import com.smartdevicelink.proxy.rpc.enums.Result;
 import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
-import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCRequestListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;
 import com.smartdevicelink.security.SdlSecurityBase;
-import com.smartdevicelink.streaming.audio.AudioStreamingCodec;
-import com.smartdevicelink.streaming.audio.AudioStreamingParams;
 import com.smartdevicelink.streaming.video.VideoStreamingParameters;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.util.CorrelationIdGenerator;
@@ -947,33 +942,11 @@ abstract class BaseLifecycleManager {
         }
 
         @Override
-        public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters) {
-            DebugTool.logWarning(TAG, "startVideoStream is not currently implemented");
-            return null;
-        }
-
-        @Override
-        public void startAudioService(boolean encrypted, AudioStreamingCodec codec, AudioStreamingParams params) {
-            DebugTool.logWarning(TAG, "startAudioService is not currently implemented");
-        }
-
-        @Override
         public void startAudioService(boolean encrypted) {
             BaseLifecycleManager.this.startAudioService(encrypted);
         }
 
         @Override
-        public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec, AudioStreamingParams params) {
-            DebugTool.logWarning(TAG, "startAudioStream is not currently implemented");
-            return null;
-        }
-
-        @Override
-        public void sendRPCRequest(RPCRequest message) {
-            BaseLifecycleManager.this.sendRPCMessagePrivate(message, false);
-        }
-
-        @Override
         public void sendRPC(RPCMessage message) {
             if (isConnected()) {
                 BaseLifecycleManager.this.sendRPCMessagePrivate(message, false);
@@ -981,11 +954,6 @@ abstract class BaseLifecycleManager {
         }
 
         @Override
-        public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
-            BaseLifecycleManager.this.sendRPCs(rpcs, listener);
-        }
-
-        @Override
         public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
             BaseLifecycleManager.this.sendRPCs(rpcs, listener);
         }
@@ -1026,61 +994,11 @@ abstract class BaseLifecycleManager {
         }
 
         @Override
-        public Object getCapability(SystemCapabilityType systemCapabilityType) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, null, false);
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener, false);
-            }
-        }
-
-        @Override
-        public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener, forceUpdate);
-            } else {
-                return null;
-            }
-        }
-
-        @Override
         public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
             return raiResponse;
         }
 
         @Override
-        public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.isCapabilitySupported(systemCapabilityType);
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                BaseLifecycleManager.this.systemCapabilityManager.addOnSystemCapabilityListener(systemCapabilityType, listener);
-            }
-        }
-
-        @Override
-        public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.removeOnSystemCapabilityListener(systemCapabilityType, listener);
-            } else {
-                return false;
-            }
-        }
-
-        @Override
         public boolean isTransportForServiceAvailable(SessionType serviceType) {
             return BaseLifecycleManager.this.session.isTransportForServiceAvailable(serviceType);
         }
@@ -1106,6 +1024,11 @@ abstract class BaseLifecycleManager {
         public Taskmaster getTaskmaster() {
             return BaseLifecycleManager.this.getTaskmaster();
         }
+
+        @Override
+        public SystemCapabilityManager getSystemCapabilityManager() {
+            return BaseLifecycleManager.this.systemCapabilityManager;
+        }
     };
 
     /* *******************************************************************************************************
diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java
index 669a34a7a..276683ef9 100644
--- a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java
@@ -33,6 +33,7 @@ package com.smartdevicelink.managers.permission;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
@@ -146,6 +147,7 @@ abstract class BasePermissionManager extends BaseSubManager{
     }
 
     @Override
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
     public void start(CompletionListener listener) {
         checkState();
         super.start(listener);
@@ -289,6 +291,7 @@ abstract class BasePermissionManager extends BaseSubManager{
      * Clean up everything after the manager is no longer needed
      */
     @Override
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
     public void dispose(){
         super.dispose();
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
index 6d05b93eb..e13855d1c 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
@@ -33,6 +33,7 @@ package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
@@ -113,6 +114,7 @@ abstract class BaseScreenManager extends BaseSubManager {
 	}
 
 	@Override
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public void start(CompletionListener listener) {
 		super.start(listener);
 		this.softButtonManager.start(subManagerListener);
@@ -138,6 +140,7 @@ abstract class BaseScreenManager extends BaseSubManager {
 	 * <p>Called when manager is being torn down</p>
 	 */
 	@Override
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public void dispose() {
 		softButtonManager.dispose();
 		textAndGraphicManager.dispose();
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java
index 81df9f9f7..6694e0de3 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java
@@ -161,7 +161,9 @@ abstract class BaseSoftButtonManager extends BaseSubManager {
                 updateTransactionQueueSuspended();
             }
         };
-        this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
 
         // Add OnButtonPressListener to notify SoftButtonObjects when there is a button press
         this.onButtonPressListener = new OnRPCNotificationListener() {
@@ -232,7 +234,9 @@ abstract class BaseSoftButtonManager extends BaseSubManager {
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, onHMIStatusListener);
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_BUTTON_PRESS, onButtonPressListener);
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_BUTTON_EVENT, onButtonEventListener);
-        internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
     }
 
     private Queue newTransactionQueue() {
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
index 9c756e758..4bdfcb441 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
@@ -140,7 +140,9 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager {
 
 		// remove listeners
 		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-		internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 
 		super.dispose();
 	}
@@ -502,6 +504,8 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager {
 				updateTransactionQueueSuspended();
 			}
 		};
-		this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 	}
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
index 0abb94e0a..0e91747a8 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -149,7 +149,9 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
 
         // remove listeners
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-        internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
 
         super.dispose();
     }
@@ -537,8 +539,10 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
                 defaultMainWindowCapability = null;
             }
         };
-        this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
-
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
+        
         // HMI UPDATES
         hmiListener = new OnRPCNotificationListener() {
             @Override
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java
index 8672b1b83..290a1f05f 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java
@@ -74,7 +74,7 @@ class DeleteChoicesOperation extends Task {
 		if (deleteChoices.size() > 0) {
 
 			if (internalInterface.get() != null) {
-				internalInterface.get().sendRequests(deleteChoices, new OnMultipleRequestListener() {
+				internalInterface.get().sendRPCs(deleteChoices, new OnMultipleRequestListener() {
 					@Override
 					public void onUpdate(int remainingRequests) {
 					}
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
index d8a921b8a..21bf2d712 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
@@ -154,7 +154,7 @@ class PreloadChoicesOperation extends Task {
 		}
 
 		if (internalInterface.get() != null){
-			internalInterface.get().sendRequests(choiceRPCs, new OnMultipleRequestListener() {
+			internalInterface.get().sendRPCs(choiceRPCs, new OnMultipleRequestListener() {
 				@Override
 				public void onUpdate(int remainingRequests) {
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
index c4c18ee16..053f90c8c 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
@@ -151,7 +151,9 @@ abstract class BaseMenuManager extends BaseSubManager {
 		// remove listeners
 		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
 		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_COMMAND, commandListener);
-		internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 
 		super.dispose();
 	}
@@ -1020,7 +1022,9 @@ abstract class BaseMenuManager extends BaseSubManager {
 				defaultMainWindowCapability = null;
 			}
 		};
-		this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 
 		// HMI UPDATES
 		hmiListener = new OnRPCNotificationListener() {
@@ -1299,7 +1303,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 			return;
 		}
 
-		internalInterface.sendRequests(deleteCommands, new OnMultipleRequestListener() {
+		internalInterface.sendRPCs(deleteCommands, new OnMultipleRequestListener() {
 			@Override
 			public void onUpdate(int remainingRequests) {
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
index f96452bb2..b6ec94930 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
@@ -190,7 +190,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 
 		List<DeleteCommand> deleteVoiceCommands = deleteCommandsForVoiceCommands(oldVoiceCommands);
 		oldVoiceCommands.clear();
-		internalInterface.sendRequests(deleteVoiceCommands, new OnMultipleRequestListener() {
+		internalInterface.sendRPCs(deleteVoiceCommands, new OnMultipleRequestListener() {
 			@Override
 			public void onUpdate(int remainingRequests) {
 
@@ -223,7 +223,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 
 		inProgressUpdate = addCommandsForVoiceCommands(voiceCommands);
 
-		internalInterface.sendRequests(inProgressUpdate, new OnMultipleRequestListener() {
+		internalInterface.sendRPCs(inProgressUpdate, new OnMultipleRequestListener() {
 			@Override
 			public void onUpdate(int remainingRequests) {
 
diff --git a/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java b/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
index 8f74fbdaa..0f13e6fd9 100644
--- a/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
+++ b/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
@@ -31,6 +31,8 @@
  */

 package com.smartdevicelink.marshal;

 

+import androidx.annotation.RestrictTo;

+

 import com.smartdevicelink.proxy.RPCMessage;

 import com.smartdevicelink.proxy.RPCStruct;

 import com.smartdevicelink.trace.SdlTrace;

@@ -50,7 +52,7 @@ import java.util.List;
  * Responsible for marshalling and unmarshing between RPC Objects and byte streams that are sent

  * over transmission

  */

-

+@RestrictTo(RestrictTo.Scope.LIBRARY)

 public class JsonRPCMarshaller {

 	private static final String TAG = "JsonRPCMarshaller";

 	private static final String SDL_LIB_PRIVATE_KEY = "42baba60-eb57-11df-98cf-0800200c9a66";

diff --git a/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java b/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
index ebf0353bc..eaabf27d7 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
@@ -32,9 +32,11 @@
 package com.smartdevicelink.protocol;

 

 

+import androidx.annotation.RestrictTo;

+

 import com.smartdevicelink.util.BitConverter;

 import com.smartdevicelink.util.DebugTool;

-

+@RestrictTo(RestrictTo.Scope.LIBRARY)

 public class BinaryFrameHeader {

 	private static final String TAG = "BinaryFrameHeader";

 

diff --git a/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java b/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java
index 23ceafbdb..6f65b55bd 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java
@@ -31,8 +31,11 @@
  */
 package com.smartdevicelink.protocol;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.transport.utl.TransportRecord;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface ISecondaryTransportListener {
 	void onConnectionSuccess(TransportRecord transportRecord);
 	void onConnectionFailure();
diff --git a/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java b/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
index d5e14d940..33967b57f 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
@@ -1,39 +1,42 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.protocol;

 

+import androidx.annotation.RestrictTo;

+

 import com.smartdevicelink.protocol.enums.MessageType;

 import com.smartdevicelink.protocol.enums.SessionType;

 

+@RestrictTo(RestrictTo.Scope.LIBRARY)

 public class ProtocolMessage {

 	private byte version = 1;

 	private SessionType _sessionType = SessionType.RPC;

diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java b/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
index 306d94c2c..33ffad27f 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
@@ -31,11 +31,14 @@
  */
 package com.smartdevicelink.protocol;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.protocol.enums.ControlFrameTags;
 import com.smartdevicelink.protocol.enums.FrameDataControlFrameType;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.util.BitConverter;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlPacketFactory {
 
 	/* 
diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
index 702bb5a2f..2bab789e0 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.protocol;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.exception.SdlExceptionCause;
@@ -64,6 +65,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlProtocolBase {
     private static final String TAG ="SdlProtocol";
     private final static String FailurePropagating_Msg = "Failure propagating ";
diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
index 0c46e3743..d8a70b062 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
 
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCMessage;
@@ -94,58 +95,18 @@ public interface ISdl {
     void startVideoService(VideoStreamingParameters parameters, boolean encrypted);
 
     /**
-     * Starts the video streaming service
-     * @param isEncrypted flag to start this service with encryption or not
-     * @param parameters desired video streaming params for this sevice to be started with
-     */
-    @Deprecated
-    IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters);
-
-    /**
-     * Starts the Audio streaming service
-     * @param encrypted flag to start this service with encryption or not
-     */
-    @Deprecated
-    void startAudioService(boolean encrypted, AudioStreamingCodec codec, AudioStreamingParams params);
-
-    /**
      * Starts the Audio streaming service
      * @param encrypted flag to start this service with encryption or not
      */
     void startAudioService(boolean encrypted);
 
     /**
-     * Start Audio Stream and return IAudioStreamListener
-     * @param isEncrypted whether or not the audio stream should be encrypted
-     * @param codec the codec that should be used for the audio stream
-     * @param params specific options and settings associated with the audio stream
-     * @return IAudioStreamListener, an interface that allows the writing of audio data
-     */
-    @Deprecated
-    IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec, AudioStreamingParams params);
-
-    /**
-     * Pass an RPC message through the proxy to be sent to the connected module
-     * @param message RPCRequest that should be sent to the module
-     */
-    @Deprecated
-    void sendRPCRequest(RPCRequest message);
-
-    /**
      * Pass an RPC message through the proxy to be sent to the connected module
      * @param message RPCMessage that should be sent to the module
      */
     void sendRPC(RPCMessage message);
 
     /**
-     * Pass a list of RPC requests through the proxy to be sent to core
-     * @param rpcs List of RPC requests
-     * @param listener OnMultipleRequestListener that is called between requests and after all are processed
-     */
-    @Deprecated
-    void sendRequests(List<? extends RPCRequest> rpcs, final OnMultipleRequestListener listener);
-
-    /**
      * Pass a list of RPC messages through the proxy to be sent to core
      * @param rpcs List of RPC messages
      * @param listener OnMultipleRequestListener that is called between requests and after all are processed
@@ -208,65 +169,12 @@ public interface ISdl {
     boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener);
 
     /**
-     * Get SystemCapability Object
-     * @param systemCapabilityType a system capability type that should be retrieved
-     * @return the system capability provided if available, null if not
-     * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead.
-     */
-    @Deprecated
-    Object getCapability(SystemCapabilityType systemCapabilityType);
-
-    /**
-     * Get Capability
-     * @param systemCapabilityType a system capability type that should be retrieved
-     * @param scListener listener that will be called when the system capability is retrieved. If already cached, it
-     *                   will be called immediately
-     * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead.
-     */
-    @Deprecated
-    void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener);
-
-    /** Gets the capability object that corresponds to the supplied capability type by returning the currently cached value immediately (or null) as well as calling the listener immediately with the cached value, if available. If not available, the listener will retrieve a new value and return that when the head unit responds.
-     * <strong>If capability is not cached, the method will return null and trigger the supplied listener when the capability becomes available</strong>
-     * @param systemCapabilityType type of capability desired
-     * @param scListener callback to execute upon retrieving capability
-     * @param forceUpdate flag to force getting a new fresh copy of the capability from the head unit even if it is cached
-     * @return desired capability if it is cached in the manager, otherwise returns a null object
-     */
-    @Deprecated
-    Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate);
-
-    /**
      * Get RegisterAppInterfaceResponse
      * @return the RegisterAppInterfaceResponse if available, null if not
      */
     RegisterAppInterfaceResponse getRegisterAppInterfaceResponse();
 
     /**
-     * Check if capability is supported
-     * @param systemCapabilityType a system capability type that should be checked for support
-     * @return Boolean whether or not the supplied capability type is supported on the connected module
-     */
-    @Deprecated
-    boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType);
-
-    /**
-     * Add a listener to be called whenever a new capability is retrieved
-     * @param systemCapabilityType Type of capability desired
-     * @param listener callback to execute upon retrieving capability
-     */
-    @Deprecated
-    void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener);
-
-    /**
-     * Remove an OnSystemCapabilityListener that was previously added
-     * @param systemCapabilityType Type of capability
-     * @param listener the listener that should be removed
-     */
-    @Deprecated
-    boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener);
-
-    /**
      * Check to see if a transport is available to start/use the supplied service.
      * @param serviceType the session that should be checked for transport availability
      * @return true if there is either a supported
@@ -296,4 +204,6 @@ public interface ISdl {
     void startRPCEncryption();
 
     Taskmaster getTaskmaster();
+
+    SystemCapabilityManager getSystemCapabilityManager();
 }
diff --git a/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java b/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
index e759268ec..998888bc5 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
@@ -29,10 +29,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.smartdevicelink.streaming;

-

-import com.smartdevicelink.protocol.ProtocolMessage;

-

-public interface IStreamListener {

-	void sendStreamPacket(ProtocolMessage pm);

+package com.smartdevicelink.streaming;
+
+import androidx.annotation.RestrictTo;
+
+import com.smartdevicelink.protocol.ProtocolMessage;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+public interface IStreamListener {
+	void sendStreamPacket(ProtocolMessage pm);
 }
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
index fe0f7a981..c1e6ec0ce 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
@@ -30,9 +30,13 @@
 
 package com.smartdevicelink.streaming.audio;
 
+import androidx.annotation.RestrictTo;
+
 /**
  * A struct to hold audio format information that are common to codecs.
  */
+
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class AudioStreamingParams {
 	/**
 	 * Sampling rate in Hz, e.g. 44100
diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
index 9236be7a9..549bcfd13 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
@@ -30,6 +30,8 @@
 
 package com.smartdevicelink.streaming.video;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.SdlConnection.SdlSession;
 import com.smartdevicelink.protocol.ProtocolMessage;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -60,6 +62,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  *
  * @author Sho Amano
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class RTPH264Packetizer extends AbstractPacketizer implements IVideoStreamListener, Runnable {
 
 	// Approximate size of data that mOutputQueue can hold in bytes.
diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
index 372e2548c..c9bea1fb9 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
@@ -32,6 +32,8 @@
 
 package com.smartdevicelink.streaming.video;
 
+import androidx.annotation.RestrictTo;
+
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.VideoStreamingCapability;
 import com.smartdevicelink.proxy.rpc.VideoStreamingFormat;
@@ -42,6 +44,7 @@ import com.smartdevicelink.util.DebugTool;
 import java.util.List;
 
 @SuppressWarnings("FieldCanBeLocal")
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class VideoStreamingParameters {
     private static final String TAG = "VideoStreamingParameters";
 	private final VideoStreamingProtocol DEFAULT_PROTOCOL = VideoStreamingProtocol.RAW;
diff --git a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.jar b/javaEE/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd..87b738cbd 100644
--- a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.jar
+++ b/javaEE/gradle/wrapper/gradle-wrapper.jar
diff --git a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.properties b/javaEE/gradle/wrapper/gradle-wrapper.properties
index df8be2c19..df8be2c19 100644
--- a/javaEE/javaEE/gradle/wrapper/gradle-wrapper.properties
+++ b/javaEE/gradle/wrapper/gradle-wrapper.properties
diff --git a/javaEE/javaEE/gradlew b/javaEE/gradlew
index af6708ff2..af6708ff2 100755
--- a/javaEE/javaEE/gradlew
+++ b/javaEE/gradlew
diff --git a/javaEE/javaEE/gradlew.bat b/javaEE/gradlew.bat
index 6d57edc70..6d57edc70 100644
--- a/javaEE/javaEE/gradlew.bat
+++ b/javaEE/gradlew.bat
diff --git a/javaEE/hello_sdl_java_ee/build.gradle b/javaEE/hello_sdl_java_ee/build.gradle
index 5c1b1eb70..105285adf 100644
--- a/javaEE/hello_sdl_java_ee/build.gradle
+++ b/javaEE/hello_sdl_java_ee/build.gradle
@@ -20,7 +20,7 @@ configurations {
 dependencies {
     extraLibs fileTree(dir: 'libs', include: ['*.jar'])
     //testCompile group: 'junit', name: 'junit', version: '4.12'
-    extraLibs project(path: ':sdl_java_ee')
+    extraLibs project(path: ':javaEE')
     configurations.implementation.extendsFrom(configurations.extraLibs)
 
 }
diff --git a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.jar b/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 28861d273..000000000
--- a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
diff --git a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.properties b/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 16f7ff6d1..000000000
--- a/javaEE/hello_sdl_java_ee/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Mar 18 15:56:54 EDT 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/javaEE/hello_sdl_java_ee/gradlew b/javaEE/hello_sdl_java_ee/gradlew
deleted file mode 100755
index cccdd3d51..000000000
--- a/javaEE/hello_sdl_java_ee/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/javaEE/hello_sdl_java_ee/gradlew.bat b/javaEE/hello_sdl_java_ee/gradlew.bat
deleted file mode 100644
index f9553162f..000000000
--- a/javaEE/hello_sdl_java_ee/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/javaEE/hello_sdl_java_ee/settings.gradle b/javaEE/hello_sdl_java_ee/settings.gradle
deleted file mode 100644
index 8a8a05513..000000000
--- a/javaEE/hello_sdl_java_ee/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-rootProject.name = 'hello_sdl_java_ee'
-include ":sdl_java_ee"
-project (":sdl_java_ee").projectDir = new File(rootProject.projectDir, "../javaEE/")
\ No newline at end of file
diff --git a/javaEE/javaEE/settings.gradle b/javaEE/javaEE/settings.gradle
deleted file mode 100644
index 4da4ab327..000000000
--- a/javaEE/javaEE/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'javaEE'
diff --git a/javaEE/settings.gradle b/javaEE/settings.gradle
index 7ada092e5..82ab998de 100644
--- a/javaEE/settings.gradle
+++ b/javaEE/settings.gradle
@@ -1,2 +1 @@
-include ':javaEE', ':hello_sdl_java_ee', ':sdl_java_ee'
-project (":sdl_java_ee").projectDir = new File("/javaEE/")
+include ':javaEE', ':hello_sdl_java_ee'
\ No newline at end of file
diff --git a/javaSE/javaSE/gradle/wrapper/gradle-wrapper.jar b/javaSE/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd..87b738cbd 100644
--- a/javaSE/javaSE/gradle/wrapper/gradle-wrapper.jar
+++ b/javaSE/gradle/wrapper/gradle-wrapper.jar
diff --git a/javaSE/javaSE/gradle/wrapper/gradle-wrapper.properties b/javaSE/gradle/wrapper/gradle-wrapper.properties
index ca21d83d3..ca21d83d3 100644
--- a/javaSE/javaSE/gradle/wrapper/gradle-wrapper.properties
+++ b/javaSE/gradle/wrapper/gradle-wrapper.properties
diff --git a/javaSE/javaSE/gradlew b/javaSE/gradlew
index af6708ff2..af6708ff2 100755
--- a/javaSE/javaSE/gradlew
+++ b/javaSE/gradlew
diff --git a/javaSE/javaSE/gradlew.bat b/javaSE/gradlew.bat
index 6d57edc70..6d57edc70 100644
--- a/javaSE/javaSE/gradlew.bat
+++ b/javaSE/gradlew.bat
diff --git a/javaSE/hello_sdl_java/build.gradle b/javaSE/hello_sdl_java/build.gradle
index ce0689640..996affcd0 100644
--- a/javaSE/hello_sdl_java/build.gradle
+++ b/javaSE/hello_sdl_java/build.gradle
@@ -19,7 +19,7 @@ configurations {
 }
 dependencies {
     extraLibs fileTree(dir: 'libs', include: ['*.jar'])
-    extraLibs project(path: ':sdl_java_se')
+    extraLibs project(path: ':javaSE')
     configurations.implementation.extendsFrom(configurations.extraLibs)
 }
 jar {
diff --git a/javaSE/hello_sdl_java/gradle/wrapper/gradle-wrapper.jar b/javaSE/hello_sdl_java/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 28861d273..000000000
--- a/javaSE/hello_sdl_java/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
diff --git a/javaSE/hello_sdl_java/gradle/wrapper/gradle-wrapper.properties b/javaSE/hello_sdl_java/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index fd6d42bd6..000000000
--- a/javaSE/hello_sdl_java/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Mar 18 12:47:09 EDT 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/javaSE/hello_sdl_java/gradlew b/javaSE/hello_sdl_java/gradlew
deleted file mode 100755
index cccdd3d51..000000000
--- a/javaSE/hello_sdl_java/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/javaSE/hello_sdl_java/gradlew.bat b/javaSE/hello_sdl_java/gradlew.bat
deleted file mode 100644
index f9553162f..000000000
--- a/javaSE/hello_sdl_java/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/javaSE/hello_sdl_java/settings.gradle b/javaSE/hello_sdl_java/settings.gradle
deleted file mode 100644
index fd254fa69..000000000
--- a/javaSE/hello_sdl_java/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-rootProject.name = 'hello_sdl_java'
-include ":sdl_java_se"
-project (":sdl_java_se").projectDir = new File("../javaSE/")
-
diff --git a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
index 8c5eda17c..8c9afcc28 100644
--- a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
+++ b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
@@ -73,7 +73,7 @@ public class SdlService {
 
     private static final String TEST_COMMAND_NAME 		= "Test Command";
 
-    private static final String IMAGE_DIR =             "assets/images/";
+    private static final String IMAGE_DIR =             "hello_sdl_java/assets/images/";
 
     // variable to create and call functions of the SyncProxy
     private SdlManager sdlManager = null;
diff --git a/javaSE/javaSE/settings.gradle b/javaSE/javaSE/settings.gradle
deleted file mode 100644
index f7ac48020..000000000
--- a/javaSE/javaSE/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = 'javaSE'
-
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index 542ff6b35..17a961a17 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.SdlConnection;
 
 
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.protocol.SdlPacket;
 import com.smartdevicelink.protocol.SdlProtocol;
 import com.smartdevicelink.protocol.SdlProtocolBase;
@@ -44,6 +45,7 @@ import com.smartdevicelink.util.Version;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlSession extends BaseSdlSession {
 
     private static final String TAG = "SdlSession";
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java
index b4a92ddb6..9fb7c7ce3 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java
@@ -33,6 +33,7 @@ package com.smartdevicelink.managers.file;
 
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.managers.file.filetypes.SdlFile;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.PutFile;
@@ -65,6 +66,7 @@ public class FileManager extends BaseFileManager {
 	 * @param internalInterface an instance of the ISdl interface that can be used for common SDL operations (sendRpc, addRpcListener, etc)
 	 * @param fileManagerConfig an instance of the FileManagerConfig gives access to artworkRetryCount and fileRetryCount to let us if those file types can be re-upload if they fail
 	 */
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public FileManager(ISdl internalInterface, FileManagerConfig fileManagerConfig) {
 		// setup
 		super(internalInterface, fileManagerConfig);
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
index 2918e0161..b27b00bcb 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.managers.permission;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
 /**
@@ -49,6 +50,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
      *
      * @param internalInterface an instance of the FileManager so that button graphics can be sent
      */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
     public PermissionManager(@NonNull ISdl internalInterface) {
         super(internalInterface);
     }
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
index 38e17d0dc..2989be3f2 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
@@ -42,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
 */
 public class ScreenManager extends BaseScreenManager {
 
+	@RestrictTo(RestrictTo.Scope.LIBRARY)
 	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
 		super(internalInterface, fileManager);
 	}
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
index 0b95d1aa5..a7e9d30c2 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
@@ -40,6 +41,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * SoftButtonManager gives the developer the ability to control how soft buttons are displayed on the head unit.<br>
  * Note: This class must be accessed through the SdlManager->ScreenManager. Do not instantiate it by itself.<br>
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class SoftButtonManager extends BaseSoftButtonManager {
 
     /**
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
index 49d41d495..8db1cd957 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
@@ -1,8 +1,16 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
+/**
+ * <strong>SubscribeButtonManager</strong> <br>
+ *
+ * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
+ *
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SubscribeButtonManager extends BaseSubscribeButtonManager {
 
     public SubscribeButtonManager(@NonNull ISdl internalInterface) {
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
index b84734a52..76c142e9a 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.proxy.interfaces.ISdl;
@@ -43,6 +44,7 @@ import com.smartdevicelink.proxy.rpc.enums.FileType;
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
  *
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 class TextAndGraphicManager extends BaseTextAndGraphicManager {
 
 	TextAndGraphicManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager,  @NonNull SoftButtonManager softButtonManager) {
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
index 804054373..cd7f20dfe 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java
@@ -33,6 +33,7 @@
 package com.smartdevicelink.managers.screen.choiceset;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
@@ -41,6 +42,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  * ChoiceSetManager gives the developer the ability to control how soft choice sets are displayed on the head unit.<br>
  * Note: This class must be accessed through the SdlManager->ScreenManager. Do not instantiate it by itself.<br>
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class ChoiceSetManager extends BaseChoiceSetManager {
 
     /**
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
index 4a28a2792..ec2ae5fb3 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
@@ -32,6 +32,7 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
@@ -42,6 +43,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  *
  * The MenuManager takes MenuCell objects and creates and sends all necessary RPCs to build out a menu
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class MenuManager extends BaseMenuManager {
 
 	public MenuManager(ISdl internalInterface, FileManager fileManager) {
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
index a892d3a2c..1d2233fb0 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
@@ -32,6 +32,7 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 
 /**
@@ -41,6 +42,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  *
  * The VoiceCommandManager takes a List of VoiceCommand objects and sets them on the Head unit for you.
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class VoiceCommandManager extends BaseVoiceCommandManager {
 
 	public VoiceCommandManager(ISdl internalInterface) {
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
index 4f37da493..0c9481c2d 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
@@ -31,7 +31,9 @@
  */
 package com.smartdevicelink.protocol;
 
+import androidx.annotation.RestrictTo;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlPacket extends BaseSdlPacket {
 
     public SdlPacket(int version, boolean encryption, int frameType,
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
index 67ea25cc1..18343acb0 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
@@ -33,11 +33,13 @@
 package com.smartdevicelink.protocol;
 
 
+import androidx.annotation.RestrictTo;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.TransportManager;
 
 
 @SuppressWarnings("WeakerAccess")
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlProtocol extends SdlProtocolBase {
     private static final String TAG ="SdlProtocol";
 
diff --git a/javaSE/settings.gradle b/javaSE/settings.gradle
index 0652c8ce8..99f64ccb0 100644
--- a/javaSE/settings.gradle
+++ b/javaSE/settings.gradle
@@ -1,2 +1 @@
-include ':javaSE', ':hello_sdl_java', ':sdl_java_se'
-project (":sdl_java_se").projectDir = new File("/javaSE/")
+include ':javaSE', ':hello_sdl_java'
\ No newline at end of file