Index: /ModelExtender/.checkstyle
===================================================================
--- /ModelExtender/.checkstyle	(revision 237)
+++ /ModelExtender/.checkstyle	(revision 237)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <fileset name="all" enabled="true" check-config-name="SSE Checkstyle Configuration" local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
Index: /ModelExtender/src/de/uni_hildesheim/sse/model_extender/Main.java
===================================================================
--- /ModelExtender/src/de/uni_hildesheim/sse/model_extender/Main.java	(revision 236)
+++ /ModelExtender/src/de/uni_hildesheim/sse/model_extender/Main.java	(revision 237)
@@ -1,5 +1,4 @@
 package de.uni_hildesheim.sse.model_extender;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -7,5 +6,4 @@
 import java.io.IOException;
 import java.io.StringWriter;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,22 +12,17 @@
 import java.util.List;
 
-import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree;
-import de.uni_hildesheim.sse.model.cst.OCLFeatureCall;
-import de.uni_hildesheim.sse.model.cst.Variable;
-import de.uni_hildesheim.sse.model.varModel.AbstractVariable;
-import de.uni_hildesheim.sse.model.varModel.Constraint;
-import de.uni_hildesheim.sse.model.varModel.IvmlKeyWords;
-import de.uni_hildesheim.sse.model.varModel.Project;
-import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords;
-import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder;
-import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder;
-import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType;
-import de.uni_hildesheim.sse.model.varModel.filter.FilterType;
 import de.uni_hildesheim.sse.model_extender.convert.ConstraintParserException;
 import de.uni_hildesheim.sse.model_extender.convert.ModelExtender;
 import de.uni_hildesheim.sse.model_extender.in.DimacsReader;
 import de.uni_hildesheim.sse.model_extender.in.MalformedFileException;
-import de.uni_hildesheim.sse.persistency.IVMLWriter;
 import de.uni_hildesheim.sse.trans.out.DimacsWriter;
