diff --git a/siri/.classpath b/.classpath
similarity index 100%
rename from siri/.classpath
rename to .classpath
diff --git a/siri/.project b/.project
similarity index 100%
rename from siri/.project
rename to .project
diff --git a/siri/DESIGN b/DESIGN
similarity index 100%
rename from siri/DESIGN
rename to DESIGN
diff --git a/siri/external/commons-codec-1.4.jar b/external/commons-codec-1.4.jar
similarity index 100%
rename from siri/external/commons-codec-1.4.jar
rename to external/commons-codec-1.4.jar
diff --git a/siri/external/commons-logging-1.1.1.jar b/external/commons-logging-1.1.1.jar
similarity index 100%
rename from siri/external/commons-logging-1.1.1.jar
rename to external/commons-logging-1.1.1.jar
diff --git a/siri/external/httpasyncclient-4.0-alpha3.jar b/external/httpasyncclient-4.0-alpha3.jar
similarity index 100%
rename from siri/external/httpasyncclient-4.0-alpha3.jar
rename to external/httpasyncclient-4.0-alpha3.jar
diff --git a/siri/external/httpclient-4.1.2.jar b/external/httpclient-4.1.2.jar
similarity index 100%
rename from siri/external/httpclient-4.1.2.jar
rename to external/httpclient-4.1.2.jar
diff --git a/siri/external/httpcore-4.2-alpha2.jar b/external/httpcore-4.2-alpha2.jar
similarity index 100%
rename from siri/external/httpcore-4.2-alpha2.jar
rename to external/httpcore-4.2-alpha2.jar
diff --git a/siri/external/httpcore-nio-4.2-alpha2.jar b/external/httpcore-nio-4.2-alpha2.jar
similarity index 100%
rename from siri/external/httpcore-nio-4.2-alpha2.jar
rename to external/httpcore-nio-4.2-alpha2.jar
diff --git a/siri/external/jackson-core-lgpl-1.9.1.jar b/external/jackson-core-lgpl-1.9.1.jar
similarity index 100%
rename from siri/external/jackson-core-lgpl-1.9.1.jar
rename to external/jackson-core-lgpl-1.9.1.jar
diff --git a/siri/external/jackson-mapper-lgpl-1.9.1.jar b/external/jackson-mapper-lgpl-1.9.1.jar
similarity index 100%
rename from siri/external/jackson-mapper-lgpl-1.9.1.jar
rename to external/jackson-mapper-lgpl-1.9.1.jar
diff --git a/siri/external/logback-classic-0.9.30.jar b/external/logback-classic-0.9.30.jar
similarity index 100%
rename from siri/external/logback-classic-0.9.30.jar
rename to external/logback-classic-0.9.30.jar
diff --git a/siri/external/logback-core-0.9.30.jar b/external/logback-core-0.9.30.jar
similarity index 100%
rename from siri/external/logback-core-0.9.30.jar
rename to external/logback-core-0.9.30.jar
diff --git a/siri/external/logback.xml b/external/logback.xml
similarity index 100%
rename from siri/external/logback.xml
rename to external/logback.xml
diff --git a/siri/external/slf4j-api-1.6.3.jar b/external/slf4j-api-1.6.3.jar
similarity index 100%
rename from siri/external/slf4j-api-1.6.3.jar
rename to external/slf4j-api-1.6.3.jar
diff --git a/siri/src/siri/Configurable.java b/src/siri/Configurable.java
similarity index 100%
rename from siri/src/siri/Configurable.java
rename to src/siri/Configurable.java
diff --git a/siri/src/siri/Consts.java b/src/siri/Consts.java
similarity index 100%
rename from siri/src/siri/Consts.java
rename to src/siri/Consts.java
diff --git a/siri/src/siri/Context.java b/src/siri/Context.java
similarity index 100%
rename from siri/src/siri/Context.java
rename to src/siri/Context.java
diff --git a/siri/src/siri/Data.java b/src/siri/Data.java
similarity index 100%
rename from siri/src/siri/Data.java
rename to src/siri/Data.java
diff --git a/siri/src/siri/IConfigurable.java b/src/siri/IConfigurable.java
similarity index 100%
rename from siri/src/siri/IConfigurable.java
rename to src/siri/IConfigurable.java
diff --git a/siri/src/siri/IModule.java b/src/siri/IModule.java
similarity index 100%
rename from siri/src/siri/IModule.java
rename to src/siri/IModule.java
diff --git a/siri/src/siri/IRenderer.java b/src/siri/IRenderer.java
similarity index 100%
rename from siri/src/siri/IRenderer.java
rename to src/siri/IRenderer.java
diff --git a/siri/src/siri/IRequestCallback.java b/src/siri/IRequestCallback.java
similarity index 100%
rename from siri/src/siri/IRequestCallback.java
rename to src/siri/IRequestCallback.java
diff --git a/siri/src/siri/ISource.java b/src/siri/ISource.java
similarity index 100%
rename from siri/src/siri/ISource.java
rename to src/siri/ISource.java
diff --git a/siri/src/siri/IString.java b/src/siri/IString.java
similarity index 100%
rename from siri/src/siri/IString.java
rename to src/siri/IString.java
diff --git a/siri/src/siri/ITask.java b/src/siri/ITask.java
similarity index 100%
rename from siri/src/siri/ITask.java
rename to src/siri/ITask.java
diff --git a/siri/src/siri/ModuleDefault.java b/src/siri/ModuleDefault.java
similarity index 100%
rename from siri/src/siri/ModuleDefault.java
rename to src/siri/ModuleDefault.java
diff --git a/siri/src/siri/ModuleHandler.java b/src/siri/ModuleHandler.java
similarity index 100%
rename from siri/src/siri/ModuleHandler.java
rename to src/siri/ModuleHandler.java
diff --git a/siri/src/siri/ObjectFactory.java b/src/siri/ObjectFactory.java
similarity index 100%
rename from siri/src/siri/ObjectFactory.java
rename to src/siri/ObjectFactory.java
diff --git a/siri/src/siri/ObjectTree.java b/src/siri/ObjectTree.java
similarity index 100%
rename from siri/src/siri/ObjectTree.java
rename to src/siri/ObjectTree.java
diff --git a/siri/src/siri/RendererIdentity.java b/src/siri/RendererIdentity.java
similarity index 100%
rename from siri/src/siri/RendererIdentity.java
rename to src/siri/RendererIdentity.java
diff --git a/siri/src/siri/RequestContext.java b/src/siri/RequestContext.java
similarity index 100%
rename from siri/src/siri/RequestContext.java
rename to src/siri/RequestContext.java
diff --git a/siri/src/siri/Result.java b/src/siri/Result.java
similarity index 100%
rename from siri/src/siri/Result.java
rename to src/siri/Result.java
diff --git a/siri/src/siri/SourceDummy.java b/src/siri/SourceDummy.java
similarity index 100%
rename from siri/src/siri/SourceDummy.java
rename to src/siri/SourceDummy.java
diff --git a/siri/src/siri/SourceWebService.java b/src/siri/SourceWebService.java
similarity index 100%
rename from siri/src/siri/SourceWebService.java
rename to src/siri/SourceWebService.java
diff --git a/siri/src/siri/StringDefault.java b/src/siri/StringDefault.java
similarity index 100%
rename from siri/src/siri/StringDefault.java
rename to src/siri/StringDefault.java
diff --git a/siri/src/siri/TaskManager.java b/src/siri/TaskManager.java
similarity index 100%
rename from siri/src/siri/TaskManager.java
rename to src/siri/TaskManager.java
diff --git a/siri/subtree.js b/subtree.js
similarity index 100%
rename from siri/subtree.js
rename to subtree.js