move aspects to subdirectory to simplify derived package generation

build.gradle

@@ -29,7 +29,7 @@ jastaddSources.include 'jastadd/**'
 
 def jastaddGenSources = objects.sourceDirectorySet("resources", "Resources2")
 jastaddGenSources.srcDir 'src/gen'
-jastaddGenSources.include 'jastadd/*.relast', 'jastadd/*.ecore.jadd'
+jastaddGenSources.include 'jastadd/pnml/*.relast', 'jastadd/pnml/*.ecore.jadd'
 
 sourceSets {
     model {
@@ -129,15 +129,15 @@ test {
 
 // Generated files
 def ecoreFile = './src/main/resources/placeTransition.ecore'
-def ecoreRelastAspect = './src/gen/jastadd/placeTransition.ecore.jadd'
-def ecoreRelastGrammar = './src/gen/jastadd/placeTransition.relast'
+def ecoreRelastAspect = './src/gen/jastadd/pnml/placeTransition.ecore.jadd'
+def ecoreRelastGrammar = './src/gen/jastadd/pnml/placeTransition.relast'
 
 def ecoreInputFiles = [ecoreFile]
 def ecoreOutputFiles = [ecoreRelastAspect,
                         ecoreRelastGrammar]
 
 def relastInputFiles = [ecoreRelastGrammar]
-def relastOutputFiles = ['src/gen/jastadd/placeTransition.ast', 'src/gen/jastadd/placeTransition.jadd']
+def relastOutputFiles = ['src/gen/jastadd/pnml/placeTransition.ast', 'src/gen/jastadd/pnml/placeTransition.jadd']
 
 // First phase: Ecore -> RelAst
 task ecoreToRelast(type: JavaExec) {
@@ -168,7 +168,7 @@ task relastToJastAdd(type: JavaExec) {
     }
 
     args "--useJastAddNames",
-            "--grammarName=src/gen/jastadd/placeTransition",
+            "--grammarName=src/gen/jastadd/pnml/placeTransition",
             "--listClass=java.util.ArrayList",
             "--jastAddList=JastAddList",
             "--resolverHelper",