14 files changed, 45 insertions, 39 deletions
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/CLLBusinessIntentManagementFunction.java
index 2cf0de1..8713f23 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/CLLBusinessIntentManagementFunction.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/CLLBusinessIntentManagementFunction.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.CLLBusinessService;
+package org.onap.usecaseui.intentanalysis.CLLBusinessIntentMgt;
 
 
 import lombok.Data;
-import org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl.ActuationModuleImpl;
-import org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl.DecisoinModuleImpl;
-import org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl.KnownledgeModuleImpl;
-import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule;
-import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
-import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule;
-import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.CLLBusinessIntentMgt.intentModuleImpl.ActuationModuleImpl;
+import org.onap.usecaseui.intentanalysis.CLLBusinessIntentMgt.intentModuleImpl.DecisoinModuleImpl;
+import org.onap.usecaseui.intentanalysis.CLLBusinessIntentMgt.intentModuleImpl.KnownledgeModuleImpl;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 
 @Data
 public class CLLBusinessIntentManagementFunction extends IntentManagementFunction {
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/intentModuleImpl/ActuationModuleImpl.java
index 1cbdd77..8f9aa87 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/ActuationModuleImpl.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/intentModuleImpl/ActuationModuleImpl.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl;
+package org.onap.usecaseui.intentanalysis.CLLBusinessIntentMgt.intentModuleImpl;
 
 
-import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule;
-import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction;
-import org.onap.usecaseui.intentanalysis.intentProcessService.IntentProcessService;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService.IntentProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/intentModuleImpl/DecisoinModuleImpl.java
index 495bf70..b2e5410 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/DecisoinModuleImpl.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/intentModuleImpl/DecisoinModuleImpl.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl;
+package org.onap.usecaseui.intentanalysis.CLLBusinessIntentMgt.intentModuleImpl;
 
 
-import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
-import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/KnownledgeModuleImpl.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/intentModuleImpl/KnownledgeModuleImpl.java
index be45637..ea663d5 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessService/intentModuleImpl/KnownledgeModuleImpl.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/CLLBusinessIntentMgt/intentModuleImpl/KnownledgeModuleImpl.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.CLLBusinessService.intentModuleImpl;
+package org.onap.usecaseui.intentanalysis.CLLBusinessIntentMgt.intentModuleImpl;
 
-import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentManagementFunction.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/IntentManagementFunction.java
index 18770a3..ec41f3f 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentManagementFunction.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/IntentManagementFunction.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentProcessService;
+package org.onap.usecaseui.intentanalysis.intentBaseService;
 
 
 import lombok.Data;
-import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule;
-import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
-import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule;
 
 @Data
 public class IntentManagementFunction {
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/ActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java
index 5a3c1f6..34ae57c 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/ActuationModule.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/ActuationModule.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentModule;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule;
 
-import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 
 public interface ActuationModule {
     //actuationModel & knownledgeModel interact
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/DecisionModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/DecisionModule.java
index edbae69..1762e63 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/DecisionModule.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/DecisionModule.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentModule;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule;
 
 
-import org.onap.usecaseui.intentanalysis.intentProcessService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 
 public interface DecisionModule {
     void determineUltimateGoal();//
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/KnowledgeModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/KnowledgeModule.java
index 0b95a26..2a0032a 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentModule/KnowledgeModule.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentModule/KnowledgeModule.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentModule;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentModule;
 
 public interface KnowledgeModule {
     void intentResolution();
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDefinitionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java
index cd6af28..9407f91 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDefinitionService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDefinitionService.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentProcessService;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
 
-import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule;
-import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDetectionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDetectionService.java
index ada67ce..0232620 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDetectionService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDetectionService.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentProcessService;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
-import org.onap.usecaseui.intentanalysis.intentModule.KnowledgeModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.KnowledgeModule;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDistributionService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java
index 535214f..eb58546 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentDistributionService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentDistributionService.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentProcessService;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
 
-import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentInvestigationService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationService.java
index 9229804..2dc740a 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentInvestigationService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentInvestigationService.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentProcessService;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
-import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentOperationService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java
index 61fbc86..6ffbc2d 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentOperationService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentOperationService.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentProcessService;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
 
-import org.onap.usecaseui.intentanalysis.intentModule.ActuationModule;
-import org.onap.usecaseui.intentanalysis.intentModule.DecisionModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.ActuationModule;
+import org.onap.usecaseui.intentanalysis.intentBaseService.intentModule.DecisionModule;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentProcessService.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java
index 4a1a090..aadbda0 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentProcessService/IntentProcessService.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/intentBaseService/intentProcessService/IntentProcessService.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.usecaseui.intentanalysis.intentProcessService;
+package org.onap.usecaseui.intentanalysis.intentBaseService.intentProcessService;
 
+import org.onap.usecaseui.intentanalysis.intentBaseService.IntentManagementFunction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;