diff --git a/.gitignore b/.gitignore
index 9cf92e4445795a4e18bb4c6226694eaf597f0736..56b6a2d7ab5509614a8c028603dcc9cc70828630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ bin/
 *.html
 *.java~
 RemoteSystemsTempFiles/
-*~
+.DS_Store
+*~
\ No newline at end of file
diff --git a/org.bip.api/pom.xml b/org.javabip.api/pom.xml
similarity index 87%
rename from org.bip.api/pom.xml
rename to org.javabip.api/pom.xml
index 3bd32344b10c6b780b33972666c3f06653b36822..a592151b07f78e04395bda33b55aa2002849d1b7 100644
--- a/org.bip.api/pom.xml
+++ b/org.javabip.api/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent> 
-		<groupId>org.bip</groupId>
-		<artifactId>org.bip.parent</artifactId>
+		<groupId>org.javabip</groupId>
+		<artifactId>org.javabip.parent</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
-		<relativePath>../org.bip.parent/pom.xml</relativePath>
+		<relativePath>../org.javabip.parent/pom.xml</relativePath>
 	</parent>
 
-	<groupId>org.bip</groupId>
-	<artifactId>org.bip.api</artifactId>
+	<groupId>org.javabip</groupId>
+	<artifactId>org.javabip.api</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 
 	<name>BIP :: Core :: API</name>