+import net.ssehub.easy.varModel.model.AbstractVariable;
+import net.ssehub.easy.varModel.model.Constraint;
+import net.ssehub.easy.varModel.model.Project;
+import net.ssehub.easy.varModel.model.filter.ConstraintFinder;
+import net.ssehub.easy.varModel.model.filter.DeclarationFinder;
+import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType;
+import net.ssehub.easy.varModel.model.filter.FilterType;
+import net.ssehub.easy.varModel.persistency.IVMLWriter;
 
 /**
@@ -40,8 +33,8 @@
  */
 public class Main {
-	
-	private static final boolean DEBUG = false;
-		
-		
+
+    private static final boolean DEBUG = false;
+        
+        
     /**
      * Will extends the <tt>sourceDimacsFile</tt> with the given <tt>constraint</tt> and save the extended file to
@@ -63,5 +56,5 @@
         Project model = null;
         try {
-        	reader = new DimacsReader(sourceDimacsFile);
+            reader = new DimacsReader(sourceDimacsFile);
             model = reader.getModel();
         } finally {
@@ -71,26 +64,25 @@
         }
         if (null != model) {
-        	
-        	// Cache Declarations + Constraints
-        	DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
-        	List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
-        	ConstraintFinder constraintFinder = new ConstraintFinder(model);
-        	List<Constraint> constraints = constraintFinder.getConstraints();
-        	
-        	// Copy Model
-        	Project clonedModel = cloneProject(variables,constraints);
-        			
-        	// Test created model
-        	if(DEBUG)
-        	{
-        		System.out.println("Original Model");
-        		System.out.println("variables = "+variables.size());
-        		System.out.println("constraints = "+constraints.size());
-//        		StringWriter sWriter = new StringWriter();
-//        		IVMLWriter iWriter = new IVMLWriter(sWriter);
-//        		clonedModel.accept(iWriter);
-//        		System.out.println(sWriter);
-        	}
-        	
+            
+            // Cache Declarations + Constraints
+            DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
+            List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
+            ConstraintFinder constraintFinder = new ConstraintFinder(model);
+            List<Constraint> constraints = constraintFinder.getConstraints();
+            
+            // Copy Model
+            Project clonedModel = cloneProject(variables, constraints);
+                    
+            // Test created model
+            if (DEBUG) {
+                System.out.println("Original Model");
+                System.out.println("variables = " + variables.size());
+                System.out.println("constraints = " + constraints.size());
+//                StringWriter sWriter = new StringWriter();
+//                IVMLWriter iWriter = new IVMLWriter(sWriter);
+//                clonedModel.accept(iWriter);
+//                System.out.println(sWriter);
+            }
+            
             // Extend model
             ModelExtender extender = new ModelExtender(clonedModel);
@@ -100,17 +92,17 @@
 
             if(DEBUG) {
-            	System.out.println("Extended Model");
-            	varFinder = new DeclarationFinder(clonedModel, FilterType.ALL, null);
-            	variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
-            	constraintFinder = new ConstraintFinder(clonedModel);
-            	constraints = constraintFinder.getConstraints();
-            	System.out.println("variables = "+variables.size());
-        		System.out.println("constraints = "+constraints.size());
-            	FileWriter fWriter = new FileWriter("res/dest.dimacs");
+                System.out.println("Extended Model");
+                varFinder = new DeclarationFinder(clonedModel, FilterType.ALL, null);
+                variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
+                constraintFinder = new ConstraintFinder(clonedModel);
+                constraints = constraintFinder.getConstraints();
+                System.out.println("variables = "+variables.size());
+                System.out.println("constraints = "+constraints.size());
+                FileWriter fWriter = new FileWriter("res/dest.dimacs");
                 DimacsWriter writer = new DimacsWriter(clonedModel, fWriter);
                 writer.write();
                 fWriter.close();
             } else {
-            	FileWriter fWriter = new FileWriter(destinationDimacsFile);
+                FileWriter fWriter = new FileWriter(destinationDimacsFile);
                 DimacsWriter writer = new DimacsWriter(clonedModel, fWriter);
                 writer.write();
@@ -125,16 +117,16 @@
     }
     private static Project cloneProject(List<AbstractVariable> variables,
-    		List<Constraint> constraints) {
-    	Project clonedModel = new Project("clonedModel");
-    	for (int i = 0; i < variables.size(); i++) {
-    		clonedModel.add(variables.get(i));
-    	}
-    	for (int i = 0; i < constraints.size(); i++) {
-    		clonedModel.add(constraints.get(i));
-    	}
-    	return clonedModel;
-    }
-
-	// this method add constraints to a model
+            List<Constraint> constraints) {
+        Project clonedModel = new Project("clonedModel");
+        for (int i = 0; i < variables.size(); i++) {
+            clonedModel.add(variables.get(i));
+        }
+        for (int i = 0; i < constraints.size(); i++) {
+            clonedModel.add(constraints.get(i));
+        }
+        return clonedModel;
+    }
+
+    // this method add constraints to a model
     public static void extendModel(Project model, String constraint, File destinationDimacsFile)
             throws FileNotFoundException, IOException, MalformedFileException, ConstraintParserException {
@@ -152,22 +144,22 @@
 //            }
             if (null != model) {
-            	
-            	// Cache Declarations + Constraints
-            	DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
-            	List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
-            	ConstraintFinder constraintFinder = new ConstraintFinder(model);
-            	List<Constraint> constraints = constraintFinder.getConstraints();
-            	
-            	// Copy Model
-            	Project clonedModel = cloneProject(variables,constraints);
-            	// Test created model
-            	if(DEBUG)
-            	{
-            		StringWriter sWriter = new StringWriter();
-            		IVMLWriter iWriter = new IVMLWriter(sWriter);
-            		clonedModel.accept(iWriter);
-            		System.out.println(sWriter);
-            	}
-            	
+                
+                // Cache Declarations + Constraints
+                DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
+                List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
+                ConstraintFinder constraintFinder = new ConstraintFinder(model);
+                List<Constraint> constraints = constraintFinder.getConstraints();
+                
+                // Copy Model
+                Project clonedModel = cloneProject(variables,constraints);
+                // Test created model
+                if(DEBUG)
+                {
+                    StringWriter sWriter = new StringWriter();
+                    IVMLWriter iWriter = new IVMLWriter(sWriter);
+                    clonedModel.accept(iWriter);
+                    System.out.println(sWriter);
+                }
+                
                 // Extend model
                 ModelExtender extender = new ModelExtender(clonedModel);
@@ -193,50 +185,50 @@
             
             if (null != model) {
-            	
-            	// Cache Declarations + Constraints
-            	DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
-            	List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
-            	ConstraintFinder constraintFinder = new ConstraintFinder(model);
-            	List<Constraint> constraints = constraintFinder.getConstraints();
-            	
-            	// Copy Model
-            	Project clonedModel = cloneProject(variables,constraints);
-            	
-            	
-            	// Test created model
-            	if(DEBUG)
-            	{
-            		System.out.println("Original Model");
-            		System.out.println("variables = "+variables.size());
-            		System.out.println("constraints = "+constraints.size());
-            		StringWriter sWriter = new StringWriter();
-            		IVMLWriter iWriter = new IVMLWriter(sWriter);
-            		clonedModel.accept(iWriter);
-            		System.out.println(sWriter);
-            	}
-            	
-            	// deintialized the variables after using them
-            	varFinder = null;
-            	variables = null;
-            	constraintFinder = null;
-            	constraints = null;
-            	
+                
+                // Cache Declarations + Constraints
+                DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
+                List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
+                ConstraintFinder constraintFinder = new ConstraintFinder(model);
+                List<Constraint> constraints = constraintFinder.getConstraints();
+                
+                // Copy Model
+                Project clonedModel = cloneProject(variables,constraints);
+                
+                
+                // Test created model
+                if(DEBUG)
+                {
+                    System.out.println("Original Model");
+                    System.out.println("variables = "+variables.size());
+                    System.out.println("constraints = "+constraints.size());
+                    StringWriter sWriter = new StringWriter();
+                    IVMLWriter iWriter = new IVMLWriter(sWriter);
+                    clonedModel.accept(iWriter);
+                    System.out.println(sWriter);
+                }
+                
+                // deintialized the variables after using them
+                varFinder = null;
+                variables = null;
+                constraintFinder = null;
+                constraints = null;
+                
                 // Extend model
                 ModelExtender extender = new ModelExtender(clonedModel);
                 extender.addConstraint(constraint);
                 if (DEBUG) {
-                	System.out.println("Extended Model");
-                	varFinder = new DeclarationFinder(clonedModel, FilterType.ALL, null);
-                	variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
-                	constraintFinder = new ConstraintFinder(clonedModel);
-                	constraints = constraintFinder.getConstraints();
-                	System.out.println("variables = "+variables.size());
-            		System.out.println("constraints = "+constraints.size());
+                    System.out.println("Extended Model");
+                    varFinder = new DeclarationFinder(clonedModel, FilterType.ALL, null);
+                    variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
+                    constraintFinder = new ConstraintFinder(clonedModel);
+                    constraints = constraintFinder.getConstraints();
+                    System.out.println("variables = "+variables.size());
+                    System.out.println("constraints = "+constraints.size());
                 }
                 return clonedModel;
             } else {
-            	return null;
-            }
-			
+                return null;
+            }
+            
         }
     
@@ -256,48 +248,48 @@
      * @throws FileNotFoundException 
      */
-	public static void main(String[] args) throws FileNotFoundException, IOException, MalformedFileException, ConstraintParserException {
-    	if(DEBUG) {
-    		System.out.println("Calling extend math which returns a model as an object");
-    		 File readModelFile = new File(args[0]);
-    	        DimacsReader reader = null;
-    	        try {
-    	            reader = new DimacsReader(readModelFile);
-    	        } catch (FileNotFoundException e) {
-    	            System.err.println("File " + readModelFile.getPath() + " can't be opened for reading: "
-    	                    + e.getMessage());
-    	            System.exit(1);
-    	        }
-    	        Project model = null;
-    	        try {
-    	            model = reader.getModel();
-    	        } catch (IOException | MalformedFileException e) {
-    	            e.printStackTrace(System.err);
-    	            System.exit(1);
-    	        }
-    	        
-    	        try {
-    	            reader.close();
-    	        } catch (IOException e) {
-    	            e.printStackTrace(System.err);
-    	            System.exit(1);
-    	        }
-    	        if (model != null) {
-    	        	
-    	        	model = extendModel(model, "!2||3");
-    	        	DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
-                	List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
-                	ConstraintFinder constraintFinder = new ConstraintFinder(model);
-                	List<Constraint> constraints = constraintFinder.getConstraints();
-                	System.out.println("Variables and Constraint from model returned by extendModel method");
-                	System.out.println("variables = "+variables.size());
-            		System.out.println("constraints = "+constraints.size());
-            		varFinder = null;
-    	        	variables = null;
-    	        	constraintFinder = null;
-    	        	constraints = null;
-    	        	getClauses(model);
-    	        }
-    	}
-    	else {
+    public static void main(String[] args) throws FileNotFoundException, IOException, MalformedFileException, ConstraintParserException {
+        if(DEBUG) {
+            System.out.println("Calling extend math which returns a model as an object");
+             File readModelFile = new File(args[0]);
+                DimacsReader reader = null;
+                try {
+                    reader = new DimacsReader(readModelFile);
+                } catch (FileNotFoundException e) {
+                    System.err.println("File " + readModelFile.getPath() + " can't be opened for reading: "
+                            + e.getMessage());
+                    System.exit(1);
+                }
+                Project model = null;
+                try {
+                    model = reader.getModel();
+                } catch (IOException | MalformedFileException e) {
+                    e.printStackTrace(System.err);
+                    System.exit(1);
+                }
+                
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace(System.err);
+                    System.exit(1);
+                }
+                if (model != null) {
+                    
+                    model = extendModel(model, "!2||3");
+                    DeclarationFinder varFinder = new DeclarationFinder(model, FilterType.ALL, null);
+                    List<AbstractVariable> variables = varFinder.getVariableDeclarations(VisibilityType.ALL);
+                    ConstraintFinder constraintFinder = new ConstraintFinder(model);
+                    List<Constraint> constraints = constraintFinder.getConstraints();
+                    System.out.println("Variables and Constraint from model returned by extendModel method");
+                    System.out.println("variables = "+variables.size());
+                    System.out.println("constraints = "+constraints.size());
+                    varFinder = null;
+                    variables = null;
+                    constraintFinder = null;
+                    constraints = null;
+                    getClauses(model);
+                }
+        }
+        else {
         if (args.length < 3) {
             System.err.println("Not enough command line arguments");
@@ -341,5 +333,5 @@
         File writeModelFile = new File(args[2]);
         try {
-        	DimacsWriter writer = new DimacsWriter(model, new FileWriter(writeModelFile));
+            DimacsWriter writer = new DimacsWriter(model, new FileWriter(writeModelFile));
             writer.write();
         } catch (IOException e) {
@@ -348,65 +340,65 @@
     }
     }
-	private static void getClauses(Project model) {
-		// TODO Auto-generated method stub
-		 DeclarationFinder declarationFinder = new DeclarationFinder(model, FilterType.ALL, null);
-	        List<AbstractVariable> variableDeclarations = declarationFinder.getVariableDeclarations(VisibilityType.ALL);
-	        Collections.sort(variableDeclarations, new Comparator<AbstractVariable>() {
-	            public int compare(AbstractVariable o1, AbstractVariable o2) {
-	                return o1.getName().compareTo(o2.getName());
-	            }
-	        });
-	        
-	        // Get all Constraints
-	        ConstraintFinder constraintFinder = new ConstraintFinder(model);
-	        List<Constraint> constraints = constraintFinder.getConstraints();
-	        
-	        // Write variables
-	        HashMap<String,Integer> clauseVariables = new HashMap<String, Integer>(); 
-	        Integer i = 1;
-	        for (AbstractVariable variable : variableDeclarations) {
-	            clauseVariables.put(variable.getName(), i);
-	            i++;
-	        }
-	        i = 1;
-	       HashMap<Integer, List<Integer>> allClauses= new HashMap<Integer, List<Integer>>();
-	        
-	        for (Constraint constraint : constraints) {
-	          
-	        	String[] cons = constraint.toString().split("=");
-	            allClauses.put(i, getClause(cons[1].trim(),clauseVariables));
-	            i++;
-	        }
-	}
-	
-	private static List<Integer> getClause(String cls, HashMap<String, Integer> clauseVariables) {
-		String[] subCls = cls.split(" ");
-		final String NOT = "not";
-		final String OR = "or";
-		boolean isNot = false;
-		List<Integer> cnf = new ArrayList<Integer>();
-		for (int i=0; i < subCls.length; i++) {
-			String ss = subCls[i];
-			if(ss.equals(NOT)) {
-				isNot = true;
-			} else if (ss.equals(OR)) {
-				// ignore or operation
-			} else {
-				if(clauseVariables.containsKey(ss)) {
-					Integer number = clauseVariables.get(ss);
-					if(isNot) {
-						number = -number;
-						isNot = false;
-					} 
-					cnf.add(number);
-
-				} else {
-					throw new RuntimeException();
-				}
-
-			}
-		}
-		return cnf;
-	}
-	
+    private static void getClauses(Project model) {
+        // TODO Auto-generated method stub
+         DeclarationFinder declarationFinder = new DeclarationFinder(model, FilterType.ALL, null);
+            List<AbstractVariable> variableDeclarations = declarationFinder.getVariableDeclarations(VisibilityType.ALL);
+            Collections.sort(variableDeclarations, new Comparator<AbstractVariable>() {
+                public int compare(AbstractVariable o1, AbstractVariable o2) {
+                    return o1.getName().compareTo(o2.getName());
+                }
+            });
+            
+            // Get all Constraints
+            ConstraintFinder constraintFinder = new ConstraintFinder(model);
+            List<Constraint> constraints = constraintFinder.getConstraints();
+            
+            // Write variables
+            HashMap<String,Integer> clauseVariables = new HashMap<String, Integer>(); 
+            Integer i = 1;
+            for (AbstractVariable variable : variableDeclarations) {
+                clauseVariables.put(variable.getName(), i);
+                i++;
+            }
+            i = 1;
+           HashMap<Integer, List<Integer>> allClauses= new HashMap<Integer, List<Integer>>();
+            
+            for (Constraint constraint : constraints) {
+              
+                String[] cons = constraint.toString().split("=");
+                allClauses.put(i, getClause(cons[1].trim(),clauseVariables));
+                i++;
+            }
+    }
+    
+    private static List<Integer> getClause(String cls, HashMap<String, Integer> clauseVariables) {
+        String[] subCls = cls.split(" ");
+        final String NOT = "not";
+        final String OR = "or";
+        boolean isNot = false;
+        List<Integer> cnf = new ArrayList<Integer>();
+        for (int i = 0; i < subCls.length; i++) {
+            String ss = subCls[i];
+            if (ss.equals(NOT)) {
+                isNot = true;
+            } else if (ss.equals(OR)) {
+                // ignore or operation
+            } else {
+                if (clauseVariables.containsKey(ss)) {
+                    Integer number = clauseVariables.get(ss);
+                    if (isNot) {
+                        number = -number;
+                        isNot = false;
+                    } 
+                    cnf.add(number);
+
+                } else {
+                    throw new RuntimeException();
+                }
+
+            }
+        }
+        return cnf;
+    }
+    
 }
Index: /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ConstraintParser.java
===================================================================
--- /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ConstraintParser.java	(revision 236)
+++ /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ConstraintParser.java	(revision 237)
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 
-import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree;
-import de.uni_hildesheim.sse.model.cst.OCLFeatureCall;
-import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords;
+import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree;
+import net.ssehub.easy.varModel.cst.OCLFeatureCall;
+import net.ssehub.easy.varModel.model.datatypes.OclKeyWords;
+
 
 /**
Index: /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ListMaxTermConverter.java
===================================================================
--- /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ListMaxTermConverter.java	(revision 236)
+++ /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ListMaxTermConverter.java	(revision 237)
@@ -5,6 +5,7 @@
 import java.util.List;
 
-import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree;
+import de.uni_hildesheim.sse.trans.convert.MaxTermConverter;
 import de.uni_hildesheim.sse.trans.convert.MaxTermConverter2;
+import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree;
 
 /**
Index: /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ModelExtender.java
===================================================================
--- /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ModelExtender.java	(revision 236)
+++ /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/ModelExtender.java	(revision 237)
@@ -8,18 +8,18 @@
 import java.util.regex.Pattern;
 
-import de.uni_hildesheim.sse.model.cst.CSTSemanticException;
-import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree;
-import de.uni_hildesheim.sse.model.cst.OCLFeatureCall;
-import de.uni_hildesheim.sse.model.cst.Variable;
-import de.uni_hildesheim.sse.model.cst.VariablePool;
-import de.uni_hildesheim.sse.model.varModel.AbstractVariable;
-import de.uni_hildesheim.sse.model.varModel.Constraint;
-import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration;
-import de.uni_hildesheim.sse.model.varModel.Project;
-import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType;
-import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords;
-import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder;
-import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType;
-import de.uni_hildesheim.sse.model.varModel.filter.FilterType;
+import net.ssehub.easy.varModel.cst.CSTSemanticException;
+import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree;
+import net.ssehub.easy.varModel.cst.OCLFeatureCall;
+import net.ssehub.easy.varModel.cst.Variable;
+import net.ssehub.easy.varModel.cst.VariablePool;
+import net.ssehub.easy.varModel.model.AbstractVariable;
+import net.ssehub.easy.varModel.model.Constraint;
+import net.ssehub.easy.varModel.model.DecisionVariableDeclaration;
+import net.ssehub.easy.varModel.model.Project;
+import net.ssehub.easy.varModel.model.datatypes.BooleanType;
+import net.ssehub.easy.varModel.model.datatypes.OclKeyWords;
+import net.ssehub.easy.varModel.model.filter.DeclarationFinder;
+import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType;
+import net.ssehub.easy.varModel.model.filter.FilterType;
 
 /**
Index: /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/VariableSource.java
===================================================================
--- /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/VariableSource.java	(revision 236)
+++ /ModelExtender/src/de/uni_hildesheim/sse/model_extender/convert/VariableSource.java	(revision 237)
@@ -1,5 +1,5 @@
 package de.uni_hildesheim.sse.model_extender.convert;
 
-import de.uni_hildesheim.sse.model.cst.Variable;
+import net.ssehub.easy.varModel.cst.Variable;
 
 /**
Index: /ModelExtender/src/de/uni_hildesheim/sse/model_extender/in/DimacsReader.java
===================================================================
--- /ModelExtender/src/de/uni_hildesheim/sse/model_extender/in/DimacsReader.java	(revision 236)
+++ /ModelExtender/src/de/uni_hildesheim/sse/model_extender/in/DimacsReader.java	(revision 237)
@@ -12,13 +12,13 @@
 import java.util.regex.Pattern;
 
-import de.uni_hildesheim.sse.model.cst.CSTSemanticException;
-import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree;
-import de.uni_hildesheim.sse.model.cst.OCLFeatureCall;
-import de.uni_hildesheim.sse.model.cst.VariablePool;
-import de.uni_hildesheim.sse.model.varModel.Constraint;
-import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration;
-import de.uni_hildesheim.sse.model.varModel.Project;
-import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType;
-import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords;
+import net.ssehub.easy.varModel.cst.CSTSemanticException;
+import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree;
+import net.ssehub.easy.varModel.cst.OCLFeatureCall;
+import net.ssehub.easy.varModel.cst.VariablePool;
+import net.ssehub.easy.varModel.model.Constraint;
+import net.ssehub.easy.varModel.model.DecisionVariableDeclaration;
+import net.ssehub.easy.varModel.model.Project;
+import net.ssehub.easy.varModel.model.datatypes.BooleanType;
+import net.ssehub.easy.varModel.model.datatypes.OclKeyWords;
 
 /**
@@ -33,5 +33,5 @@
      * <ul>
      * <li>true = DIMACS is generated by ModelTranslator</li>
-     * <li>false = DIMACS is generated by Satyr</li>
+     * <li>false = DIMACS is generated by Satyr</li>o
      * </ul>
      */
@@ -69,10 +69,10 @@
     
     /**
-     * 
+     * Constructor.
      * @param br the bufferedreader to read the model from
      */
     public DimacsReader(BufferedReader br) {
-		in = br;
-	}
+        in = br;
+    }
 
     @Override
@@ -304,7 +304,7 @@
      * Negated if var starts with '-'.
      * 
-     * @param var The string to turn into a {@link Variable}.
-     * 
-     * @return A {@link ConstraintSyntaxTree} representing the (negated) {@link Variable}.
+     * @param var The string to turn into a {@link net.ssehub.easy.varModel.cst.Variable}.
+     * 
+     * @return A {@link ConstraintSyntaxTree} representing the (negated) {@link net.ssehub.easy.varModel.cst.Variable}.
      * @throws MalformedFileException If a malformed variable is found.
      */