diff --git a/SimulatoreBCNN/SimulatoreBCNN.iml b/SimulatoreBCNN/SimulatoreBCNN.iml
deleted file mode 100644
index c90834f..0000000
--- a/SimulatoreBCNN/SimulatoreBCNN.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/main/java/net/berack/upo/valpre/Main.java b/src/main/java/net/berack/upo/valpre/Main.java
new file mode 100644
index 0000000..aca9461
--- /dev/null
+++ b/src/main/java/net/berack/upo/valpre/Main.java
@@ -0,0 +1,7 @@
+package net.berack.upo.valpre;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}
\ No newline at end of file
diff --git a/SimulatoreBCNN/src/Sim.java b/src/main/java/net/berack/upo/valpre/bcnn/Sim.java
similarity index 97%
rename from SimulatoreBCNN/src/Sim.java
rename to src/main/java/net/berack/upo/valpre/bcnn/Sim.java
index fc19159..b060280 100644
--- a/SimulatoreBCNN/src/Sim.java
+++ b/src/main/java/net/berack/upo/valpre/bcnn/Sim.java
@@ -1,5 +1,7 @@
-import SimUtils.*;
-import SimUtils.Queue;
+package net.berack.upo.valpre.bcnn;
+
+import net.berack.upo.valpre.bcnn.simutil.*;
+import net.berack.upo.valpre.bcnn.simutil.Queue;
 
 import java.util.*;
 class Sim {
diff --git a/SimulatoreBCNN/src/SimUtils/Event.java b/src/main/java/net/berack/upo/valpre/bcnn/simutil/Event.java
similarity index 83%
rename from SimulatoreBCNN/src/SimUtils/Event.java
rename to src/main/java/net/berack/upo/valpre/bcnn/simutil/Event.java
index 113ccbb..94aa1ac 100644
--- a/SimulatoreBCNN/src/SimUtils/Event.java
+++ b/src/main/java/net/berack/upo/valpre/bcnn/simutil/Event.java
@@ -1,6 +1,6 @@
-package SimUtils;
+package net.berack.upo.valpre.bcnn.simutil;
 
-public class Event implements Comparable {
+public class Event implements Comparable<Object> {
 
     public Event(int a_type, double a_time) { _type = a_type; time = a_time; }
 
diff --git a/SimulatoreBCNN/src/SimUtils/EventList.java b/src/main/java/net/berack/upo/valpre/bcnn/simutil/EventList.java
similarity index 99%
rename from SimulatoreBCNN/src/SimUtils/EventList.java
rename to src/main/java/net/berack/upo/valpre/bcnn/simutil/EventList.java
index 448e65b..59ce126 100644
--- a/SimulatoreBCNN/src/SimUtils/EventList.java
+++ b/src/main/java/net/berack/upo/valpre/bcnn/simutil/EventList.java
@@ -1,4 +1,4 @@
-package SimUtils;
+package net.berack.upo.valpre.bcnn.simutil;
 
 // EventList is implemented as a splay tree
 // v1.  class Event knows this and has fields
diff --git a/SimulatoreBCNN/src/SimUtils/Queue.java b/src/main/java/net/berack/upo/valpre/bcnn/simutil/Queue.java
similarity index 99%
rename from SimulatoreBCNN/src/SimUtils/Queue.java
rename to src/main/java/net/berack/upo/valpre/bcnn/simutil/Queue.java
index 32f0f07..7efe322 100644
--- a/SimulatoreBCNN/src/SimUtils/Queue.java
+++ b/src/main/java/net/berack/upo/valpre/bcnn/simutil/Queue.java
@@ -1,4 +1,4 @@
-package SimUtils;
+package net.berack.upo.valpre.bcnn.simutil;
 
 /**