diff --git a/org.bip.api/src/main/java/org/bip/annotations/ComponentType.java b/org.javabip.api/src/main/java/org/javabip/annotations/ComponentType.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/annotations/ComponentType.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/ComponentType.java
index 4b5b8a8e2b7c6243202bbcfc504bf37efe388120..62cd2e0346a2ac948ddf98e6a3acc84b3389421f 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/ComponentType.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/ComponentType.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/org.bip.api/src/main/java/org/bip/annotations/Data.java b/org.javabip.api/src/main/java/org/javabip/annotations/Data.java
similarity index 96%
rename from org.bip.api/src/main/java/org/bip/annotations/Data.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/Data.java
index bf4021727617f8bcc7ee91bcbf9a261a3a0e7c7f..570b095f29203f4b06d59d14fbbbf0efc0cfa594 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/Data.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/Data.java
@@ -18,12 +18,12 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import org.bip.api.DataOut.AccessType;
+import org.javabip.api.DataOut.AccessType;
 
 /**
  * It is used to annotated data sent between BIP components. It can be used as annotation on the code directly or
diff --git a/org.bip.api/src/main/java/org/bip/annotations/ExecutableBehaviour.java b/org.javabip.api/src/main/java/org/javabip/annotations/ExecutableBehaviour.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/annotations/ExecutableBehaviour.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/ExecutableBehaviour.java
index fe92a64378ada3f70cd5ff80fc56c28f15c01d44..8d36da4ce375c6871acda3a247b34bcb3a807a28 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/ExecutableBehaviour.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/ExecutableBehaviour.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/org.bip.api/src/main/java/org/bip/annotations/Guard.java b/org.javabip.api/src/main/java/org/javabip/annotations/Guard.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/annotations/Guard.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/Guard.java
index 39fe9522467079c6253058a07beb08daaca741c5..5c6d14866b43fdf31c76e87af7550cba9be1a58e 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/Guard.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/Guard.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/org.bip.api/src/main/java/org/bip/annotations/Port.java b/org.javabip.api/src/main/java/org/javabip/annotations/Port.java
similarity index 95%
rename from org.bip.api/src/main/java/org/bip/annotations/Port.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/Port.java
index 69eded8f6536e0fb8e3a392c9d1bc440b94d413a..68d666ed7428954a4870d9e2281dd7c4a38ff87b 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/Port.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/Port.java
@@ -18,12 +18,12 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import org.bip.api.PortType;
+import org.javabip.api.PortType;
 
 /**
  * It specifies the name and the type of the port.
diff --git a/org.bip.api/src/main/java/org/bip/annotations/Ports.java b/org.javabip.api/src/main/java/org/javabip/annotations/Ports.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/annotations/Ports.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/Ports.java
index efe524ebfc0d1b5f111854dfb74b274ca1d90c85..7c7ed9f2d401671901c1d0993153651ddedd8e23 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/Ports.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/Ports.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/org.bip.api/src/main/java/org/bip/annotations/Transition.java b/org.javabip.api/src/main/java/org/javabip/annotations/Transition.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/annotations/Transition.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/Transition.java
index 880ce16c2435224e642f7703e4c53781ff842319..b1ec989574a12c246e31f3125be3394276c9b626 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/Transition.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/Transition.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/org.bip.api/src/main/java/org/bip/annotations/Transitions.java b/org.javabip.api/src/main/java/org/javabip/annotations/Transitions.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/annotations/Transitions.java
rename to org.javabip.api/src/main/java/org/javabip/annotations/Transitions.java
index c23098083e57209cced948b184cedf0483450a97..743ef7699a1ce1a64a3a0b56fe385c51ad6c9b80 100644
--- a/org.bip.api/src/main/java/org/bip/annotations/Transitions.java
+++ b/org.javabip.api/src/main/java/org/javabip/annotations/Transitions.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.annotations;
+package org.javabip.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/org.bip.api/src/main/java/org/bip/api/Accept.java b/org.javabip.api/src/main/java/org/javabip/api/Accept.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/Accept.java
rename to org.javabip.api/src/main/java/org/javabip/api/Accept.java
index 3e2c028cc07cfdfe60e223912a43db738ee59979..721f40a0130d283ea0a02712e59f0c6b85874a66 100644
--- a/org.bip.api/src/main/java/org/bip/api/Accept.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Accept.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.Collection;
 
diff --git a/org.bip.api/src/main/java/org/bip/api/BIPActor.java b/org.javabip.api/src/main/java/org/javabip/api/BIPActor.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/BIPActor.java
rename to org.javabip.api/src/main/java/org/javabip/api/BIPActor.java
index 2d8e5a042850401f79881ba0d25b2e945d4ef7c7..5c43f5e4e422089b4758ab68d545f42c766919fe 100644
--- a/org.bip.api/src/main/java/org/bip/api/BIPActor.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/BIPActor.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.Map;
 
diff --git a/org.bip.api/src/main/java/org/bip/api/BIPActorAware.java b/org.javabip.api/src/main/java/org/javabip/api/BIPActorAware.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/api/BIPActorAware.java
rename to org.javabip.api/src/main/java/org/javabip/api/BIPActorAware.java
index 4469bda86971fb46a9f6b764695fe3190b57be3e..e58743d3f8a5b0a9d8831a531ce64aa6e4bbcf1f 100644
--- a/org.bip.api/src/main/java/org/bip/api/BIPActorAware.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/BIPActorAware.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 public interface BIPActorAware {
 
diff --git a/org.bip.api/src/main/java/org/bip/api/BIPComponent.java b/org.javabip.api/src/main/java/org/javabip/api/BIPComponent.java
similarity index 99%
rename from org.bip.api/src/main/java/org/bip/api/BIPComponent.java
rename to org.javabip.api/src/main/java/org/javabip/api/BIPComponent.java
index 46cdbff7151b94d0f616eb23b105d9807bce33d9..e511024e715ff7b63b7676c005376ed4cb15d7ba 100644
--- a/org.bip.api/src/main/java/org/bip/api/BIPComponent.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/BIPComponent.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.List;
 import java.util.Map;
diff --git a/org.bip.api/src/main/java/org/bip/api/BIPEngine.java b/org.javabip.api/src/main/java/org/javabip/api/BIPEngine.java
similarity index 99%
rename from org.bip.api/src/main/java/org/bip/api/BIPEngine.java
rename to org.javabip.api/src/main/java/org/javabip/api/BIPEngine.java
index b3ff2102674cb977e8ffe3d76d4f15a6b9cba2d6..471ce1e8a56e76a5770c744632c3221d1d1cb073 100644
--- a/org.bip.api/src/main/java/org/bip/api/BIPEngine.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/BIPEngine.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/org.bip.api/src/main/java/org/bip/api/BIPGlue.java b/org.javabip.api/src/main/java/org/javabip/api/BIPGlue.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/BIPGlue.java
rename to org.javabip.api/src/main/java/org/javabip/api/BIPGlue.java
index 3b6f79b01a26c15f2293d15dbf7eed9a823bd7bf..b47513128123c0515cda4247284c34120a19ca9b 100644
--- a/org.bip.api/src/main/java/org/bip/api/BIPGlue.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/BIPGlue.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.io.OutputStream;
 import java.util.List;
diff --git a/org.bip.api/src/main/java/org/bip/api/BIPSpec.java b/org.javabip.api/src/main/java/org/javabip/api/BIPSpec.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/api/BIPSpec.java
rename to org.javabip.api/src/main/java/org/javabip/api/BIPSpec.java
index 8ea7ff7c64530ce5b768a84ef724975b5f12df48..cdb721e231a8d63c6b5ab0e17e847e2b0c8f08c5 100644
--- a/org.bip.api/src/main/java/org/bip/api/BIPSpec.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/BIPSpec.java
@@ -18,7 +18,7 @@
  * Date: 12.07.15
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * Marker interface to publish BIP specifications service that will be picked up by the BIP engine.
diff --git a/org.bip.api/src/main/java/org/bip/api/Behaviour.java b/org.javabip.api/src/main/java/org/javabip/api/Behaviour.java
similarity index 99%
rename from org.bip.api/src/main/java/org/bip/api/Behaviour.java
rename to org.javabip.api/src/main/java/org/javabip/api/Behaviour.java
index 112de42afae60c532d42a73dd08cec6152cf2e0e..7a975dc84d1ffe575bcc15d0ebe39fe74b09bfd2 100644
--- a/org.bip.api/src/main/java/org/bip/api/Behaviour.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Behaviour.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.List;
 import java.util.Map;
diff --git a/org.bip.api/src/main/java/org/bip/api/ComponentProvider.java b/org.javabip.api/src/main/java/org/javabip/api/ComponentProvider.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/ComponentProvider.java
rename to org.javabip.api/src/main/java/org/javabip/api/ComponentProvider.java
index 0a3b3b1f99787c69adc89ffd7336483ee82ef151..82cd518f245c4ccce71fa163bca864affe668675 100644
--- a/org.bip.api/src/main/java/org/bip/api/ComponentProvider.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/ComponentProvider.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * ComponentProvider is used for example by the Port to be able to have information about the component instance it
diff --git a/org.bip.api/src/main/java/org/bip/api/Data.java b/org.javabip.api/src/main/java/org/javabip/api/Data.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/Data.java
rename to org.javabip.api/src/main/java/org/javabip/api/Data.java
index 222473d3c05568bc1030ce57e4dc60ded3bc3264..8fe9c0c128e81ceca4f9a584c210102a881fce5b 100644
--- a/org.bip.api/src/main/java/org/bip/api/Data.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Data.java
@@ -18,7 +18,7 @@
  * Date: 15.10.13
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * Interface used to specify the identity and type of the data required by transitions/guards.
diff --git a/org.bip.api/src/main/java/org/bip/api/DataOut.java b/org.javabip.api/src/main/java/org/javabip/api/DataOut.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/DataOut.java
rename to org.javabip.api/src/main/java/org/javabip/api/DataOut.java
index 5af6ca6ad293b91a58c0f7b2d4a94b24317a9d1f..3e88b52a0540bb8eb3b8710138c5cb8eda059aa3 100644
--- a/org.bip.api/src/main/java/org/bip/api/DataOut.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/DataOut.java
@@ -18,7 +18,7 @@
  * Date: 24.01.14
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.Set;
 
diff --git a/org.bip.api/src/main/java/org/bip/api/DataWire.java b/org.javabip.api/src/main/java/org/javabip/api/DataWire.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/DataWire.java
rename to org.javabip.api/src/main/java/org/javabip/api/DataWire.java
index eeffdecf8e2400f5d9b3b8d44ceb9a0705006fb4..98b3086e12deb617e8c2ae73da00b960c156079e 100644
--- a/org.bip.api/src/main/java/org/bip/api/DataWire.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/DataWire.java
@@ -18,7 +18,7 @@
  * Date: 15.10.13
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * Datawire is part of BIP glue to specify data transfers occurring between BIP components.
diff --git a/org.bip.api/src/main/java/org/bip/api/ExecutableBehaviour.java b/org.javabip.api/src/main/java/org/javabip/api/ExecutableBehaviour.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/ExecutableBehaviour.java
rename to org.javabip.api/src/main/java/org/javabip/api/ExecutableBehaviour.java
index 5b693480d4656dee7ec57e70f3b2f409e368971f..667cd6468dfca281612b9ca4108bed99eb2d8758 100644
--- a/org.bip.api/src/main/java/org/bip/api/ExecutableBehaviour.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/ExecutableBehaviour.java
@@ -18,7 +18,7 @@
  * Date: 27.01.14
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.InvocationTargetException;
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.bip.exceptions.BIPException;
+import org.javabip.exceptions.BIPException;
 
 /**
  * It provides an executable behavior that makes it possible to execute transitions within the behavior.
diff --git a/org.bip.api/src/main/java/org/bip/api/Executor.java b/org.javabip.api/src/main/java/org/javabip/api/Executor.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/Executor.java
rename to org.javabip.api/src/main/java/org/javabip/api/Executor.java
index 212971636004e14f31cc61bd878553b4755e139e..b18ff1b3fd5461817dbfa009018ddf18bb601a80 100644
--- a/org.bip.api/src/main/java/org/bip/api/Executor.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Executor.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * It specifies the interface for the executor that governs the execution of the BIP component.
diff --git a/org.bip.api/src/main/java/org/bip/api/Guard.java b/org.javabip.api/src/main/java/org/javabip/api/Guard.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/Guard.java
rename to org.javabip.api/src/main/java/org/javabip/api/Guard.java
index 344899a9c7973adfc6f292ebd15bd506a702da01..9cce62027c82b572b21cdc19fdd1baf36662bcc1 100644
--- a/org.bip.api/src/main/java/org/bip/api/Guard.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Guard.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.Collection;
 
diff --git a/org.bip.api/src/main/java/org/bip/api/Identifiable.java b/org.javabip.api/src/main/java/org/javabip/api/Identifiable.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/api/Identifiable.java
rename to org.javabip.api/src/main/java/org/javabip/api/Identifiable.java
index cafd61f7181c05c2c0fb03fd74493a9002a8e368..ec5584371142f5b3938f123d2fbb64bfde9a44b7 100644
--- a/org.bip.api/src/main/java/org/bip/api/Identifiable.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Identifiable.java
@@ -18,7 +18,7 @@
  * Date: 27.01.14
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * It specifies that a given BIP entity has an id that can be used to identify it.
diff --git a/org.bip.api/src/main/java/org/bip/api/MutableIdentification.java b/org.javabip.api/src/main/java/org/javabip/api/MutableIdentification.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/api/MutableIdentification.java
rename to org.javabip.api/src/main/java/org/javabip/api/MutableIdentification.java
index cd448e14951c227ebee12a100c474b1f6f2cbc5a..c2d45625ac25bfd4c9200acc1b14e2dd52797b67 100644
--- a/org.bip.api/src/main/java/org/bip/api/MutableIdentification.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/MutableIdentification.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * TODO NOW does it???
diff --git a/org.bip.api/src/main/java/org/bip/api/OrchestratedExecutor.java b/org.javabip.api/src/main/java/org/javabip/api/OrchestratedExecutor.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/api/OrchestratedExecutor.java
rename to org.javabip.api/src/main/java/org/javabip/api/OrchestratedExecutor.java
index b9f239bec30fb0338626ffac10edac95bf10edbc..4ec00951a88b4f239b962379ad3205a6a24a9e71 100644
--- a/org.bip.api/src/main/java/org/bip/api/OrchestratedExecutor.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/OrchestratedExecutor.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * 
diff --git a/org.bip.api/src/main/java/org/bip/api/Port.java b/org.javabip.api/src/main/java/org/javabip/api/Port.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/api/Port.java
rename to org.javabip.api/src/main/java/org/javabip/api/Port.java
index 874561868546636856ce8634381c2ce6ff5c7452..2919c5a8ceb2463996ea3c7608e4e74396e5a6fb 100644
--- a/org.bip.api/src/main/java/org/bip/api/Port.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Port.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * It specifies the interface for component ports which can be enforceable or spontaneous.
diff --git a/org.bip.api/src/main/java/org/bip/api/PortBase.java b/org.javabip.api/src/main/java/org/javabip/api/PortBase.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/PortBase.java
rename to org.javabip.api/src/main/java/org/javabip/api/PortBase.java
index 5733c10fceb1e80f7089dd7644f361cc4017f3aa..ea48c0f7ae9a8e713829f7e44245bb1a53a1df3f 100644
--- a/org.bip.api/src/main/java/org/bip/api/PortBase.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/PortBase.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * It specifies the functionality of the BIP component port.
diff --git a/org.bip.api/src/main/java/org/bip/api/PortType.java b/org.javabip.api/src/main/java/org/javabip/api/PortType.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/api/PortType.java
rename to org.javabip.api/src/main/java/org/javabip/api/PortType.java
index e42c90a1d5915c511f91368dd0e0f38c2288c33a..51c8c8b96098e2a90faac55369f6753b0c9cb78e 100644
--- a/org.bip.api/src/main/java/org/bip/api/PortType.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/PortType.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * The enum specifying different port types.
diff --git a/org.bip.api/src/main/java/org/bip/api/Publishable.java b/org.javabip.api/src/main/java/org/javabip/api/Publishable.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/Publishable.java
rename to org.javabip.api/src/main/java/org/javabip/api/Publishable.java
index 133395cf7e630167f60d29db87cb70f59bd351c6..fd72107cdd5d675a7bc60648b8451613414ecdd7 100644
--- a/org.bip.api/src/main/java/org/bip/api/Publishable.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Publishable.java
@@ -18,7 +18,7 @@
  * Date: 27.01.14
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 /**
  * It specifies that a BIP entity can publish itself using framework mechanisms and make it visible to other BIP
diff --git a/org.bip.api/src/main/java/org/bip/api/Require.java b/org.javabip.api/src/main/java/org/javabip/api/Require.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/Require.java
rename to org.javabip.api/src/main/java/org/javabip/api/Require.java
index 018dfcefa522f9f69dd3d1404de22e9987746025..6564be789f642ca99f12337ed5b8a05c1ec42774 100644
--- a/org.bip.api/src/main/java/org/bip/api/Require.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Require.java
@@ -18,7 +18,7 @@
  * Date: 15.10.12
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.List;
 
diff --git a/org.bip.api/src/main/java/org/bip/api/Transition.java b/org.javabip.api/src/main/java/org/javabip/api/Transition.java
similarity index 98%
rename from org.bip.api/src/main/java/org/bip/api/Transition.java
rename to org.javabip.api/src/main/java/org/javabip/api/Transition.java
index 496059abb0dc33d1785a9deb590184c51ba85a6b..97381149bd5b9205404ddcce3242515957d72352 100644
--- a/org.bip.api/src/main/java/org/bip/api/Transition.java
+++ b/org.javabip.api/src/main/java/org/javabip/api/Transition.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.api;
+package org.javabip.api;
 
 import java.util.Collection;
 
diff --git a/org.bip.api/src/main/java/org/bip/exceptions/BIPEngineException.java b/org.javabip.api/src/main/java/org/javabip/exceptions/BIPEngineException.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/exceptions/BIPEngineException.java
rename to org.javabip.api/src/main/java/org/javabip/exceptions/BIPEngineException.java
index 9329e6e447b3dcc1c4ee04bdb4c178624d57a7cf..2f26d85975146b63912fd924bdec88b90a5733da 100644
--- a/org.bip.api/src/main/java/org/bip/exceptions/BIPEngineException.java
+++ b/org.javabip.api/src/main/java/org/javabip/exceptions/BIPEngineException.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.exceptions;
+package org.javabip.exceptions;
 
 /**
  * It specifies the exception specific to BIP Engine functionality.
diff --git a/org.bip.api/src/main/java/org/bip/exceptions/BIPException.java b/org.javabip.api/src/main/java/org/javabip/exceptions/BIPException.java
similarity index 97%
rename from org.bip.api/src/main/java/org/bip/exceptions/BIPException.java
rename to org.javabip.api/src/main/java/org/javabip/exceptions/BIPException.java
index 180757c2dc73235ed3f4fbe83642bc43e46d311e..f76158c1934f868ea60e3c2be602772cdee96920 100644
--- a/org.bip.api/src/main/java/org/bip/exceptions/BIPException.java
+++ b/org.javabip.api/src/main/java/org/javabip/exceptions/BIPException.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.exceptions;
+package org.javabip.exceptions;
 
 /**
  * It specifies the exception specific to BIP functionality.
diff --git a/org.bip.executor.impl/pom.xml b/org.javabip.executor.impl/pom.xml
similarity index 86%
rename from org.bip.executor.impl/pom.xml
rename to org.javabip.executor.impl/pom.xml
index be5a2db5a8c5c7e6570b6408ba5fd1cfccad1e7d..1de24cb04253e03f3542e33f35048ce6e9ce6d61 100644
--- a/org.bip.executor.impl/pom.xml
+++ b/org.javabip.executor.impl/pom.xml
@@ -2,14 +2,14 @@
   <modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.bip</groupId>
-		<artifactId>org.bip.parent</artifactId>
+		<groupId>org.javabip</groupId>
+		<artifactId>org.javabip.parent</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
-		<relativePath>../org.bip.parent/pom.xml</relativePath>
+		<relativePath>../org.javabip.parent/pom.xml</relativePath>
 	</parent>
  
-  <groupId>org.bip</groupId>
-  <artifactId>org.bip.executor.impl</artifactId>
+  <groupId>org.javabip</groupId>
+  <artifactId>org.javabip.executor.impl</artifactId>
   <version>0.1.0-SNAPSHOT</version>
  
   <name>BIP :: Core :: ExecutorImpl</name>
@@ -19,10 +19,10 @@
 <packaging>bundle</packaging>
 
 	<properties>
-		<activator>org.bip.executor.impl.akka.ExecutorActorSystemActivator</activator>
+		<activator>org.javabip.executor.impl.akka.ExecutorActorSystemActivator</activator>
 		<osgi.private></osgi.private>
 		<osgi.import>!sun.misc, org.springframework.beans.factory;version="[2.5,4)", *</osgi.import>
- 		<osgi.export>org.bip.executor.springinosgi, org.bip.executor.impl.akka</osgi.export>
+ 		<osgi.export>org.javabip.executor.springinosgi, org.javabip.executor.impl.akka</osgi.export>
 		<osgi.dynamic.import></osgi.dynamic.import>
 		<osgi.bundles></osgi.bundles> 		
 <!-- 		<osgi.embed.depdendencies>akka-actor_2.10, akka-osgi_2.10, config, scala-library</osgi.embed.depdendencies> -->
@@ -32,13 +32,13 @@
 	<dependencies>
 
  	  	<dependency>
-  			<groupId>org.bip</groupId>
-  			<artifactId>org.bip.api</artifactId>
+  			<groupId>org.javabip</groupId>
+  			<artifactId>org.javabip.api</artifactId>
   		</dependency>
    		
  	 	<dependency>
-			<groupId>org.bip</groupId>
-  			<artifactId>org.bip.executor</artifactId>
+			<groupId>org.javabip</groupId>
+  			<artifactId>org.javabip.executor</artifactId>
 		</dependency>
        
  		<dependency>
@@ -127,7 +127,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<includes>
-						<include>**/org/bip/executor/*Tests.class</include>
+						<include>**/org/javabip/executor/*Tests.class</include>
 					</includes>
 					<systemPropertyVariables>
 					  <log4j.configuration>file:${basedir}/src/test/resources/log4j-build.properties</log4j.configuration>
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaExecutorKernel.java b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaExecutorKernel.java
similarity index 91%
rename from org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaExecutorKernel.java
rename to org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaExecutorKernel.java
index 28a82b2385827572f4c12efe152e65cd9ff79065..ff2d075928706f1741613188ad207b3e0907478f 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaExecutorKernel.java
+++ b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaExecutorKernel.java
@@ -16,10 +16,10 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor.impl.akka;
+package org.javabip.executor.impl.akka;
 
-import org.bip.exceptions.BIPException;
-import org.bip.executor.ExecutorKernel;
+import org.javabip.exceptions.BIPException;
+import org.javabip.executor.ExecutorKernel;
 
 import akka.actor.TypedActor;
 
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutor.java b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaOrchestratedExecutor.java
similarity index 91%
rename from org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutor.java
rename to org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaOrchestratedExecutor.java
index 8312f622b2725fe9b4a8d5080ca7c9edc05a9e6e..c3823f8299152b40702916b9730f7c6b004719dc 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutor.java
+++ b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaOrchestratedExecutor.java
@@ -16,9 +16,9 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor.impl.akka;
+package org.javabip.executor.impl.akka;
 
-import org.bip.api.OrchestratedExecutor;
+import org.javabip.api.OrchestratedExecutor;
 
 public interface AkkaOrchestratedExecutor extends OrchestratedExecutor {
 
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
similarity index 94%
rename from org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
rename to org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
index 586382fca56ced1f4f26694ba9655705fa4e8a2c..d64ad3c205a64cebcf3ce660dc24f2062af5d811 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
+++ b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
@@ -16,14 +16,14 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor.impl.akka;
+package org.javabip.executor.impl.akka;
 
 import java.util.List;
 import java.util.Map;
 
-import org.bip.api.BIPEngine;
-import org.bip.api.OrchestratedExecutor;
-import org.bip.api.PortBase;
+import org.javabip.api.BIPEngine;
+import org.javabip.api.OrchestratedExecutor;
+import org.javabip.api.PortBase;
 
 import akka.actor.ActorSystem;
 import akka.actor.TypedActor;
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/ExecutorActorSystemActivator.java b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/ExecutorActorSystemActivator.java
similarity index 96%
rename from org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/ExecutorActorSystemActivator.java
rename to org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/ExecutorActorSystemActivator.java
index 566968137c736bb7b2b453045f9bb3f5e6f40aa6..9853ca4f85c626f130c1f4c03646ecd864be33d0 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/ExecutorActorSystemActivator.java
+++ b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/ExecutorActorSystemActivator.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor.impl.akka;
+package org.javabip.executor.impl.akka;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/OrchestratedExecutorFactory.java b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/OrchestratedExecutorFactory.java
similarity index 97%
rename from org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/OrchestratedExecutorFactory.java
rename to org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/OrchestratedExecutorFactory.java
index d1a2c9f08eadb45d71a209f77e4c1a584fa30129..36c2be4684b7913f1eb92aa95fdd25cf2e0745d8 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/OrchestratedExecutorFactory.java
+++ b/org.javabip.executor.impl/src/main/java/org/javabip/executor/impl/akka/OrchestratedExecutorFactory.java
@@ -16,9 +16,9 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor.impl.akka;
+package org.javabip.executor.impl.akka;
 
-import org.bip.api.Executor;
+import org.javabip.api.Executor;
 
 import akka.actor.ActorSystem;
 
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/springinosgi/ExecutorOSGiImpl.java b/org.javabip.executor.impl/src/main/java/org/javabip/executor/springinosgi/ExecutorOSGiImpl.java
similarity index 92%
rename from org.bip.executor.impl/src/main/java/org/bip/executor/springinosgi/ExecutorOSGiImpl.java
rename to org.javabip.executor.impl/src/main/java/org/javabip/executor/springinosgi/ExecutorOSGiImpl.java
index ec22386e32621d80dcf3f820c9f1c639213a9729..53f28f4e0c6bcab360c071b7bc85a8e5210dec09 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/springinosgi/ExecutorOSGiImpl.java
+++ b/org.javabip.executor.impl/src/main/java/org/javabip/executor/springinosgi/ExecutorOSGiImpl.java
@@ -17,18 +17,18 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.executor.springinosgi;
+package org.javabip.executor.springinosgi;
 
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
-import org.bip.api.BIPComponent;
-import org.bip.api.BIPEngine;
-import org.bip.api.Executor;
-import org.bip.api.PortBase;
-import org.bip.api.Publishable;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.BIPComponent;
+import org.javabip.api.BIPEngine;
+import org.javabip.api.Executor;
+import org.javabip.api.PortBase;
+import org.javabip.api.Publishable;
+import org.javabip.exceptions.BIPException;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
diff --git a/org.bip.executor/pom.xml b/org.javabip.executor/pom.xml
similarity index 86%
rename from org.bip.executor/pom.xml
rename to org.javabip.executor/pom.xml
index b1b248e96340d3d511f974994eeae79d9d6e16ee..674901865eb34880ddb10221823d574c5f3c0c3c 100644
--- a/org.bip.executor/pom.xml
+++ b/org.javabip.executor/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.bip</groupId>
-		<artifactId>org.bip.parent</artifactId>
+		<groupId>org.javabip</groupId>
+		<artifactId>org.javabip.parent</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
-		<relativePath>../org.bip.parent/pom.xml</relativePath>
+		<relativePath>../org.javabip.parent/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.bip.executor</artifactId>
+	<artifactId>org.javabip.executor</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 	<name>BIP :: Core :: Executor</name>
 	<description>It contains all the classes for the BIP executor functionality.</description>
@@ -17,13 +17,13 @@
 
 	<properties>
 		<osgi.private>
-			org.bip.executor.guardparser
+			org.javabip.executor.guardparser
 		</osgi.private>
-		<osgi.import>org.bip.annotations, org.bip.api, org.bip.exceptions,
-			org.bip.glue, org.slf4j, *
+		<osgi.import>org.javabip.annotations, org.javabip.api, org.javabip.exceptions,
+			org.javabip.glue, org.slf4j, *
 		</osgi.import>
 		<osgi.export>
-			org.bip.executor 
+			org.javabip.executor 
 		</osgi.export>
 		<osgi.dynamic.import></osgi.dynamic.import>
 		<osgi.bundles></osgi.bundles>
@@ -34,8 +34,8 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.bip</groupId>
-			<artifactId>org.bip.api</artifactId>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.api</artifactId>
 		</dependency>
 
 		<dependency>
@@ -106,7 +106,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<includes>
-						<include>**/org/bip/executor/*Tests.class</include>
+						<include>**/org/javabip/executor/*Tests.class</include>
 					</includes>
 					<systemPropertyVariables>
 						<log4j.configuration>file:${basedir}/src/test/resources/log4j-build.properties</log4j.configuration>
diff --git a/org.bip.executor/src/main/java/org/bip/executor/BehaviourBuilder.java b/org.javabip.executor/src/main/java/org/javabip/executor/BehaviourBuilder.java
similarity index 97%
rename from org.bip.executor/src/main/java/org/bip/executor/BehaviourBuilder.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/BehaviourBuilder.java
index 8d79b021c09ef9f2feaa4dd9b34bee5bed8b3d3e..f9542b41a450ef3d678eb4aabc93028d591e55b2 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/BehaviourBuilder.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/BehaviourBuilder.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -29,13 +29,13 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
-import org.bip.api.ComponentProvider;
-import org.bip.api.Data;
-import org.bip.api.ExecutableBehaviour;
-import org.bip.api.Guard;
-import org.bip.api.Port;
-import org.bip.api.PortType;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.ComponentProvider;
+import org.javabip.api.Data;
+import org.javabip.api.ExecutableBehaviour;
+import org.javabip.api.Guard;
+import org.javabip.api.Port;
+import org.javabip.api.PortType;
+import org.javabip.exceptions.BIPException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -390,7 +390,7 @@ public class BehaviourBuilder {
 	 * @param annotation
 	 *            the data annotation
 	 */
