diff --git a/CrySLParser/src/main/java/crysl/CrySLParser.java b/CrySLParser/src/main/java/crysl/CrySLParser.java
index 78e5055..37902e4 100644
--- a/CrySLParser/src/main/java/crysl/CrySLParser.java
+++ b/CrySLParser/src/main/java/crysl/CrySLParser.java
@@ -1,7 +1,7 @@
 package crysl;
 
-import crysl.parsing.CrySLParserException;
 import crysl.parsing.CrySLModelReader;
+import crysl.parsing.CrySLParserException;
 import crysl.rule.CrySLRule;
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/CrySLParser/src/main/java/crysl/parsing/CrySLModelReader.java b/CrySLParser/src/main/java/crysl/parsing/CrySLModelReader.java
index f8e8282..3783edc 100644
--- a/CrySLParser/src/main/java/crysl/parsing/CrySLModelReader.java
+++ b/CrySLParser/src/main/java/crysl/parsing/CrySLModelReader.java
@@ -1,6 +1,22 @@
 package crysl.parsing;
 
 import com.google.inject.Injector;
+import crysl.rule.CrySLArithmeticConstraint;
+import crysl.rule.CrySLComparisonConstraint;
+import crysl.rule.CrySLCondPredicate;
+import crysl.rule.CrySLConstraint;
+import crysl.rule.CrySLForbiddenMethod;
+import crysl.rule.CrySLMethod;
+import crysl.rule.CrySLObject;
+import crysl.rule.CrySLPredicate;
+import crysl.rule.CrySLRule;
+import crysl.rule.CrySLSplitter;
+import crysl.rule.CrySLValueConstraint;
+import crysl.rule.ICrySLPredicateParameter;
+import crysl.rule.ISLConstraint;
+import crysl.rule.StateMachineGraph;
+import crysl.rule.StateNode;
+import crysl.rule.TransitionEdge;
 import de.darmstadt.tu.crossing.CrySLStandaloneSetup;
 import de.darmstadt.tu.crossing.crySL.AlternativeRequiredPredicates;
 import de.darmstadt.tu.crossing.crySL.BuiltinPredicate;
@@ -32,22 +48,6 @@
 import de.darmstadt.tu.crossing.crySL.ThisPredicateParameter;
 import de.darmstadt.tu.crossing.crySL.TimedPredicate;
 import de.darmstadt.tu.crossing.crySL.WildcardPredicateParameter;
-import crysl.rule.CrySLArithmeticConstraint;
-import crysl.rule.CrySLComparisonConstraint;
-import crysl.rule.CrySLCondPredicate;
-import crysl.rule.CrySLConstraint;
-import crysl.rule.CrySLForbiddenMethod;
-import crysl.rule.CrySLMethod;
-import crysl.rule.CrySLObject;
-import crysl.rule.CrySLPredicate;
-import crysl.rule.CrySLRule;
-import crysl.rule.CrySLSplitter;
-import crysl.rule.CrySLValueConstraint;
-import crysl.rule.ICrySLPredicateParameter;
-import crysl.rule.ISLConstraint;
-import crysl.rule.StateMachineGraph;
-import crysl.rule.StateNode;
-import crysl.rule.TransitionEdge;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/CrySLParser/src/main/java/crysl/parsing/CrySLReaderUtils.java b/CrySLParser/src/main/java/crysl/parsing/CrySLReaderUtils.java
index 09918b4..59bfb0c 100644
--- a/CrySLParser/src/main/java/crysl/parsing/CrySLReaderUtils.java
+++ b/CrySLParser/src/main/java/crysl/parsing/CrySLReaderUtils.java
@@ -1,5 +1,12 @@
 package crysl.parsing;
 
+import crysl.rule.CrySLArithmeticConstraint;
+import crysl.rule.CrySLComparisonConstraint;
+import crysl.rule.CrySLConstraint;
+import crysl.rule.CrySLException;
+import crysl.rule.CrySLMethod;
+import crysl.rule.CrySLObject;
+import crysl.rule.ICrySLPredicateParameter;
 import de.darmstadt.tu.crossing.crySL.Aggregate;
 import de.darmstadt.tu.crossing.crySL.AnyParameterType;
 import de.darmstadt.tu.crossing.crySL.BooleanLiteral;
@@ -16,13 +23,6 @@
 import de.darmstadt.tu.crossing.crySL.Object;
 import de.darmstadt.tu.crossing.crySL.Operator;
 import de.darmstadt.tu.crossing.crySL.StringLiteral;
-import crysl.rule.CrySLArithmeticConstraint;
-import crysl.rule.CrySLComparisonConstraint;
-import crysl.rule.CrySLConstraint;
-import crysl.rule.CrySLException;
-import crysl.rule.CrySLMethod;
-import crysl.rule.CrySLObject;
-import crysl.rule.ICrySLPredicateParameter;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Collection;
 import java.util.List;
diff --git a/CrySLParser/src/main/java/crysl/parsing/ExceptionsReader.java b/CrySLParser/src/main/java/crysl/parsing/ExceptionsReader.java
index 58b6a08..355e28d 100644
--- a/CrySLParser/src/main/java/crysl/parsing/ExceptionsReader.java
+++ b/CrySLParser/src/main/java/crysl/parsing/ExceptionsReader.java
@@ -1,9 +1,9 @@
 package crysl.parsing;
 
-import de.darmstadt.tu.crossing.crySL.EventsBlock;
-import de.darmstadt.tu.crossing.crySL.LabeledMethodCall;
 import crysl.rule.CrySLExceptionConstraint;
 import crysl.rule.CrySLMethod;
+import de.darmstadt.tu.crossing.crySL.EventsBlock;
+import de.darmstadt.tu.crossing.crySL.LabeledMethodCall;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
diff --git a/CrySLParser/src/main/java/crysl/parsing/StateMachineGraphBuilder.java b/CrySLParser/src/main/java/crysl/parsing/StateMachineGraphBuilder.java
index 7cf2178..23a14c0 100644
--- a/CrySLParser/src/main/java/crysl/parsing/StateMachineGraphBuilder.java
+++ b/CrySLParser/src/main/java/crysl/parsing/StateMachineGraphBuilder.java
@@ -1,13 +1,13 @@
 package crysl.parsing;
 
-import de.darmstadt.tu.crossing.crySL.Event;
-import de.darmstadt.tu.crossing.crySL.Order;
-import de.darmstadt.tu.crossing.crySL.OrderOperator;
-import de.darmstadt.tu.crossing.crySL.Primary;
 import crysl.rule.CrySLMethod;
 import crysl.rule.FiniteStateMachine;
 import crysl.rule.StateMachineGraph;
 import crysl.rule.StateNode;
+import de.darmstadt.tu.crossing.crySL.Event;
+import de.darmstadt.tu.crossing.crySL.Order;
+import de.darmstadt.tu.crossing.crySL.OrderOperator;
+import de.darmstadt.tu.crossing.crySL.Primary;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;