diff --git a/CryslParser/pom.xml b/CrySLParser/pom.xml
similarity index 100%
rename from CryslParser/pom.xml
rename to CrySLParser/pom.xml
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/CrySLParser.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/CrySLParser.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/CrySLParser.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/CrySLParser.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReader.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReader.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReader.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReader.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReaderClassPath.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReaderClassPath.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReaderClassPath.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLModelReaderClassPath.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLReaderUtils.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLReaderUtils.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLReaderUtils.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CrySLReaderUtils.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CryslException.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CryslException.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/CryslException.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/CryslException.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/ExceptionsReader.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/ExceptionsReader.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/ExceptionsReader.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/ExceptionsReader.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/StateMachineGraphBuilder.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/StateMachineGraphBuilder.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/parsing/StateMachineGraphBuilder.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/parsing/StateMachineGraphBuilder.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLArithmeticConstraint.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLArithmeticConstraint.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLArithmeticConstraint.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLArithmeticConstraint.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLComparisonConstraint.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLComparisonConstraint.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLComparisonConstraint.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLComparisonConstraint.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLCondPredicate.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLCondPredicate.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLCondPredicate.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLCondPredicate.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLConstraint.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLConstraint.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLConstraint.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLConstraint.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLException.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLException.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLException.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLException.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLExceptionConstraint.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLExceptionConstraint.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLExceptionConstraint.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLExceptionConstraint.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLForbiddenMethod.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLForbiddenMethod.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLForbiddenMethod.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLForbiddenMethod.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLLiteral.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLLiteral.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLLiteral.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLLiteral.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLMethod.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLMethod.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLMethod.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLMethod.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLObject.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLObject.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLObject.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLObject.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLPredicate.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLPredicate.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLPredicate.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLPredicate.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLRule.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLRule.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLRule.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLRule.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLSplitter.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLSplitter.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLSplitter.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLSplitter.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLValueConstraint.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLValueConstraint.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLValueConstraint.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/CrySLValueConstraint.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/FiniteStateMachine.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/FiniteStateMachine.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/FiniteStateMachine.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/FiniteStateMachine.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/ICrySLPredicateParameter.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/ICrySLPredicateParameter.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/ICrySLPredicateParameter.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/ICrySLPredicateParameter.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/ISLConstraint.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/ISLConstraint.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/ISLConstraint.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/ISLConstraint.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraph.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraph.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraph.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraph.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraphReader.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraphReader.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraphReader.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/StateMachineGraphReader.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/StateNode.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/StateNode.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/StateNode.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/StateNode.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/Transition.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/Transition.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/Transition.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/Transition.java
diff --git a/CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/TransitionEdge.java b/CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/TransitionEdge.java
similarity index 100%
rename from CryslParser/src/main/java/de/darmstadt/tu/crossing/rule/TransitionEdge.java
rename to CrySLParser/src/main/java/de/darmstadt/tu/crossing/rule/TransitionEdge.java
diff --git a/CryslParser/src/main/resources/plugin.properties b/CrySLParser/src/main/resources/plugin.properties
similarity index 100%
rename from CryslParser/src/main/resources/plugin.properties
rename to CrySLParser/src/main/resources/plugin.properties
diff --git a/CryslParser/src/test/java/parser/CrySLParserTest.java b/CrySLParser/src/test/java/parser/CrySLParserTest.java
similarity index 100%
rename from CryslParser/src/test/java/parser/CrySLParserTest.java
rename to CrySLParser/src/test/java/parser/CrySLParserTest.java
diff --git a/CryslParser/src/test/java/statemachine/StateMachineTest.java b/CrySLParser/src/test/java/statemachine/StateMachineTest.java
similarity index 100%
rename from CryslParser/src/test/java/statemachine/StateMachineTest.java
rename to CrySLParser/src/test/java/statemachine/StateMachineTest.java
diff --git a/CryslParser/src/test/java/statemachine/StateMachineTester.java b/CrySLParser/src/test/java/statemachine/StateMachineTester.java
similarity index 100%
rename from CryslParser/src/test/java/statemachine/StateMachineTester.java
rename to CrySLParser/src/test/java/statemachine/StateMachineTester.java
diff --git a/CryslParser/src/test/resources/parser/JavaCryptographicArchitecture-3.0.1-ruleset.zip b/CrySLParser/src/test/resources/parser/JavaCryptographicArchitecture-3.0.1-ruleset.zip
similarity index 100%
rename from CryslParser/src/test/resources/parser/JavaCryptographicArchitecture-3.0.1-ruleset.zip
rename to CrySLParser/src/test/resources/parser/JavaCryptographicArchitecture-3.0.1-ruleset.zip
diff --git a/CryslParser/src/test/resources/parser/Multiple-rulesets.zip b/CrySLParser/src/test/resources/parser/Multiple-rulesets.zip
similarity index 100%
rename from CryslParser/src/test/resources/parser/Multiple-rulesets.zip
rename to CrySLParser/src/test/resources/parser/Multiple-rulesets.zip
diff --git a/CryslParser/src/test/resources/parser/empty.zip b/CrySLParser/src/test/resources/parser/empty.zip
similarity index 100%
rename from CryslParser/src/test/resources/parser/empty.zip
rename to CrySLParser/src/test/resources/parser/empty.zip
diff --git a/CryslParser/src/test/resources/parser/rulesetWithJunk.zip b/CrySLParser/src/test/resources/parser/rulesetWithJunk.zip
similarity index 100%
rename from CryslParser/src/test/resources/parser/rulesetWithJunk.zip
rename to CrySLParser/src/test/resources/parser/rulesetWithJunk.zip
diff --git a/CryslParser/src/test/resources/stateMachineRules/optionalAfterStar/StateMachineTester.crysl b/CrySLParser/src/test/resources/stateMachineRules/optionalAfterStar/StateMachineTester.crysl
similarity index 100%
rename from CryslParser/src/test/resources/stateMachineRules/optionalAfterStar/StateMachineTester.crysl
rename to CrySLParser/src/test/resources/stateMachineRules/optionalAfterStar/StateMachineTester.crysl
diff --git a/CryslParser/src/test/resources/stateMachineRules/optionalBetweenStar/StateMachineTester.crysl b/CrySLParser/src/test/resources/stateMachineRules/optionalBetweenStar/StateMachineTester.crysl
similarity index 100%
rename from CryslParser/src/test/resources/stateMachineRules/optionalBetweenStar/StateMachineTester.crysl
rename to CrySLParser/src/test/resources/stateMachineRules/optionalBetweenStar/StateMachineTester.crysl
diff --git a/pom.xml b/pom.xml
index f94d347..043afc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -354,6 +354,7 @@
                             <include>de.darmstadt.tu.crossing.CrySL.tests/pom.xml</include>
                             <include>de.darmstadt.tu.crossing.CrySL.ui/pom.xml</include>
                             <include>de.darmstadt.tu.crossing.CrySL/pom.xml</include>
+                            <include>CrySLParser/pom.xml</include>
                         </includes>
                         <sortPom>
                             <encoding>UTF-8</encoding>