-	public void addDataOut(Method method, org.bip.annotations.Data annotation) {
+	public void addDataOut(Method method, org.javabip.annotations.Data annotation) {
 
 		DataOutImpl<?> data = ReflectionHelper.parseReturnDataAnnotation(method, annotation);
 		dataOut.add(data);
diff --git a/org.bip.executor/src/main/java/org/bip/executor/BehaviourImpl.java b/org.javabip.executor/src/main/java/org/javabip/executor/BehaviourImpl.java
similarity index 98%
rename from org.bip.executor/src/main/java/org/bip/executor/BehaviourImpl.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/BehaviourImpl.java
index 14d5d151028d8a5918d94dc7a39ea92057e65c96..f3b35ddd27a20015a614f3506c3a6a6e476f750f 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/BehaviourImpl.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/BehaviourImpl.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.InvocationTargetException;
@@ -29,14 +29,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.bip.api.Data;
-import org.bip.api.DataOut;
-import org.bip.api.ExecutableBehaviour;
-import org.bip.api.Guard;
-import org.bip.api.Port;
-import org.bip.api.PortType;
-import org.bip.api.Transition;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.Data;
+import org.javabip.api.DataOut;
+import org.javabip.api.ExecutableBehaviour;
+import org.javabip.api.Guard;
+import org.javabip.api.Port;
+import org.javabip.api.PortType;
+import org.javabip.api.Transition;
+import org.javabip.exceptions.BIPException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.executor/src/main/java/org/bip/executor/DataImpl.java b/org.javabip.executor/src/main/java/org/javabip/executor/DataImpl.java
similarity index 94%
rename from org.bip.executor/src/main/java/org/bip/executor/DataImpl.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/DataImpl.java
index c2f92b6ac55605d8fc1aa703ca372cde12050a27..1d55649978077fa145b5a217217cc81446c0871f 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/DataImpl.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/DataImpl.java
@@ -18,10 +18,10 @@
  * Date: 27/01/14
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
-import org.bip.api.Data;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.Data;
+import org.javabip.exceptions.BIPException;
 
 /**
  * Provides data, specified as dataIn or dataOut. DataIn will have a name and the value type, dataOut will have a name,
diff --git a/org.bip.executor/src/main/java/org/bip/executor/DataOutImpl.java b/org.javabip.executor/src/main/java/org/javabip/executor/DataOutImpl.java
similarity index 96%
rename from org.bip.executor/src/main/java/org/bip/executor/DataOutImpl.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/DataOutImpl.java
index f380ad74d8bdab897e0e5f00eaccc4b1f61cfa78..da82ce799204947f1ef5c472d386cf90dc395f73 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/DataOutImpl.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/DataOutImpl.java
@@ -18,15 +18,15 @@
  * Date: 27/01/14
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.bip.api.DataOut;
-import org.bip.api.Port;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.DataOut;
+import org.javabip.api.Port;
+import org.javabip.exceptions.BIPException;
 
 /**
  * Provides data, specified as dataIn or dataOut. DataIn will have a name and the value type, dataOut will have a name,
diff --git a/org.bip.executor/src/main/java/org/bip/executor/ExceptionHelper.java b/org.javabip.executor/src/main/java/org/javabip/executor/ExceptionHelper.java
similarity index 98%
rename from org.bip.executor/src/main/java/org/bip/executor/ExceptionHelper.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/ExceptionHelper.java
index bb4d7e1d6e3ed217c3bbd93c08cc8dfddcb104f7..6ec8f5b1656fde42db64066ae0d82dc4550d148b 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/ExceptionHelper.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/ExceptionHelper.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import org.slf4j.Logger;
 
diff --git a/org.bip.executor/src/main/java/org/bip/executor/ExecutableTransition.java b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutableTransition.java
similarity index 94%
rename from org.bip.executor/src/main/java/org/bip/executor/ExecutableTransition.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/ExecutableTransition.java
index 8ce398ba4625b026fe1b54b8af0c143fd5bc550c..e195dce81cb542586cb247e81fba3bb54701ab1d 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/ExecutableTransition.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutableTransition.java
@@ -17,15 +17,15 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 27/01/14
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import org.bip.api.Data;
-import org.bip.api.PortType;
-import org.bip.api.Transition;
+import org.javabip.api.Data;
+import org.javabip.api.PortType;
+import org.javabip.api.Transition;
 
 /**
  * This interface specifies a transition which can be executed.
diff --git a/org.bip.executor/src/main/java/org/bip/executor/ExecutableTransitionImpl.java b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutableTransitionImpl.java
similarity index 93%
rename from org.bip.executor/src/main/java/org/bip/executor/ExecutableTransitionImpl.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/ExecutableTransitionImpl.java
index 4a7c718477400a8eebe89386ff830d07342e1839..c87fb78d88d6ef17267dd9bdd49bd5b0138a7763 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/ExecutableTransitionImpl.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutableTransitionImpl.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Method;
@@ -25,12 +25,12 @@ import java.util.Map;
 
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
-import org.bip.api.Data;
-import org.bip.api.Guard;
-import org.bip.api.PortType;
-import org.bip.exceptions.BIPException;
-import org.bip.executor.guardparser.boolLexer;
-import org.bip.executor.guardparser.boolParser;
+import org.javabip.api.Data;
+import org.javabip.api.Guard;
+import org.javabip.api.PortType;
+import org.javabip.exceptions.BIPException;
+import org.javabip.executor.guardparser.boolLexer;
+import org.javabip.executor.guardparser.boolParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.executor/src/main/java/org/bip/executor/ExecutorHandler.java b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutorHandler.java
similarity index 91%
rename from org.bip.executor/src/main/java/org/bip/executor/ExecutorHandler.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/ExecutorHandler.java
index 20459ee2a12999c9437a78005cd9fc074684cf5a..cc934be8ef1d4ebde1d47e917357e3e3c01710bf 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/ExecutorHandler.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutorHandler.java
@@ -16,17 +16,17 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.bip.api.BIPActor;
-import org.bip.api.BIPComponent;
-import org.bip.api.Executor;
-import org.bip.api.Identifiable;
-import org.bip.api.OrchestratedExecutor;
+import org.javabip.api.BIPActor;
+import org.javabip.api.BIPComponent;
+import org.javabip.api.Executor;
+import org.javabip.api.Identifiable;
+import org.javabip.api.OrchestratedExecutor;
 
 public class ExecutorHandler implements InvocationHandler {
 
diff --git a/org.bip.executor/src/main/java/org/bip/executor/ExecutorKernel.java b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutorKernel.java
similarity index 97%
rename from org.bip.executor/src/main/java/org/bip/executor/ExecutorKernel.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/ExecutorKernel.java
index 997a30fe5eaacae9788935ce49f823f07409d543..04178646c1bc6d0e3df889a2df7265d89ff02d7b 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/ExecutorKernel.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/ExecutorKernel.java
@@ -6,7 +6,7 @@
  * Date: 10/15/12
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -17,15 +17,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.bip.api.BIPActorAware;
-import org.bip.api.BIPComponent;
-import org.bip.api.BIPEngine;
-import org.bip.api.Behaviour;
-import org.bip.api.ComponentProvider;
-import org.bip.api.OrchestratedExecutor;
-import org.bip.api.Port;
-import org.bip.api.PortBase;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.BIPActorAware;
+import org.javabip.api.BIPComponent;
+import org.javabip.api.BIPEngine;
+import org.javabip.api.Behaviour;
+import org.javabip.api.ComponentProvider;
+import org.javabip.api.OrchestratedExecutor;
+import org.javabip.api.Port;
+import org.javabip.api.PortBase;
+import org.javabip.exceptions.BIPException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.executor/src/main/java/org/bip/executor/GuardImpl.java b/org.javabip.executor/src/main/java/org/javabip/executor/GuardImpl.java
similarity index 97%
rename from org.bip.executor/src/main/java/org/bip/executor/GuardImpl.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/GuardImpl.java
index d1d0c9c2615b98119d720ceac7a86d7dffc35a17..b1a4aa95ea374448fc5ea962a30a6309bad127cd 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/GuardImpl.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/GuardImpl.java
@@ -18,7 +18,7 @@
  * Date: 27/01/14
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -28,8 +28,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.bip.api.Data;
-import org.bip.api.Guard;
+import org.javabip.api.Data;
+import org.javabip.api.Guard;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.executor/src/main/java/org/bip/executor/GuardTreeNode.java b/org.javabip.executor/src/main/java/org/javabip/executor/GuardTreeNode.java
similarity index 97%
rename from org.bip.executor/src/main/java/org/bip/executor/GuardTreeNode.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/GuardTreeNode.java
index 1138fb7edd6f399483bdec88cdfebd8b949d8f79..cb9a9855078d5b8b3bd3ed8b3222472e12d9af87 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/GuardTreeNode.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/GuardTreeNode.java
@@ -16,14 +16,14 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 
-import org.bip.api.Guard;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.Guard;
+import org.javabip.exceptions.BIPException;
 
 // TODO DESIGN do we have to keep this class public?, make it private refactor guardparser into this package.
 /**
diff --git a/org.bip.executor/src/main/java/org/bip/executor/PortImpl.java b/org.javabip.executor/src/main/java/org/javabip/executor/PortImpl.java
similarity index 95%
rename from org.bip.executor/src/main/java/org/bip/executor/PortImpl.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/PortImpl.java
index 717eff90fdbfce0a086d9b80215bad8300613cc9..518308ee6022f926e9317876254a3316b1af3844 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/PortImpl.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/PortImpl.java
@@ -17,15 +17,15 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.bip.api.BIPComponent;
-import org.bip.api.ComponentProvider;
-import org.bip.api.Port;
-import org.bip.api.PortType;
+import org.javabip.api.BIPComponent;
+import org.javabip.api.ComponentProvider;
+import org.javabip.api.Port;
+import org.javabip.api.PortType;
 
 /**
  * Provides information about the port: id, specification type and portType which can be enforceable or spontaneous.
diff --git a/org.bip.executor/src/main/java/org/bip/executor/ReflectionHelper.java b/org.javabip.executor/src/main/java/org/javabip/executor/ReflectionHelper.java
similarity index 89%
rename from org.bip.executor/src/main/java/org/bip/executor/ReflectionHelper.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/ReflectionHelper.java
index 18bb7008687af37e2ae0f5e5363ed47c13030995..e1bbf366642822ed9bba2a3d40ad464b855f4fd0 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/ReflectionHelper.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/ReflectionHelper.java
@@ -18,16 +18,16 @@
  * Date: 27/01/14
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.bip.api.Data;
-import org.bip.api.DataOut.AccessType;
-import org.bip.exceptions.BIPException;
+import org.javabip.api.Data;
+import org.javabip.api.DataOut.AccessType;
+import org.javabip.exceptions.BIPException;
 
 /**
  * A helper class providing functionality to parse the data-related information, such as annotations to method and
@@ -61,8 +61,8 @@ class ReflectionHelper {
 		Annotation[][] paramsAnnotations = method.getParameterAnnotations();
 		for (int i = 0; i < paramsAnnotations.length; i++) {
 			for (Annotation annotation : paramsAnnotations[i]) {
-				if (annotation instanceof org.bip.annotations.Data) {
-					org.bip.annotations.Data dataAnnotation = (org.bip.annotations.Data) annotation;
+				if (annotation instanceof org.javabip.annotations.Data) {
+					org.javabip.annotations.Data dataAnnotation = (org.javabip.annotations.Data) annotation;
 					Data<?> data = createData(dataAnnotation.name(), paramTypes[i]);
 					dataIn.add(data);
 					break;
@@ -103,8 +103,8 @@ class ReflectionHelper {
 
 		Annotation[] annotations = method.getAnnotations();
 		for (Annotation annotation : annotations) {
-			if (annotation instanceof org.bip.annotations.Data) { // DATA OUT
-				return parseReturnDataAnnotation(method, (org.bip.annotations.Data) annotation);
+			if (annotation instanceof org.javabip.annotations.Data) { // DATA OUT
+				return parseReturnDataAnnotation(method, (org.javabip.annotations.Data) annotation);
 			}
 		}
 
@@ -121,7 +121,7 @@ class ReflectionHelper {
 	 *            the data annotation of the method containing the information
 	 * @return a new instance of DataOut
 	 */
-	public static DataOutImpl<?> parseReturnDataAnnotation(Method method, org.bip.annotations.Data dataAnnotation) {
+	public static DataOutImpl<?> parseReturnDataAnnotation(Method method, org.javabip.annotations.Data dataAnnotation) {
 
 		String name = dataAnnotation.name();
 		AccessType type = dataAnnotation.accessTypePort();
diff --git a/org.bip.executor/src/main/java/org/bip/executor/SpecificationParser.java b/org.javabip.executor/src/main/java/org/javabip/executor/SpecificationParser.java
similarity index 76%
rename from org.bip.executor/src/main/java/org/bip/executor/SpecificationParser.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/SpecificationParser.java
index b99692c532effe72964ae1e5025f5608b9451ab0..fdfc2cb5a92bac5c1608e91aa63e8a074bb0ebd9 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/SpecificationParser.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/SpecificationParser.java
@@ -17,19 +17,19 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transitions;
-import org.bip.api.Behaviour;
-import org.bip.api.ComponentProvider;
-import org.bip.api.ExecutableBehaviour;
-import org.bip.exceptions.BIPException;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transitions;
+import org.javabip.api.Behaviour;
+import org.javabip.api.ComponentProvider;
+import org.javabip.api.ExecutableBehaviour;
+import org.javabip.exceptions.BIPException;
 
 /**
  * Parses the component specification to create a behaviour instance. The behaviour is specified either via annotations
@@ -74,7 +74,7 @@ public abstract class SpecificationParser implements ComponentProvider {
 		for (Method method : componentMethods) {
 			Annotation[] annotations = method.getAnnotations();
 			for (Annotation annotation : annotations) {
-				if (annotation instanceof org.bip.annotations.ExecutableBehaviour) {
+				if (annotation instanceof org.javabip.annotations.ExecutableBehaviour) {
 					Class<?> returnType = method.getReturnType();
 					if (!BehaviourBuilder.class.isAssignableFrom(returnType)) {
 						throw new BIPException("Method " + method.getName()
@@ -120,11 +120,11 @@ public abstract class SpecificationParser implements ComponentProvider {
 		classAnnotation = componentClass.getAnnotation(Ports.class);
 		if (classAnnotation instanceof Ports) {
 			Ports ports = (Ports) classAnnotation;
-			org.bip.annotations.Port[] portArray = ports.value();
-			for (org.bip.annotations.Port bipPortAnnotation : portArray) {
+			org.javabip.annotations.Port[] portArray = ports.value();
+			for (org.javabip.annotations.Port bipPortAnnotation : portArray) {
 
-				if (bipPortAnnotation instanceof org.bip.annotations.Port)
-					addPort((org.bip.annotations.Port) bipPortAnnotation, specType, builder);
+				if (bipPortAnnotation instanceof org.javabip.annotations.Port)
+					addPort((org.javabip.annotations.Port) bipPortAnnotation, specType, builder);
 
 			}
 		} else {
@@ -136,22 +136,22 @@ public abstract class SpecificationParser implements ComponentProvider {
 		for (Method method : componentMethods) {
 			Annotation[] annotations = method.getAnnotations();
 			for (Annotation annotation : annotations) {
-				if (annotation instanceof org.bip.annotations.Transition) {
+				if (annotation instanceof org.javabip.annotations.Transition) {
 
-					addTransitionAndStates(method, (org.bip.annotations.Transition) annotation, builder);
+					addTransitionAndStates(method, (org.javabip.annotations.Transition) annotation, builder);
 
 				} else if (annotation instanceof Transitions) {
 					Transitions transitionsAnnotation = (Transitions) annotation;
 					Annotation[] transitionAnnotations = transitionsAnnotation.value();
 					for (Annotation bipTransitionAnnotation : transitionAnnotations) {
 
-						addTransitionAndStates(method, (org.bip.annotations.Transition) bipTransitionAnnotation,
+						addTransitionAndStates(method, (org.javabip.annotations.Transition) bipTransitionAnnotation,
 								builder);
 					}
 
-				} else if (annotation instanceof org.bip.annotations.Guard) {
+				} else if (annotation instanceof org.javabip.annotations.Guard) {
 
-					addGuard(method, (org.bip.annotations.Guard) annotation, builder);
+					addGuard(method, (org.javabip.annotations.Guard) annotation, builder);
 
 				} else if (annotation instanceof Data) { // DATA OUT
 
@@ -163,14 +163,14 @@ public abstract class SpecificationParser implements ComponentProvider {
 					Annotation[] portAnnotations = portsAnnotation.value();
 					for (Annotation bipPortAnnotation : portAnnotations) {
 
-						if (bipPortAnnotation instanceof org.bip.annotations.Port)
-							addPort((org.bip.annotations.Port) bipPortAnnotation, componentClass, builder);
+						if (bipPortAnnotation instanceof org.javabip.annotations.Port)
+							addPort((org.javabip.annotations.Port) bipPortAnnotation, componentClass, builder);
 
 					}
 
-				} else if (annotation instanceof org.bip.annotations.Port) {
+				} else if (annotation instanceof org.javabip.annotations.Port) {
 
-					addPort((org.bip.annotations.Port) annotation, componentClass, builder);
+					addPort((org.javabip.annotations.Port) annotation, componentClass, builder);
 
 				}
 
@@ -180,7 +180,7 @@ public abstract class SpecificationParser implements ComponentProvider {
 		return builder;
 	}
 
-	private void addGuard(Method method, org.bip.annotations.Guard annotation, BehaviourBuilder builder)
+	private void addGuard(Method method, org.javabip.annotations.Guard annotation, BehaviourBuilder builder)
 			throws BIPException {
 
 		Class<?> returnType = method.getReturnType();
@@ -198,7 +198,7 @@ public abstract class SpecificationParser implements ComponentProvider {
 
 	}
 
-	private void addTransitionAndStates(Method method, org.bip.annotations.Transition transitionAnnotation,
+	private void addTransitionAndStates(Method method, org.javabip.annotations.Transition transitionAnnotation,
 			BehaviourBuilder builder) {
 
 		builder.addTransitionAndStates(transitionAnnotation.name(), transitionAnnotation.source(),
@@ -206,13 +206,13 @@ public abstract class SpecificationParser implements ComponentProvider {
 
 	}
 
-	private void addPort(org.bip.annotations.Port portAnnotation, Class<?> componentClass, BehaviourBuilder builder) {
+	private void addPort(org.javabip.annotations.Port portAnnotation, Class<?> componentClass, BehaviourBuilder builder) {
 
 		builder.addPort(portAnnotation.name(), portAnnotation.type(), componentClass);
 
 	}
 
-	private void addPort(org.bip.annotations.Port portAnnotation, String specType, BehaviourBuilder builder) {
+	private void addPort(org.javabip.annotations.Port portAnnotation, String specType, BehaviourBuilder builder) {
 		builder.addPort(portAnnotation.name(), portAnnotation.type(), specType);
 
 	}
diff --git a/org.bip.executor/src/main/java/org/bip/executor/TransitionImpl.java b/org.javabip.executor/src/main/java/org/javabip/executor/TransitionImpl.java
similarity index 98%
rename from org.bip.executor/src/main/java/org/bip/executor/TransitionImpl.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/TransitionImpl.java
index 492351da192eabeff8edafd3f774c3136ebf6bba..69e4556c285f5bf0da51b168beffbc094ebe92d4 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/TransitionImpl.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/TransitionImpl.java
@@ -17,14 +17,14 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 27/01/14
  */
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 
-import org.bip.api.Data;
+import org.javabip.api.Data;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.executor/src/main/java/org/bip/executor/TunellingExecutorHandler.java b/org.javabip.executor/src/main/java/org/javabip/executor/TunellingExecutorHandler.java
similarity index 88%
rename from org.bip.executor/src/main/java/org/bip/executor/TunellingExecutorHandler.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/TunellingExecutorHandler.java
index 4fd4f4e361b8ea36aa97edb251ca7a9c108091f7..54ae962350f1399f90f43f0820f6fb3814ecdf63 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/TunellingExecutorHandler.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/TunellingExecutorHandler.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.executor;
+package org.javabip.executor;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
@@ -27,18 +27,18 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.annotations.Transitions;
-import org.bip.api.BIPActor;
-import org.bip.api.BIPComponent;
-import org.bip.api.Data;
-import org.bip.api.Executor;
-import org.bip.api.Identifiable;
-import org.bip.api.OrchestratedExecutor;
-import org.bip.api.PortType;
-import org.bip.exceptions.BIPException;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.annotations.Transitions;
+import org.javabip.api.BIPActor;
+import org.javabip.api.BIPComponent;
+import org.javabip.api.Data;
+import org.javabip.api.Executor;
+import org.javabip.api.Identifiable;
+import org.javabip.api.OrchestratedExecutor;
+import org.javabip.api.PortType;
+import org.javabip.exceptions.BIPException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -122,11 +122,11 @@ public class TunellingExecutorHandler implements InvocationHandler {
 
 		if (classAnnotation instanceof Ports) {
 			Ports ports = (Ports) classAnnotation;
-			org.bip.annotations.Port[] portArray = ports.value();
-			for (org.bip.annotations.Port annotation : portArray) {
+			org.javabip.annotations.Port[] portArray = ports.value();
+			for (org.javabip.annotations.Port annotation : portArray) {
 
-				if (annotation instanceof org.bip.annotations.Port) {
-					Port portAnnotation = (org.bip.annotations.Port) annotation;
+				if (annotation instanceof org.javabip.annotations.Port) {
+					Port portAnnotation = (org.javabip.annotations.Port) annotation;
 
 					if (portAnnotation.type().equals(PortType.spontaneous)) {
 						namesOfSpontaneousPorts.add(portAnnotation.name());
@@ -143,9 +143,9 @@ public class TunellingExecutorHandler implements InvocationHandler {
 		for (Method method : componentMethods) {
 			Annotation[] annotations = method.getAnnotations();
 			for (Annotation annotation : annotations) {
-				if (annotation instanceof org.bip.annotations.Transition) {
+				if (annotation instanceof org.javabip.annotations.Transition) {
 
-					parseTransition(method, (org.bip.annotations.Transition) annotation, namesOfSpontaneousPorts);
+					parseTransition(method, (org.javabip.annotations.Transition) annotation, namesOfSpontaneousPorts);
 
 				} else if (annotation instanceof Transitions) {
 					// TODO: only one spontaneous port can be associated with the same method
@@ -153,7 +153,7 @@ public class TunellingExecutorHandler implements InvocationHandler {
 					Annotation[] transitionAnnotations = transitionsAnnotation.value();
 					for (Annotation bipTransitionAnnotation : transitionAnnotations) {
 
-						parseTransition(method, (org.bip.annotations.Transition) bipTransitionAnnotation,
+						parseTransition(method, (org.javabip.annotations.Transition) bipTransitionAnnotation,
 								namesOfSpontaneousPorts);
 					}
 				}
diff --git a/org.bip.executor/src/main/java/org/bip/executor/guardparser/bool.g4 b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/bool.g4
similarity index 100%
rename from org.bip.executor/src/main/java/org/bip/executor/guardparser/bool.g4
rename to org.javabip.executor/src/main/java/org/javabip/executor/guardparser/bool.g4
diff --git a/org.bip.executor/src/main/java/org/bip/executor/guardparser/bool.tokens b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/bool.tokens
similarity index 100%
rename from org.bip.executor/src/main/java/org/bip/executor/guardparser/bool.tokens
rename to org.javabip.executor/src/main/java/org/javabip/executor/guardparser/bool.tokens
diff --git a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolBaseListener.java b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolBaseListener.java
similarity index 96%
rename from org.bip.executor/src/main/java/org/bip/executor/guardparser/boolBaseListener.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolBaseListener.java
index f32d83b2c6aadb89b19f51123cb93bf2b8ac779d..65be69fc1b357e861dd3bafaa8c3d2e305ac5737 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolBaseListener.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolBaseListener.java
@@ -1,6 +1,6 @@
 // Generated from bool.g4 by ANTLR 4.0
 
-package org.bip.executor.guardparser;
+package org.javabip.executor.guardparser;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
diff --git a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolLexer.java b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolLexer.java
similarity index 97%
rename from org.bip.executor/src/main/java/org/bip/executor/guardparser/boolLexer.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolLexer.java
index 626f64da8015134991656fc97782246296a68cb8..15bf1bbba70d81ce951fbf1752f961c40de76604 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolLexer.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolLexer.java
@@ -1,10 +1,9 @@
 // Generated from bool.g4 by ANTLR 4.0
 
-package org.bip.executor.guardparser;
+package org.javabip.executor.guardparser;
 import java.util.*;
 
-import org.bip.executor.GuardTreeNode;
-
+import org.javabip.executor.GuardTreeNode;
 import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
diff --git a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolLexer.tokens b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolLexer.tokens
similarity index 100%
rename from org.bip.executor/src/main/java/org/bip/executor/guardparser/boolLexer.tokens
rename to org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolLexer.tokens
diff --git a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolListener.java b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolListener.java
similarity index 94%
rename from org.bip.executor/src/main/java/org/bip/executor/guardparser/boolListener.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolListener.java
index a3e25c638f11db67e08f5f11c12acff126a02aed..c72254bc959430369c1f202fa282aa40df7a7cac 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolListener.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolListener.java
@@ -1,6 +1,6 @@
 // Generated from bool.g4 by ANTLR 4.0
 
-package org.bip.executor.guardparser;
+package org.javabip.executor.guardparser;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 public interface boolListener extends ParseTreeListener {
diff --git a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolParser.java b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolParser.java
similarity index 99%
rename from org.bip.executor/src/main/java/org/bip/executor/guardparser/boolParser.java
rename to org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolParser.java
index 885b83e1388e436635937f0662711563182f3081..c9385358fc576a054817926348bbb2d405fc6922 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/guardparser/boolParser.java
+++ b/org.javabip.executor/src/main/java/org/javabip/executor/guardparser/boolParser.java
@@ -1,15 +1,15 @@
 // Generated from bool.g4 by ANTLR 4.0
 
-package org.bip.executor.guardparser;
+package org.javabip.executor.guardparser;
 import java.util.*;
 
-import org.bip.executor.GuardTreeNode;
-
+import org.javabip.executor.GuardTreeNode;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.misc.*;
 import org.antlr.v4.runtime.tree.*;
+
 import java.util.List;
 import java.util.Iterator;
 import java.util.ArrayList;
diff --git a/org.bip.glue/pom.xml b/org.javabip.glue/pom.xml
similarity index 82%
rename from org.bip.glue/pom.xml
rename to org.javabip.glue/pom.xml
index 40caa8afce3e37305341749b67bdcef93217bc08..602523dc374fbe9e5d44dfbe93ae730ba248450a 100644
--- a/org.bip.glue/pom.xml
+++ b/org.javabip.glue/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.bip</groupId>
-		<artifactId>org.bip.parent</artifactId>
+		<groupId>org.javabip</groupId>
+		<artifactId>org.javabip.parent</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
-		<relativePath>../org.bip.parent/pom.xml</relativePath>
+		<relativePath>../org.javabip.parent/pom.xml</relativePath>
 	</parent>
 
-	<groupId>org.bip</groupId>
-	<artifactId>org.bip.glue</artifactId>
+	<groupId>org.javabip</groupId>
+	<artifactId>org.javabip.glue</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 
 	<name>BIP :: Core :: Glue</name>
@@ -21,8 +21,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.bip</groupId>
-			<artifactId>org.bip.api</artifactId>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.api</artifactId>
 		</dependency>
 
 	</dependencies>
@@ -30,7 +30,7 @@
 	<properties>
 		<osgi.private></osgi.private>
 		<osgi.import>*</osgi.import>
-		<osgi.export>org.bip.glue</osgi.export>
+		<osgi.export>org.javabip.glue</osgi.export>
 		<osgi.dynamic.import></osgi.dynamic.import>
 	</properties>
 
diff --git a/org.bip.glue/src/main/java/org/bip/glue/AcceptImpl.java b/org.javabip.glue/src/main/java/org/javabip/glue/AcceptImpl.java
similarity index 96%
rename from org.bip.glue/src/main/java/org/bip/glue/AcceptImpl.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/AcceptImpl.java
index 666beb166571ca4ce39b2af33118b7fdb84ec9e1..d89f770e468e395d2558f20e99c7c11d6ec2bdad 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/AcceptImpl.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/AcceptImpl.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.glue;
+package org.javabip.glue;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +25,8 @@ import java.util.Collection;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
-import org.bip.api.Accept;
-import org.bip.api.PortBase;
+import org.javabip.api.Accept;
+import org.javabip.api.PortBase;
 
 /**
  * Class implementing the functionality of the glue accept macro.
diff --git a/org.bip.glue/src/main/java/org/bip/glue/BIPGlueImpl.java b/org.javabip.glue/src/main/java/org/javabip/glue/BIPGlueImpl.java
similarity index 96%
rename from org.bip.glue/src/main/java/org/bip/glue/BIPGlueImpl.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/BIPGlueImpl.java
index 15257b0dd9d63c4eade73e27f0fd29bd38024d54..e5b7a4b53018497bfa77de71ca3504e46e48116a 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/BIPGlueImpl.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/BIPGlueImpl.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -28,10 +28,10 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.bip.api.Accept;
-import org.bip.api.BIPGlue;
-import org.bip.api.DataWire;
-import org.bip.api.Require;
+import org.javabip.api.Accept;
+import org.javabip.api.BIPGlue;
+import org.javabip.api.DataWire;
+import org.javabip.api.Require;
 
 /**
  * Class implementing the functionality of the BIP Glue.
diff --git a/org.bip.glue/src/main/java/org/bip/glue/DataWireImpl.java b/org.javabip.glue/src/main/java/org/javabip/glue/DataWireImpl.java
similarity index 95%
rename from org.bip.glue/src/main/java/org/bip/glue/DataWireImpl.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/DataWireImpl.java
index 0cca70689ea299d330c21136a3691105fabc01b2..3848fd7d5a5b4e3dcf705c51e4bde198b78e255b 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/DataWireImpl.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/DataWireImpl.java
@@ -16,12 +16,12 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import javax.xml.bind.annotation.XmlElement;
 
-import org.bip.api.DataWire;
-import org.bip.api.PortBase;
+import org.javabip.api.DataWire;
+import org.javabip.api.PortBase;
 
 /**
  * Class implementing the data wire functionality. Data wires are sued to specify the data connections between different
diff --git a/org.bip.glue/src/main/java/org/bip/glue/GlueBuilder.java b/org.javabip.glue/src/main/java/org/javabip/glue/GlueBuilder.java
similarity index 98%
rename from org.bip.glue/src/main/java/org/bip/glue/GlueBuilder.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/GlueBuilder.java
index 0efc3fb49921d72b31d076d2e944b0a68d88e7f4..2501bdfc8c529687938dc9eb4c4200420c7344d3 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/GlueBuilder.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/GlueBuilder.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -33,9 +33,9 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import org.bip.annotations.ComponentType;
-import org.bip.api.BIPGlue;
-import org.bip.api.PortBase;
+import org.javabip.annotations.ComponentType;
+import org.javabip.api.BIPGlue;
+import org.javabip.api.PortBase;
 
 /**
  * Provides functionality to build BIP Glue.
diff --git a/org.bip.glue/src/main/java/org/bip/glue/ListElementType.java b/org.javabip.glue/src/main/java/org/javabip/glue/ListElementType.java
similarity index 97%
rename from org.bip.glue/src/main/java/org/bip/glue/ListElementType.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/ListElementType.java
index 0e9a3964a3f5c0efe7b9ffdabd4041c79a2ac097..d3ebf7a64735b6b6c58e7288daf6362918e554a9 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/ListElementType.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/ListElementType.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import java.util.List;
 
diff --git a/org.bip.glue/src/main/java/org/bip/glue/ListType.java b/org.javabip.glue/src/main/java/org/javabip/glue/ListType.java
similarity index 98%
rename from org.bip.glue/src/main/java/org/bip/glue/ListType.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/ListType.java
index 7f1016c8ba1172bac6dd74e0914dd04ab0632dd0..6c27b54812998109316d1bcccdb17f564cd22285 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/ListType.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/ListType.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.bip.glue/src/main/java/org/bip/glue/PortBaseImpl.java b/org.javabip.glue/src/main/java/org/javabip/glue/PortBaseImpl.java
similarity index 96%
rename from org.bip.glue/src/main/java/org/bip/glue/PortBaseImpl.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/PortBaseImpl.java
index 0cc38cf647bc133881a88aea86ce02ad81ca9fdd..6719f41fc0fefde780cf0b243f62e7201b568237 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/PortBaseImpl.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/PortBaseImpl.java
@@ -16,11 +16,11 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import javax.xml.bind.annotation.XmlAttribute;
 
-import org.bip.api.PortBase;
+import org.javabip.api.PortBase;
 
 /**
  * The implementation of the BIP Component port.
diff --git a/org.bip.glue/src/main/java/org/bip/glue/RequireImpl.java b/org.javabip.glue/src/main/java/org/javabip/glue/RequireImpl.java
similarity index 96%
rename from org.bip.glue/src/main/java/org/bip/glue/RequireImpl.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/RequireImpl.java
index bc1fb5d4cc3b34e15d3ac85d70d06050caed69a7..17c583fda770766ab9b87ddb62c8d76f29478946 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/RequireImpl.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/RequireImpl.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,8 +24,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.bip.api.PortBase;
-import org.bip.api.Require;
+import org.javabip.api.PortBase;
+import org.javabip.api.Require;
 
 /**
  * Class implementing the functionality of the glue require macro.
diff --git a/org.bip.glue/src/main/java/org/bip/glue/TwoSynchronGlueBuilder.java b/org.javabip.glue/src/main/java/org/javabip/glue/TwoSynchronGlueBuilder.java
similarity index 98%
rename from org.bip.glue/src/main/java/org/bip/glue/TwoSynchronGlueBuilder.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/TwoSynchronGlueBuilder.java
index 80cd146473ff3c28ba2af9c7224cc3f3471b08fa..bba94a3405dd0c0d36fb291edea3a8377c818828 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/TwoSynchronGlueBuilder.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/TwoSynchronGlueBuilder.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 /**
  * Glue builder allowing to create synchronous connections between ports.
diff --git a/org.bip.glue/src/main/java/org/bip/glue/XmlGenericListAdapter.java b/org.javabip.glue/src/main/java/org/javabip/glue/XmlGenericListAdapter.java
similarity index 98%
rename from org.bip.glue/src/main/java/org/bip/glue/XmlGenericListAdapter.java
rename to org.javabip.glue/src/main/java/org/javabip/glue/XmlGenericListAdapter.java
index f2f2a85c3a688415a9fb671b481d38552b56b2a8..1328f70cf92862328f77a53ff1b090622b419e33 100644
--- a/org.bip.glue/src/main/java/org/bip/glue/XmlGenericListAdapter.java
+++ b/org.javabip.glue/src/main/java/org/javabip/glue/XmlGenericListAdapter.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.glue;
+package org.javabip.glue;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.bip.parent/pom.xml b/org.javabip.parent/pom.xml
similarity index 68%
rename from org.bip.parent/pom.xml
rename to org.javabip.parent/pom.xml
index ebef0aa1a08b9ad3b821ef24ef37889b414b70c8..499186866724dd98fb320ec5dac6a03d488d7926 100755
--- a/org.bip.parent/pom.xml
+++ b/org.javabip.parent/pom.xml
@@ -3,8 +3,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.bip</groupId>
-  <artifactId>org.bip.parent</artifactId>
+  <groupId>org.javabip</groupId>
+  <artifactId>org.javabip.parent</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -23,18 +23,18 @@
     <antlr4.version>4.0</antlr4.version>
     <org.osgi.core.version>4.2.0</org.osgi.core.version>
     <camel-core.version>2.15.3</camel-core.version>
-    <!--<org.bip.epfl.engine.version>0.1.0-SNAPSHOT</org.bip.epfl.engine.version>-->
-    <org.bip.executor.impl.version>0.1.0-SNAPSHOT</org.bip.executor.impl.version>
-    <org.bip.api.version>0.1.0-SNAPSHOT</org.bip.api.version>
-    <org.bip.executor.version>0.1.0-SNAPSHOT</org.bip.executor.version>
-    <org.bip.glue.version>0.1.0-SNAPSHOT</org.bip.glue.version>
-    <org.bip.executor.springinosgi.version>0.1.0-SNAPSHOT</org.bip.executor.springinosgi.version>
-    <org.bip.spec.examples.version>0.1.0-SNAPSHOT</org.bip.spec.examples.version>
+    <!--<org.javabip.epfl.engine.version>0.1.0-SNAPSHOT</org.javabip.epfl.engine.version>-->
+    <org.javabip.executor.impl.version>0.1.0-SNAPSHOT</org.javabip.executor.impl.version>
+    <org.javabip.api.version>0.1.0-SNAPSHOT</org.javabip.api.version>
+    <org.javabip.executor.version>0.1.0-SNAPSHOT</org.javabip.executor.version>
+    <org.javabip.glue.version>0.1.0-SNAPSHOT</org.javabip.glue.version>
+    <org.javabip.executor.springinosgi.version>0.1.0-SNAPSHOT</org.javabip.executor.springinosgi.version>
+    <org.javabip.spec.examples.version>0.1.0-SNAPSHOT</org.javabip.spec.examples.version>
  	 <javabdd.version>1.0b2</javabdd.version>
- 	 <org.bip.engine.api.version>0.1.0-SNAPSHOT</org.bip.engine.api.version>
- 	 <org.bip.engine.coordinator.version>0.1.0-SNAPSHOT</org.bip.engine.coordinator.version>
-	 <org.bip.engine.core.version>0.1.0-SNAPSHOT</org.bip.engine.core.version>
- 	 <org.bip.engine.factory.version>0.1.0-SNAPSHOT</org.bip.engine.factory.version>
+ 	 <org.javabip.engine.api.version>0.1.0-SNAPSHOT</org.javabip.engine.api.version>
+ 	 <org.javabip.engine.coordinator.version>0.1.0-SNAPSHOT</org.javabip.engine.coordinator.version>
+	 <org.javabip.engine.core.version>0.1.0-SNAPSHOT</org.javabip.engine.core.version>
+ 	 <org.javabip.engine.factory.version>0.1.0-SNAPSHOT</org.javabip.engine.factory.version>
 
   </properties>
 
@@ -107,9 +107,9 @@
     <dependencies>
 
       <dependency>
-        <groupId>org.bip</groupId>
-        <artifactId>org.bip.api</artifactId>
-        <version>${org.bip.api.version}</version>
+        <groupId>org.javabip</groupId>
+        <artifactId>org.javabip.api</artifactId>
+        <version>${org.javabip.api.version}</version>
       </dependency>
 
       <dependency>
@@ -143,9 +143,9 @@
       </dependency>
 
       <dependency>
-        <groupId>org.bip</groupId>
-        <artifactId>org.bip.executor</artifactId>
-        <version>${org.bip.executor.version}</version>
+        <groupId>org.javabip</groupId>
+        <artifactId>org.javabip.executor</artifactId>
+        <version>${org.javabip.executor.version}</version>
       </dependency>
 
       <dependency>
@@ -179,22 +179,22 @@
       </dependency>
 
       <dependency>
-        <groupId>org.bip</groupId>
-        <artifactId>org.bip.executor.impl</artifactId>
-        <version>${org.bip.executor.impl.version}</version>
+        <groupId>org.javabip</groupId>
+        <artifactId>org.javabip.executor.impl</artifactId>
+        <version>${org.javabip.executor.impl.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.bip</groupId>
-        <artifactId>org.bip.glue</artifactId>
-        <version>${org.bip.glue.version}</version>
+        <groupId>org.javabip</groupId>
+        <artifactId>org.javabip.glue</artifactId>
+        <version>${org.javabip.glue.version}</version>
       </dependency>
 
 
       <dependency>
-        <groupId>org.bip</groupId>
-        <artifactId>org.bip.spec.examples</artifactId>
-        <version>${org.bip.spec.examples.version}</version>
+        <groupId>org.javabip</groupId>
+        <artifactId>org.javabip.spec.examples</artifactId>
+        <version>${org.javabip.spec.examples.version}</version>
       </dependency>
 
       <dependency>
@@ -210,27 +210,27 @@
       </dependency>
 
       <dependency>
-			<groupId>org.bip.shared</groupId>
-			<artifactId>org.bip.engine.api</artifactId>
-        <version>${org.bip.engine.api.version}</version>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.engine.api</artifactId>
+        <version>${org.javabip.engine.api.version}</version>
       </dependency>
 
 		<dependency>
-			<groupId>org.bip.shared</groupId>
-			<artifactId>org.bip.engine.coordinator</artifactId>
-			<version>${org.bip.engine.coordinator.version}</version>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.engine.coordinator</artifactId>
+			<version>${org.javabip.engine.coordinator.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.bip.shared</groupId>
-			<artifactId>org.bip.engine.core</artifactId>
-			<version>${org.bip.engine.core.version}</version>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.engine.core</artifactId>
+			<version>${org.javabip.engine.core.version}</version>
 		</dependency>
 
 	  <dependency>
-		  <groupId>org.bip.shared</groupId>
-		  <artifactId>org.bip.engine.factory</artifactId>
-		  <version>${org.bip.engine.factory.version}</version>
+		  <groupId>org.javabip</groupId>
+		  <artifactId>org.javabip.engine.factory</artifactId>
+		  <version>${org.javabip.engine.factory.version}</version>
 	  </dependency>
 
     </dependencies>
diff --git a/org.bip.spec.examples/pom.xml b/org.javabip.spec.examples/pom.xml
similarity index 80%
rename from org.bip.spec.examples/pom.xml
rename to org.javabip.spec.examples/pom.xml
index 5ff5971378d429040c14d096668552a7938a5128..3d7ff5c6be882f7084ab0df67b896d1bffd1e949 100644
--- a/org.bip.spec.examples/pom.xml
+++ b/org.javabip.spec.examples/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.bip</groupId>
-		<artifactId>org.bip.parent</artifactId>
+		<groupId>org.javabip</groupId>
+		<artifactId>org.javabip.parent</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
-		<relativePath>../org.bip.parent/pom.xml</relativePath>
+		<relativePath>../org.javabip.parent/pom.xml</relativePath>
 	</parent>
 
-	<groupId>org.bip</groupId>
-	<artifactId>org.bip.spec.examples</artifactId>
+	<groupId>org.javabip</groupId>
+	<artifactId>org.javabip.spec.examples</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 
 	<name>BIP :: Core :: Spec :: Examples</name>
@@ -22,7 +22,7 @@
 	<properties>
 		<osgi.private></osgi.private>
 		<osgi.import>*</osgi.import>
-		<osgi.export>org.bip.spec, org.bip.spec.hanoi, org.bip.spec.diningphilosophers, org.bip.spec.seal</osgi.export>
+		<osgi.export>org.javabip.spec, org.javabip.spec.hanoi, org.javabip.spec.diningphilosophers, org.javabip.spec.seal</osgi.export>
 		<osgi.dynamic.import></osgi.dynamic.import>
 		<osgi.bundles></osgi.bundles>
 	</properties>
@@ -61,18 +61,18 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.bip</groupId>
-			<artifactId>org.bip.api</artifactId>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.api</artifactId>
 		</dependency>
 		
 		<dependency>
-			<groupId>org.bip</groupId>
-			<artifactId>org.bip.glue</artifactId>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.glue</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.bip</groupId>
-			<artifactId>org.bip.executor</artifactId>
+			<groupId>org.javabip</groupId>
+			<artifactId>org.javabip.executor</artifactId>
 		</dependency>
 
 	</dependencies>
@@ -106,7 +106,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<includes>
-						<include>**/com/bip/examplespec.camelroute/*Tests.class</include>
+						<include>**/com/javabip/examplespec.camelroute/*Tests.class</include>
 					</includes>
 				</configuration>
 			</plugin>
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentA.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentA.java
similarity index 88%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/ComponentA.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentA.java
index 90acbc84bfe03331726c285661ad11b68ecb4947..76fed07338345ecfb33d5fd4b471277ebfd9c2fc 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentA.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentA.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentAWithEnvData.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentAWithEnvData.java
similarity index 88%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/ComponentAWithEnvData.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentAWithEnvData.java
index 3a9b869ff904d59ee4650251301d29336f7148d2..2dda17c7ebb5baadb96986b07395044d0976e5a3 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentAWithEnvData.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentAWithEnvData.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentAWithEnvDataInterface.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentAWithEnvDataInterface.java
similarity index 97%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/ComponentAWithEnvDataInterface.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentAWithEnvDataInterface.java
index 1d6543362ddb3f9b962a677f6d683d5bbdb686c8..d87ea3750f6c32470b6bebb8a3bdeae4ca6fed22 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentAWithEnvDataInterface.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentAWithEnvDataInterface.java
@@ -16,7 +16,7 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
 public interface ComponentAWithEnvDataInterface {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentB.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentB.java
similarity index 85%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/ComponentB.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentB.java
index cc58f391d190f09a2c8f746fb5c75d53b5c2106d..3dbe418ed43e8ecb052d03d393d9487005432e08 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentB.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentB.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
-import org.bip.api.DataOut.AccessType;
+package org.javabip.spec;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentC.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentC.java
similarity index 84%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/ComponentC.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentC.java
index 1b19dab0c51c1ab613cc292b77f5cc7d8ce37d35..f5a9607290e5d862079517ebe553333781dc6ac4 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/ComponentC.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ComponentC.java
@@ -16,17 +16,17 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
 //Used in DataAvailabilityTest
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
-import org.bip.api.DataOut.AccessType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/Consumer.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Consumer.java
similarity index 87%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/Consumer.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/Consumer.java
index f4702bf818d5349283f73b25ef1468872b2abb60..6de7dc202d4a8c6008a08dc9371af8ad4768d71c 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/Consumer.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Consumer.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/Feeder.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Feeder.java
similarity index 94%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/Feeder.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/Feeder.java
index 53329c3e452e47ca354a7f200f8668dbe6ef5519..83b51f6e5b1b4e38c672295a81afa6067e98bd98 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/Feeder.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Feeder.java
@@ -16,11 +16,11 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.*;
-import org.bip.api.PortType;
-import org.bip.api.DataOut.AccessType;
+import org.javabip.annotations.*;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/InitialServer.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/InitialServer.java
similarity index 90%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/InitialServer.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/InitialServer.java
index 7de0b634483cd7179ca1111d2223bc8b2ce5b16f..4f54e7b3dc8cb2f7d7281d2dde7643882a3231d5 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/InitialServer.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/InitialServer.java
@@ -17,16 +17,16 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.DataOut.AccessType;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/Master.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Master.java
similarity index 86%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/Master.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/Master.java
index c48cff5446e8a8cd6cdd305c887302975e2727df..8f55aba227ebd00e5c6afc3e35de1d7250fc46f7 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/Master.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Master.java
@@ -16,17 +16,17 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.annotations.Transitions;
-import org.bip.api.DataOut.AccessType;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.annotations.Transitions;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/MemoryMonitor.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/MemoryMonitor.java
similarity index 94%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/MemoryMonitor.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/MemoryMonitor.java
index 0c488c32f1150bf88fbae7db0a38488e4c73aad6..fbcd86514de146b3958a4ede3363baddffde0a98 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/MemoryMonitor.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/MemoryMonitor.java
@@ -16,11 +16,11 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.*;
-import org.bip.api.BIPSpec;
-import org.bip.api.PortType;
+import org.javabip.annotations.*;
+import org.javabip.api.BIPSpec;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/PComponent.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/PComponent.java
similarity index 87%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/PComponent.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/PComponent.java
index 09b192c052f34ad5a57838ff76fb658f08593199..cec03fed517006db0db2e7aeb971a0d00472ef28 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/PComponent.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/PComponent.java
@@ -17,14 +17,14 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/PResizableBehaviorComponent.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/PResizableBehaviorComponent.java
similarity index 93%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/PResizableBehaviorComponent.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/PResizableBehaviorComponent.java
index 301832a9c0a70e6b9fdadcf28eac636c9491f750..47efd6e34f0e958ac70d9aedc6df5d778fd5dfef 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/PResizableBehaviorComponent.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/PResizableBehaviorComponent.java
@@ -17,14 +17,14 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.ExecutableBehaviour;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.api.PortType;
-import org.bip.executor.BehaviourBuilder;
+package org.javabip.spec;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.ExecutableBehaviour;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.api.PortType;
+import org.javabip.executor.BehaviourBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/PSSComponent.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/PSSComponent.java
similarity index 89%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/PSSComponent.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/PSSComponent.java
index f553d49c715d2dad1232cfc6ab56aa0ec659d519..cbded9d1396d30942a4fcbfb89a03dc53d1dfaa6 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/PSSComponent.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/PSSComponent.java
@@ -17,14 +17,14 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/Peer.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Peer.java
similarity index 89%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/Peer.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/Peer.java
index a18b82d974028997ac5f629344f78f661c676701..6a8f00985dc91278b5a26ef62eb3f9aaf5acd6bb 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/Peer.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Peer.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/ProperComponentAWithEnvData.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ProperComponentAWithEnvData.java
similarity index 89%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/ProperComponentAWithEnvData.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/ProperComponentAWithEnvData.java
index 546dcc2df2a30a767b99eeebff2f53a57eff3a85..b6c5b4690c43b299cad5ebd92be759da63bfe93b 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/ProperComponentAWithEnvData.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/ProperComponentAWithEnvData.java
@@ -17,17 +17,17 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
 import java.util.ArrayList;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/QComponent.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/QComponent.java
similarity index 85%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/QComponent.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/QComponent.java
index 83a3adcb57a945452fd6d1e128c948b5c4627be5..0c721c34ca73f9cdaa1298208990133faddce4ee 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/QComponent.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/QComponent.java
@@ -16,14 +16,14 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+package org.javabip.spec;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/RComponent.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/RComponent.java
similarity index 86%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/RComponent.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/RComponent.java
index d31bd24a465d05e9e8c23e1c5072e78f7e573a24..9584748a3ace92c0fd1f6d16d9d22667844474a4 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/RComponent.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/RComponent.java
@@ -17,14 +17,14 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+package org.javabip.spec;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/RouteOnOffMonitor.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/RouteOnOffMonitor.java
similarity index 95%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/RouteOnOffMonitor.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/RouteOnOffMonitor.java
index b9769c0ff6b9c8032a56f60b11da517575cf11bc..8c1f7c5fdcca0f5fa2aec75db0a4274d14f1e9a2 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/RouteOnOffMonitor.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/RouteOnOffMonitor.java
@@ -16,10 +16,10 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.*;
-import org.bip.api.PortType;
+import org.javabip.annotations.*;
+import org.javabip.api.PortType;
 
 @Ports({ @Port(name = "add", type = PortType.enforceable), @Port(name = "rm", type = PortType.enforceable) })
 @ComponentType(initial = "0", name = "org.bip.spec.RouteOnOffMonitor")
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/Server.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Server.java
similarity index 90%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/Server.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/Server.java
index 6fbf5d2d3f7a61467fba7e731e173382023ea579..a39bf1855c306dda4a619c24e5840de27b70f448 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/Server.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Server.java
@@ -16,16 +16,16 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.DataOut.AccessType;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/Slave.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Slave.java
similarity index 86%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/Slave.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/Slave.java
index dfa748664a0ecccb27892f85b679716d7c886ef6..d43e224f5298bb10a0baf2c9a09c9ede48ce8235 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/Slave.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Slave.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.DataOut.AccessType;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRoute.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRoute.java
similarity index 95%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRoute.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRoute.java
index dd4709057a902603008ccbda3116c67785e59fad..e1479a85bccb21918eb2b3af6edbffddad2bfc77 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRoute.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRoute.java
@@ -18,7 +18,7 @@
  * Date: 15/10/12
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,13 +30,13 @@ import org.apache.camel.Route;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.RoutePolicy;
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.Executor;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.Executor;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteDataTransfers.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteDataTransfers.java
similarity index 93%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteDataTransfers.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteDataTransfers.java
index bccc730919893fd0d07aefc95a993147f5bc5f16..dac9168bfdc4d7c389aeedbc2b85435c93c1d306 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteDataTransfers.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteDataTransfers.java
@@ -18,7 +18,7 @@
  * Date: 10/15/12
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,16 +30,16 @@ import org.apache.camel.Route;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.RoutePolicy;
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.BIPSpec;
-import org.bip.api.DataOut.AccessType;
-import org.bip.api.Executor;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.BIPSpec;
+import org.javabip.api.Executor;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteErrorException.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteErrorException.java
similarity index 98%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteErrorException.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteErrorException.java
index da9c648800614fa0f388cf5379594dfc12e886bb..18c30220c0f80983148b76d5218f47bc761633b0 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteErrorException.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteErrorException.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
@@ -26,9 +26,9 @@ import org.apache.camel.Route;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.RoutePolicy;
-import org.bip.annotations.*;
-import org.bip.api.Executor;
-import org.bip.api.PortType;
+import org.javabip.annotations.*;
+import org.javabip.api.Executor;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteExecutableBehavior.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteExecutableBehavior.java
similarity index 97%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteExecutableBehavior.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteExecutableBehavior.java
index 10fc259957fea3de525f686a438f85cf07aba1f4..929e6ee233c3d5917fb47fdd1abe66f5cc8c7db2 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/SwitchableRouteExecutableBehavior.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/SwitchableRouteExecutableBehavior.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,10 +29,10 @@ import org.apache.camel.Route;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.RoutePolicy;
-import org.bip.annotations.ExecutableBehaviour;
-import org.bip.api.Executor;
-import org.bip.api.PortType;
-import org.bip.executor.BehaviourBuilder;
+import org.javabip.annotations.ExecutableBehaviour;
+import org.javabip.api.Executor;
+import org.javabip.api.PortType;
+import org.javabip.executor.BehaviourBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/TestSpecEnforceableSpontaneous.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TestSpecEnforceableSpontaneous.java
similarity index 87%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/TestSpecEnforceableSpontaneous.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/TestSpecEnforceableSpontaneous.java
index be2ed9551f9668540db689206ca70cf0ee456b57..32b0be4efd31c57fb2e52cb694cae718e2b1b4e8 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/TestSpecEnforceableSpontaneous.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TestSpecEnforceableSpontaneous.java
@@ -17,14 +17,14 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
 
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/Tracker.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Tracker.java
similarity index 84%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/Tracker.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/Tracker.java
index 44a10c2a9d27620d5b1252ee6e329c9d0b9b344f..9a9b0a8b089e594da5c9d5546732d8e10e5db23a 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/Tracker.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/Tracker.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.DataOut.AccessType;
-import org.bip.api.PortType;
+package org.javabip.spec;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataProvider1.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataProvider1.java
similarity index 85%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataProvider1.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataProvider1.java
index dba57ca7547c713d9433003f15a984bb156b1a51..6c33178993f314e5605780fae469f96b687af684 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataProvider1.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataProvider1.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
-import org.bip.api.DataOut.AccessType;
+package org.javabip.spec;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataProvider2.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataProvider2.java
similarity index 85%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataProvider2.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataProvider2.java
index 3c230b903576c9ec53997936a161f2d529a52576..58d705f910cac57cb3793bd352f442882d310d03 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataProvider2.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataProvider2.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
-import org.bip.api.DataOut.AccessType;
+package org.javabip.spec;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataTaker.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataTaker.java
similarity index 87%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataTaker.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataTaker.java
index 5856c28330376d2795ca5716d498fedf7c1d4c0c..11ad7ab4d639f7fce65048606fa8c7004ab4bf8e 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/TwoDataTaker.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/TwoDataTaker.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec;
+package org.javabip.spec;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/DiningPhilosophersGlueBuilder.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/DiningPhilosophersGlueBuilder.java
similarity index 92%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/DiningPhilosophersGlueBuilder.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/DiningPhilosophersGlueBuilder.java
index e67f9e879c4dff97bfc84a662162ad926c07904c..bb181092cab1a6a4e26baada6526f701bc9c460c 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/DiningPhilosophersGlueBuilder.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/DiningPhilosophersGlueBuilder.java
@@ -16,9 +16,9 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec.diningphilosophers;
+package org.javabip.spec.diningphilosophers;
 
-import org.bip.glue.TwoSynchronGlueBuilder;
+import org.javabip.glue.TwoSynchronGlueBuilder;
 
 /**
  * Basic glue builder that may not prevent Philosophers starvation alone.
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/Fork.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/Fork.java
similarity index 86%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/Fork.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/Fork.java
index 60813e99aec9f899a087a4583283618de16f77c7..899cf1410469d1ab66a532ffc1a3b5c8e6967230 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/Fork.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/Fork.java
@@ -16,14 +16,14 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec.diningphilosophers;
+package org.javabip.spec.diningphilosophers;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/Philosophers.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/Philosophers.java
similarity index 92%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/Philosophers.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/Philosophers.java
index d743b06f1251f38f47568a6cc9d352cb2c0022da..5de6b27a4ceabf3e63c09d8f0d463a53dcdee699 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/Philosophers.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/Philosophers.java
@@ -16,16 +16,16 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec.diningphilosophers;
+package org.javabip.spec.diningphilosophers;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.annotations.Transitions;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.annotations.Transitions;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/QuickPhilosopher.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/QuickPhilosopher.java
similarity index 88%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/QuickPhilosopher.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/QuickPhilosopher.java
index 96a68b92598535261ec8495747779121e22514b2..70893f1acd1c3378ff8a56a8b920cc9be6baa6f6 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/diningphilosophers/QuickPhilosopher.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/diningphilosophers/QuickPhilosopher.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec.diningphilosophers;
+package org.javabip.spec.diningphilosophers;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 
 /**
  * Quick Philosopher has the possibility to pickup two forks at the same time in one transition. This alone should
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiGlueBuilder.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiGlueBuilder.java
similarity index 98%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiGlueBuilder.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiGlueBuilder.java
index 356a206f46ab23e27266ea4eb6855b72b4ef9633..8225f5de9bc9d3c050867dbe6335944a5a9dd261 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiGlueBuilder.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiGlueBuilder.java
@@ -17,9 +17,9 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
-import org.bip.glue.GlueBuilder;
+import org.javabip.glue.GlueBuilder;
 
 public class HanoiGlueBuilder extends GlueBuilder {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiMonitor.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiMonitor.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiMonitor.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiMonitor.java
index 7a6eb7693d7b22809a990ee09d83294ac38c3eb7..2aeb355b6dcca2861d2a069caae32e44c20036b3 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiMonitor.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiMonitor.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 /*
 
@@ -39,9 +39,9 @@ package org.bip.spec.hanoi;
 
  */
 
-import org.bip.annotations.ExecutableBehaviour;
-import org.bip.api.PortType;
-import org.bip.executor.BehaviourBuilder;
+import org.javabip.annotations.ExecutableBehaviour;
+import org.javabip.api.PortType;
+import org.javabip.executor.BehaviourBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiOptimalGlueBuilder.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiOptimalGlueBuilder.java
similarity index 98%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiOptimalGlueBuilder.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiOptimalGlueBuilder.java
index 4065b2e9d175f188678c117a7f87552d95cfca03..0dff7c6b29f63bd941228cff7a4291d04cde9903 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiOptimalGlueBuilder.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiOptimalGlueBuilder.java
@@ -17,9 +17,9 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
-import org.bip.glue.GlueBuilder;
+import org.javabip.glue.GlueBuilder;
 
 public class HanoiOptimalGlueBuilder extends GlueBuilder {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiOptimalMonitor.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiOptimalMonitor.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiOptimalMonitor.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiOptimalMonitor.java
index 4dec56a09aeb1cd132933fade74255b137ddd59d..050c4f465c871b43e7c13045cddb56b73fa69b62 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiOptimalMonitor.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiOptimalMonitor.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 /*
 
@@ -39,9 +39,9 @@ package org.bip.spec.hanoi;
 
  */
 
-import org.bip.annotations.ExecutableBehaviour;
-import org.bip.api.PortType;
-import org.bip.executor.BehaviourBuilder;
+import org.javabip.annotations.ExecutableBehaviour;
+import org.javabip.api.PortType;
+import org.javabip.executor.BehaviourBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiPeg.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiPeg.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiPeg.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiPeg.java
index eb3f09342f145e4ae8c1520fe93df0f701612340..7db4ae35348c8255e5e70f326125fc8872febd1a 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiPeg.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiPeg.java
@@ -18,11 +18,11 @@
  * Date: 15/07/2013
  */
 
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
-import org.bip.annotations.ExecutableBehaviour;
-import org.bip.api.PortType;
-import org.bip.executor.BehaviourBuilder;
+import org.javabip.annotations.ExecutableBehaviour;
+import org.javabip.api.PortType;
+import org.javabip.executor.BehaviourBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiPegWithData.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiPegWithData.java
similarity index 94%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiPegWithData.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiPegWithData.java
index a5fb2a0f7be818dfcf1801ea3955a070c2997896..cd69d7a03210b119b5734642af0cb265c68d12fa 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiPegWithData.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiPegWithData.java
@@ -18,13 +18,13 @@
  * Date: 15/07/2013
  */
 
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
-import org.bip.annotations.Data;
-import org.bip.annotations.ExecutableBehaviour;
-import org.bip.api.PortType;
-import org.bip.api.DataOut.AccessType;
-import org.bip.executor.BehaviourBuilder;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.ExecutableBehaviour;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
+import org.javabip.executor.BehaviourBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiRandomGlueBuilder.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiRandomGlueBuilder.java
similarity index 95%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiRandomGlueBuilder.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiRandomGlueBuilder.java
index ae604899ccb76ee91484e7da70008882421f0e8e..578cab2e40fe5deca815836017a0f82c75ef3a07 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/HanoiRandomGlueBuilder.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/HanoiRandomGlueBuilder.java
@@ -17,9 +17,9 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
-import org.bip.glue.GlueBuilder;
+import org.javabip.glue.GlueBuilder;
 
 public class HanoiRandomGlueBuilder extends GlueBuilder {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/LeftHanoiPeg.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/LeftHanoiPeg.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/LeftHanoiPeg.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/LeftHanoiPeg.java
index 00dc4e52329be8abda574b9e77fd3100436bed00..8ba5dff6d27d0100581ee53566b90ff54fd8b9e9 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/LeftHanoiPeg.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/LeftHanoiPeg.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 public class LeftHanoiPeg extends HanoiPeg {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/LeftHanoiPegWithData.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/LeftHanoiPegWithData.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/LeftHanoiPegWithData.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/LeftHanoiPegWithData.java
index 2576d5425a214be18eebc39d5c85c84224af60a5..262b2b343373e7ec858f7fa4a3c87238d3c558dd 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/LeftHanoiPegWithData.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/LeftHanoiPegWithData.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 public class LeftHanoiPegWithData extends HanoiPegWithData {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/MiddleHanoiPeg.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/MiddleHanoiPeg.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/MiddleHanoiPeg.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/MiddleHanoiPeg.java
index 77ce1aa290c5812d4217f6320e76094a21006e49..d58010b35ba874e3a0d4728815c331a60f8ce740 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/MiddleHanoiPeg.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/MiddleHanoiPeg.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 public class MiddleHanoiPeg extends HanoiPeg {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/MiddleHanoiPegWithData.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/MiddleHanoiPegWithData.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/MiddleHanoiPegWithData.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/MiddleHanoiPegWithData.java
index f42eb380f11de2bb836a899f08eb6486804a076d..52dd700a8c0edddeb1932cebc1d0df5eb0c03834 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/MiddleHanoiPegWithData.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/MiddleHanoiPegWithData.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 public class MiddleHanoiPegWithData extends HanoiPegWithData {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/RightHanoiPeg.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/RightHanoiPeg.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/RightHanoiPeg.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/RightHanoiPeg.java
index 3226516c07bb5154e77a98e6e47929a15f47ea23..379cd57d9b3958999b51c84ea98f63e75b6d362c 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/RightHanoiPeg.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/RightHanoiPeg.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 public class RightHanoiPeg extends HanoiPeg {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/RightHanoiPegWithData.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/RightHanoiPegWithData.java
similarity index 96%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/RightHanoiPegWithData.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/RightHanoiPegWithData.java
index e1ca3760900324f54b109c34dc2e95d1921ef13b..2b112afa56021aa61eb67389022a92aa61a42463 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/hanoi/RightHanoiPegWithData.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/hanoi/RightHanoiPegWithData.java
@@ -17,7 +17,7 @@
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  * Date: 15/07/2013
  */
-package org.bip.spec.hanoi;
+package org.javabip.spec.hanoi;
 
 public class RightHanoiPegWithData extends HanoiPegWithData {
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableData.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableData.java
similarity index 87%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableData.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableData.java
index b2a6f2d77106f15e69d4014b98f71059d59cc391..3954e5d7924ad001eb7c5171d84f733522e6ed5e 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableData.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableData.java
@@ -16,17 +16,17 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec.seal;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Guard;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.annotations.Transitions;
-import org.bip.api.DataOut.AccessType;
-import org.bip.api.PortType;
+package org.javabip.spec.seal;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Guard;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.annotations.Transitions;
+import org.javabip.api.PortType;
+import org.javabip.api.DataOut.AccessType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableDataReader.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableDataReader.java
similarity index 84%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableDataReader.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableDataReader.java
index aac93c56c4ef2fe4fc0a4bbd19d41c5dccf214ff..15644f1bb25cb9979fade8a1f950265395092142 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableDataReader.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableDataReader.java
@@ -16,14 +16,14 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec.seal;
+package org.javabip.spec.seal;
 
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.api.PortType;
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableDataWriter.java b/org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableDataWriter.java
similarity index 85%
rename from org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableDataWriter.java
rename to org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableDataWriter.java
index 999854a5eeefac4fe86351f89a61191d003cbb40..d10bfe34f0fe48132699e8b231a6d07c98cc00bc 100644
--- a/org.bip.spec.examples/src/main/java/org/bip/spec/seal/SealableDataWriter.java
+++ b/org.javabip.spec.examples/src/main/java/org/javabip/spec/seal/SealableDataWriter.java
@@ -16,15 +16,15 @@
  *
  * Author: Simon Bliudze, Anastasia Mavridou, Radoslaw Szymanek and Alina Zolotukhina
  */
-package org.bip.spec.seal;
-
-import org.bip.annotations.ComponentType;
-import org.bip.annotations.Data;
-import org.bip.annotations.Port;
-import org.bip.annotations.Ports;
-import org.bip.annotations.Transition;
-import org.bip.annotations.Transitions;
-import org.bip.api.PortType;
+package org.javabip.spec.seal;
+
+import org.javabip.annotations.ComponentType;
+import org.javabip.annotations.Data;
+import org.javabip.annotations.Port;
+import org.javabip.annotations.Ports;
+import org.javabip.annotations.Transition;
+import org.javabip.annotations.Transitions;
+import org.javabip.api.PortType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/pom.xml b/pom.xml
index e49150e3255814473173a5c43ba32185c951f712..9db7c4be724bc3e5ab237a4ffd2736f9cb01713f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.bip</groupId>
-  <artifactId>org.bip.core</artifactId>
+  <groupId>org.javabip</groupId>
+  <artifactId>org.javabip.core</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -20,12 +20,12 @@
   
 
   <modules>
-	<module>org.bip.parent</module>
-	<module>org.bip.api</module>
-	<module>org.bip.glue</module>
-	<module>org.bip.executor</module>
-	<module>org.bip.executor.impl</module>
-	<module>org.bip.spec.examples</module>
+	<module>org.javabip.parent</module>
+	<module>org.javabip.api</module>
+	<module>org.javabip.glue</module>
+	<module>org.javabip.executor</module>
+	<module>org.javabip.executor.impl</module>
+	<module>org.javabip.spec.examples</module>
   </modules>
    
 </project>