diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a85ad4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+
+# Xtext generated files
+src/main/generated-sources/
+
+# NetBean / Eclipse
+bin/
+**/*.java._trace
+**/*.java_trace
+**/*.smap
+**/.project
+**/.classpath
+**/.settings
+**/.metadata
+
+# Subversion and CVS
+**/.svn/
+**/.cvs/
+
+# Maven
+target/
+
diff --git a/src/main/sarl/io/sarl/demos/fireworks/Fireworks.sarl b/src/main/sarl/io/sarl/demos/fireworks/Fireworks.sarl
index 5a60718..b0e3db7 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/Fireworks.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/Fireworks.sarl
@@ -1,41 +1,11 @@
 package io.sarl.demos.fireworks
 
 import io.janusproject.Boot
+import io.sarl.demos.fireworks.agents.LaunchingArea
+import io.sarl.demos.fireworks.gui.FXMLViewerController
 
 import static io.janusproject.Boot.*
 
-event Launch
-event CreateArea
-event Explode
-event KillRocket
-event KillFire
-event RocketReady
-event UpdateRocketPosition
-event UpdateFirePosition
-event FireReady
-event SprayFire
-event Exit
-
-event Freeze {
-	var value: boolean
-	new (value: boolean){
-		this.value = value
-	}
-}
-
-event SetupSettings {
-	var rocketsQuantity: Integer
-	var fireQuatity: Integer
-	var gravity: Double
-	var maxWidth: Double
-	new(rq: Integer, fq: Integer, grav: Double, max: Double){
-		rocketsQuantity = rq
-		fireQuatity = fq
-		gravity = grav
-		maxWidth = max
-	}
-}
-
 class Firework {
 	static def main(controller: FXMLViewerController) {
 		Boot::offline = true
diff --git a/src/main/sarl/io/sarl/demos/fireworks/viewer.fxml b/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml
similarity index 97%
rename from src/main/sarl/io/sarl/demos/fireworks/viewer.fxml
rename to src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml
index f5e4143..03da7a7 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/viewer.fxml
+++ b/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.fxml
@@ -8,7 +8,7 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="608.0" prefWidth="933.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="io.sarl.demos.fireworks.FXMLViewerController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="608.0" prefWidth="933.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="io.sarl.demos.fireworks.gui.FXMLViewerController">
    <children>
       <Canvas fx:id="draw_zone" height="583.0" layoutX="199.0" layoutY="13.0" rotate="180.0" width="715.0" />
       <Button fx:id="setup_button" layoutX="26.0" layoutY="45.0" mnemonicParsing="false" onAction="#actionSetup" text="Setup" />
diff --git a/src/main/sarl/io/sarl/demos/fireworks/Viewer.java b/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.java
similarity index 82%
rename from src/main/sarl/io/sarl/demos/fireworks/Viewer.java
rename to src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.java
index 2ddaac2..47f0bc2 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/Viewer.java
+++ b/src/main/sarl/io/sarl/demos/fireworks/FireworksFXApplication.java
@@ -2,6 +2,7 @@ package io.sarl.demos.fireworks;
 
 import java.net.URL;
 
+import io.sarl.demos.fireworks.gui.FXMLViewerController;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.JavaFXBuilderFactory;
@@ -9,13 +10,13 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-public class Viewer extends Application {
+public class FireworksFXApplication extends Application {
 	
 	private FXMLLoader loader;
 
 	@Override
 	public void start(Stage stage) throws Exception {
-		URL location = getClass().getResource("viewer.fxml");
+		URL location = getClass().getResource("FireworksFXApplication.fxml");
 		loader = new FXMLLoader();
 		loader.setLocation(location);
 		loader.setBuilderFactory(new JavaFXBuilderFactory());
diff --git a/src/main/sarl/io/sarl/demos/fireworks/Positions.sarl b/src/main/sarl/io/sarl/demos/fireworks/Positions.sarl
index 6634899..581553f 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/Positions.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/Positions.sarl
@@ -1,4 +1,4 @@
-package io.sarl.demos.fireworks
+package io.sarl.demos.fireworks.agents
 
 import java.util.HashMap
 import java.util.List
diff --git a/src/main/sarl/io/sarl/demos/fireworks/Fire.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl
similarity index 90%
rename from src/main/sarl/io/sarl/demos/fireworks/Fire.sarl
rename to src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl
index 70b3fde..14bda30 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/Fire.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/agents/Fire.sarl
@@ -1,14 +1,16 @@
-package io.sarl.demos.fireworks
+package io.sarl.demos.fireworks.agents
 
 import io.sarl.core.AgentTask
 import io.sarl.core.Behaviors
 import io.sarl.core.DefaultContextInteractions
-import io.sarl.core.ExternalContextAccess
 import io.sarl.core.Initialize
 import io.sarl.core.Lifecycle
 import io.sarl.core.Logging
 import io.sarl.core.Schedules
-import io.sarl.core.Time
+import io.sarl.demos.fireworks.events.Exit
+import io.sarl.demos.fireworks.events.FireReady
+import io.sarl.demos.fireworks.events.Freeze
+import io.sarl.demos.fireworks.events.UpdateFirePosition
 import io.sarl.util.Scopes
 import java.util.ArrayList
 import java.util.List
@@ -16,7 +18,7 @@ import java.util.UUID
 import java.util.Vector
 
 agent Fire { 
-	uses Lifecycle, Logging, Behaviors, DefaultContextInteractions, ExternalContextAccess, Schedules, Time
+	uses Lifecycle, Logging, Behaviors, DefaultContextInteractions, Schedules
 	
 	var x: List<Double>
 	var y: List<Double>
diff --git a/src/main/sarl/io/sarl/demos/fireworks/LaunchingArea.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl
similarity index 84%
rename from src/main/sarl/io/sarl/demos/fireworks/LaunchingArea.sarl
rename to src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl
index d8cc99d..5a8d263 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/LaunchingArea.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/agents/LaunchingArea.sarl
@@ -1,19 +1,24 @@
-package io.sarl.demos.fireworks
+package io.sarl.demos.fireworks.agents
 
 import io.sarl.core.Behaviors
 import io.sarl.core.DefaultContextInteractions
-import io.sarl.core.ExternalContextAccess
 import io.sarl.core.Initialize
 import io.sarl.core.InnerContextAccess
 import io.sarl.core.Lifecycle
 import io.sarl.core.Logging
 import io.sarl.core.MemberJoined
+import io.sarl.demos.fireworks.events.CreateArea
+import io.sarl.demos.fireworks.events.Exit
+import io.sarl.demos.fireworks.events.Freeze
+import io.sarl.demos.fireworks.events.Launch
+import io.sarl.demos.fireworks.events.SetupSettings
+import io.sarl.demos.fireworks.gui.FXMLViewerController
 import io.sarl.util.OpenEventSpaceSpecification
 import java.util.Random
 import java.util.UUID
 
 agent LaunchingArea {
-	uses DefaultContextInteractions, Lifecycle, Behaviors, Logging, InnerContextAccess, ExternalContextAccess
+	uses DefaultContextInteractions, Lifecycle, Behaviors, Logging, InnerContextAccess
 
 	var rocketsQuantity: Integer
 	var fireQuantity: Integer
diff --git a/src/main/sarl/io/sarl/demos/fireworks/Rocket.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl
similarity index 89%
rename from src/main/sarl/io/sarl/demos/fireworks/Rocket.sarl
rename to src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl
index 4837b01..599cfff 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/Rocket.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/agents/Rocket.sarl
@@ -1,9 +1,8 @@
-package io.sarl.demos.fireworks
+package io.sarl.demos.fireworks.agents
 
 import io.sarl.core.AgentTask
 import io.sarl.core.Behaviors
 import io.sarl.core.DefaultContextInteractions
-import io.sarl.core.ExternalContextAccess
 import io.sarl.core.Initialize
 import io.sarl.core.InnerContextAccess
 import io.sarl.core.Lifecycle
@@ -11,13 +10,18 @@ import io.sarl.core.Logging
 import io.sarl.core.MemberJoined
 import io.sarl.core.MemberLeft
 import io.sarl.core.Schedules
+import io.sarl.demos.fireworks.events.Exit
+import io.sarl.demos.fireworks.events.Explode
+import io.sarl.demos.fireworks.events.FireReady
+import io.sarl.demos.fireworks.events.Freeze
+import io.sarl.demos.fireworks.events.UpdateRocketPosition
 import java.util.Random
 import java.util.UUID
 import java.util.Vector
 
 agent Rocket {
 	
-	uses Lifecycle, Logging, Schedules, Behaviors, DefaultContextInteractions, InnerContextAccess, ExternalContextAccess
+	uses Lifecycle, Logging, Schedules, Behaviors, DefaultContextInteractions, InnerContextAccess
 	var x : Double
 	var y : Double
 	var gravity : Double
diff --git a/src/main/sarl/io/sarl/demos/fireworks/RocketLauncher.sarl b/src/main/sarl/io/sarl/demos/fireworks/agents/RocketLauncher.sarl
similarity index 80%
rename from src/main/sarl/io/sarl/demos/fireworks/RocketLauncher.sarl
rename to src/main/sarl/io/sarl/demos/fireworks/agents/RocketLauncher.sarl
index a49f261..9bb96f3 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/RocketLauncher.sarl
+++ b/src/main/sarl/io/sarl/demos/fireworks/agents/RocketLauncher.sarl
@@ -1,23 +1,20 @@
-package io.sarl.demos.fireworks
+package io.sarl.demos.fireworks.agents
 
 import io.sarl.core.Behaviors
 import io.sarl.core.DefaultContextInteractions
-import io.sarl.core.ExternalContextAccess
 import io.sarl.core.Initialize
 import io.sarl.core.InnerContextAccess
 import io.sarl.core.Lifecycle
 import io.sarl.core.Logging
 import io.sarl.core.MemberLeft
-import io.sarl.demos.fireworks.Exit
-import io.sarl.demos.fireworks.Freeze
-import io.sarl.demos.fireworks.Launch
-import io.sarl.demos.fireworks.Positions
-import io.sarl.demos.fireworks.Rocket
-import io.sarl.demos.fireworks.RocketReady
+import io.sarl.demos.fireworks.events.Exit
+import io.sarl.demos.fireworks.events.Freeze
+import io.sarl.demos.fireworks.events.Launch
+import io.sarl.demos.fireworks.events.RocketReady
 
 agent RocketLauncher {
 	
-	uses Logging, Behaviors, DefaultContextInteractions, InnerContextAccess, Lifecycle, ExternalContextAccess
+	uses Logging, Behaviors, DefaultContextInteractions, InnerContextAccess, Lifecycle
 	
 	var x: Double
 	var y: Double
diff --git a/src/main/sarl/io/sarl/demos/fireworks/events/events.sarl b/src/main/sarl/io/sarl/demos/fireworks/events/events.sarl
new file mode 100644
index 0000000..6e37d3d
--- /dev/null
+++ b/src/main/sarl/io/sarl/demos/fireworks/events/events.sarl
@@ -0,0 +1,49 @@
+package io.sarl.demos.fireworks.events
+
+event Launch
+
+event CreateArea
+
+event Explode
+
+event KillRocket
+
+event KillFire
+
+event RocketReady
+
+event UpdateRocketPosition
+
+event UpdateFirePosition
+
+event FireReady
+
+event SprayFire
+
+event Exit
+
+event SetupSettings {
+	var rocketsQuantity : Integer
+	var fireQuatity : Integer
+	var gravity : Double
+	var maxWidth : Double
+
+	new(rq : Integer, fq : Integer, grav : Double, max : Double) {
+		rocketsQuantity = rq
+		fireQuatity = fq
+		gravity = grav
+		maxWidth = max
+	}
+}
+
+
+event Freeze {
+	var value : boolean
+
+	new (value : boolean) {
+		this.value = value
+	}
+}
+
+
+
diff --git a/src/main/sarl/io/sarl/demos/fireworks/FXMLViewerController.java b/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.java
similarity index 93%
rename from src/main/sarl/io/sarl/demos/fireworks/FXMLViewerController.java
rename to src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.java
index e713e3a..51ccc80 100644
--- a/src/main/sarl/io/sarl/demos/fireworks/FXMLViewerController.java
+++ b/src/main/sarl/io/sarl/demos/fireworks/gui/FXMLViewerController.java
@@ -1,7 +1,13 @@
-package io.sarl.demos.fireworks;
+package io.sarl.demos.fireworks.gui;
 
 import java.util.UUID;
 
+import io.sarl.demos.fireworks.Firework;
+import io.sarl.demos.fireworks.agents.Positions;
+import io.sarl.demos.fireworks.events.CreateArea;
+import io.sarl.demos.fireworks.events.Exit;
+import io.sarl.demos.fireworks.events.Freeze;
+import io.sarl.demos.fireworks.events.SetupSettings;
 import io.sarl.lang.core.Event;
 import io.sarl.lang.core.EventListener;
 import io.sarl.util.OpenEventSpace;