diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationService.java b/notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationService.java
deleted file mode 100644
index 24b05695a8862d897a61a832d5fecf7213e2743f..0000000000000000000000000000000000000000
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/auth/AuthorizationService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *   Copyright 2017-2020, Schlumberger
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-package org.opengroup.osdu.notification.auth;
-
-import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-
-public interface AuthorizationService {
-    String authorizeAny(DpsHeaders headers, String... roles);
-}
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/utils/IAppProperties.java b/notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/IAppProperties.java
similarity index 99%
rename from notification-core/src/main/java/org/opengroup/osdu/notification/utils/IAppProperties.java
rename to notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/IAppProperties.java
index 16049cc1078b16103f61a82dfdf214a729fef2ac..855d35126996b92a637b3d2c525916de3a5e3c29 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/utils/IAppProperties.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/IAppProperties.java
@@ -1,6 +1,7 @@
 package org.opengroup.osdu.notification.utils;
 
 public interface IAppProperties {
+
     String getAuthorizeAPI();
 
     String getRegisterAPI();
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/utils/IGoogleServiceAccount.java b/notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/IGoogleServiceAccount.java
similarity index 100%
rename from notification-core/src/main/java/org/opengroup/osdu/notification/utils/IGoogleServiceAccount.java
rename to notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/IGoogleServiceAccount.java
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/utils/ServiceAccountValidator.java b/notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/ServiceAccountValidator.java
similarity index 99%
rename from notification-core/src/main/java/org/opengroup/osdu/notification/utils/ServiceAccountValidator.java
rename to notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/ServiceAccountValidator.java
index 1491eba4fb1b320a01ffa8f45d249ec1499b9927..f733ea7245e4ed31aadf1c9810a24dd749de49ce 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/utils/ServiceAccountValidator.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/provider/interfaces/ServiceAccountValidator.java
@@ -17,6 +17,7 @@
 package org.opengroup.osdu.notification.utils;
 
 public interface ServiceAccountValidator {
+    
     boolean isValidPublisherServiceAccount(String jwt);
 
     boolean isValidServiceAccount(String jwt, String userIdentity, String... audiences);