diff --git a/fluentinterface/etc/fluentinterface.ucls b/fluentinterface/etc/fluentinterface.ucls
index e30c45bb2..1f6501aee 100644
--- a/fluentinterface/etc/fluentinterface.ucls
+++ b/fluentinterface/etc/fluentinterface.ucls
@@ -32,10 +32,10 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <interface id="4" language="java" name="com.iluwatar.fluentinterface.fluentiterable.FluentIterable" 
+  <interface id="4" language="java" name="com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable" 
     project="fluentinterface" 
-    file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
+    file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/core/FluentIterable.java" 
+    binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="794" y="55"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
@@ -64,16 +64,16 @@
     </display>  
   </interface>  
   <dependency id="7">    
-    <end type="SOURCE" refId="3"/>    
-    <end type="TARGET" refId="5"/>  
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="4"/>  
   </dependency>  
   <dependency id="8">    
     <end type="SOURCE" refId="1"/>    
     <end type="TARGET" refId="3"/>  
   </dependency>  
   <dependency id="9">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="4"/>  
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="5"/>  
   </dependency>  
   <realization id="10">    
     <end type="SOURCE" refId="2"/>    
@@ -83,14 +83,14 @@
     <end type="SOURCE" refId="3"/>    
     <end type="TARGET" refId="4"/>  
   </realization>  
-  <dependency id="12">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="2"/>  
-  </dependency>  
-  <generalization id="13">    
+  <generalization id="12">    
     <end type="SOURCE" refId="4"/>    
     <end type="TARGET" refId="6"/>  
   </generalization>  
+  <dependency id="13">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="2"/>  
+  </dependency>  
   <classifier-display autosize="true" stereotype="true" package="true" initial-value="true" signature="true" 
     sort-features="false" accessors="true" visibility="true">    
     <attributes public="true" package="true" protected="true" private="true" static="true"/>    
diff --git a/fluentinterface/pom.xml b/fluentinterface/pom.xml
index ce1d1e5d7..0d618d7ba 100644
--- a/fluentinterface/pom.xml
+++ b/fluentinterface/pom.xml
@@ -23,8 +23,8 @@
 				<artifactId>urm-maven-plugin</artifactId>
 				<configuration>
 					<packages>
-						<param>com.iluwatar.fluentinterface</param>
-						<param>com.iluwatar.fluentinterface.fluentiterable</param>
+						<param>com.iluwatar.fluentinterface.app</param>
+						<param>com.iluwatar.fluentinterface.fluentiterable.core</param>
 						<param>com.iluwatar.fluentinterface.fluentiterable.lazy</param>
 						<param>com.iluwatar.fluentinterface.fluentiterable.simple</param>
 					</packages>
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java
index 81a1ccb6a..9ca1e5865 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java
@@ -1,6 +1,6 @@
 package com.iluwatar.fluentinterface.app;
 
-import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
+import com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable;
 import com.iluwatar.fluentinterface.fluentiterable.lazy.LazyFluentIterable;
 import com.iluwatar.fluentinterface.fluentiterable.simple.SimpleFluentIterable;
 
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/core/FluentIterable.java
similarity index 98%
rename from fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java
rename to fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/core/FluentIterable.java
index 5c4df0391..219d430a1 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/core/FluentIterable.java
@@ -1,4 +1,4 @@
-package com.iluwatar.fluentinterface.fluentiterable;
+package com.iluwatar.fluentinterface.fluentiterable.core;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java
index 560b10189..bb697f698 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java
@@ -7,7 +7,7 @@ import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
+import com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable;
 
 /**
  * This is a lazy implementation of the FluentIterable interface. It evaluates all chained
diff --git a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java
index 19283152e..8859b60ac 100644
--- a/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java
+++ b/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java
@@ -1,12 +1,12 @@
 package com.iluwatar.fluentinterface.fluentiterable.simple;
 
-import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
-
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable;
+
 /**
  * This is a simple implementation of the FluentIterable interface. It evaluates all chained
  * operations eagerly. This implementation would be costly to be utilized in real applications.