diff --git a/org.framed.iorm.transformation/src/org/framed/iorm/transformation/TransformationExecutor.java b/org.framed.iorm.transformation/src/org/framed/iorm/transformation/TransformationExecutor.java
index b10e491bf858cacb45b2ff75714507fa46442425..081af88208698f2a2c4285c9b8758a3e87224101 100644
--- a/org.framed.iorm.transformation/src/org/framed/iorm/transformation/TransformationExecutor.java
+++ b/org.framed.iorm.transformation/src/org/framed/iorm/transformation/TransformationExecutor.java
@@ -154,7 +154,7 @@ public class TransformationExecutor extends EpsilonStandalone {
 	public boolean packageMarkedAsNotUsed(String url, String sourceFolder) {
 		url = url.substring(url.indexOf(sourceFolder) + sourceFolder.length()); 
 		url = url.substring(0, url.indexOf("/"));
-		if(url.startsWith("_") && url.endsWith("_")) return true;
+		if(url.startsWith("_")) return true;
 		return false;
 	}
 	
@@ -167,7 +167,7 @@ public class TransformationExecutor extends EpsilonStandalone {
 	public boolean packageETLFilesMarkedAsNotUsed(String url, String sourceFolder) {
 		url = url.substring(url.indexOf(sourceFolder) + sourceFolder.length()); 
 		url = url.substring(url.indexOf("/")+1, url.indexOf(".etl"));
-		if(url.startsWith("_") && url.endsWith("_")) return true;
+		if(url.startsWith("_")) return true;
 		return false;
 	}
 	
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/UIUtil.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/UIUtil.java
index c3c08a5bee462f6885b842928c810dbd3ff480b0..11bc95b6ee5816accd3c1b6be3d0661d287be036 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/UIUtil.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/UIUtil.java
@@ -693,8 +693,9 @@ public class UIUtil {
 	 */
 	public static boolean packageMarkedAsNotUsed(String classURL, String sourceFolder) {
 		classURL = classURL.substring(classURL.indexOf(sourceFolder) + sourceFolder.length()); 
-		classURL = classURL.substring(0, classURL.indexOf("/"));
-		if(classURL.startsWith("_") && classURL.endsWith("_")) return true;
+		if (classURL.indexOf("/")>-1)
+			classURL = classURL.substring(0, classURL.indexOf("/"));
+		if(classURL.startsWith("_")) return true;
 		return false;
 	}
 	
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java
index e635211a1331512c306fd3dc29175e871140cce1..954900aa96d4678ab13c69859e462036b95797e2 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java
@@ -90,20 +90,6 @@ public class EditPolicyService {
 		}
 	}
 
-	/**
-	 * checks if the package part of a file url starts and ends with an _
-	 * 
-	 * @param url
-	 *            the string url to check against
-	 * @param sourceFolder
-	 *            the source folder in which the class is located in
-	 * @return if the package part of a class url starts and ends with an _
-	 */
-	private static boolean isPackageMarkedAsNotUsed(String url) {
-		url = url.substring(url.lastIndexOf('/')+1, url.length());
-		return url.startsWith("_") && url.endsWith("_");
-	}
-
 	private static void loadAllFiles() {
 		Bundle UIBundle = Platform.getBundle("org.framed.iorm.ui");
 
@@ -117,14 +103,14 @@ public class EditPolicyService {
 
 		if (moduleFileURLs != null) {
 			for (URL url : moduleFileURLs) {
-				if (!isPackageMarkedAsNotUsed(url.toString())) {
+				if (!UIUtil.packageMarkedAsNotUsed(url.toString(), "modules/")) {
 					loadEditPolicyFile(url.toString());
 				}
 			}
 		}
 		if (coreFileURLs != null) {
 			for (URL url : coreFileURLs) {
-				if (!isPackageMarkedAsNotUsed(url.toString())) {
+				if (!UIUtil.packageMarkedAsNotUsed(url.toString(), "core/")) {
 					loadEditPolicyFile(url.toString());
 				}
 			}