Refactoring koneki => ldt

1942 files changed, 3658 insertions, 3730 deletions

diff --git a/.project b/.project
index 7b45a69..033c20d 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>koneki.ldt</name>

+	<name>eclipse.ldt</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/features/org.eclipse.koneki.ldt-feature/.project b/features/org.eclipse.ldt-feature/.project
index e2700f0..54a20bf 100644
--- a/features/org.eclipse.koneki.ldt-feature/.project
+++ b/features/org.eclipse.ldt-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt-feature</name>
+	<name>org.eclipse.ldt-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/features/org.eclipse.koneki.ldt-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.ldt-feature/.settings/org.eclipse.core.resources.prefs
index 64e0d78..64e0d78 100644
--- a/features/org.eclipse.koneki.ldt-feature/.settings/org.eclipse.core.resources.prefs
+++ b/features/org.eclipse.ldt-feature/.settings/org.eclipse.core.resources.prefs
diff --git a/features/org.eclipse.koneki.ldt-feature/build.properties b/features/org.eclipse.ldt-feature/build.properties
index 19af387..19af387 100644
--- a/features/org.eclipse.koneki.ldt-feature/build.properties
+++ b/features/org.eclipse.ldt-feature/build.properties
diff --git a/features/org.eclipse.koneki.ldt-feature/epl-v10.html b/features/org.eclipse.ldt-feature/epl-v10.html
index ed4b196..ed4b196 100644
--- a/features/org.eclipse.koneki.ldt-feature/epl-v10.html
+++ b/features/org.eclipse.ldt-feature/epl-v10.html
diff --git a/features/org.eclipse.koneki.ldt-feature/feature.properties b/features/org.eclipse.ldt-feature/feature.properties
index 10acebe..dd5842c 100644
--- a/features/org.eclipse.koneki.ldt-feature/feature.properties
+++ b/features/org.eclipse.ldt-feature/feature.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 featureName=Lua Development Tools
 description=Lua Development Tools. (Binary runtime and user documentation).
-providerName=Eclipse Koneki
+providerName=Eclipse LDT
 copyright=Copyright (c) 2009, 2012 Sierra Wireless and others. All rights reserved.
 
 license=\
diff --git a/features/org.eclipse.koneki.ldt-feature/feature.xml b/features/org.eclipse.ldt-feature/feature.xml
index a26a55b..f6293c0 100644
--- a/features/org.eclipse.koneki.ldt-feature/feature.xml
+++ b/features/org.eclipse.ldt-feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.koneki.ldt"
+      id="org.eclipse.ldt"
       label="%featureName"
       version="1.3.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.koneki.ldt.branding">
+      plugin="org.eclipse.ldt.branding">
 
    <description>
       %description
@@ -35,21 +35,21 @@
    </requires>
 
    <plugin
-         id="org.eclipse.koneki.ldt.doc.user"
+         id="org.eclipse.ldt.doc.user"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.metalua"
+         id="org.eclipse.ldt.metalua"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.ui"
+         id="org.eclipse.ldt.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -70,21 +70,21 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.debug.core"
+         id="org.eclipse.ldt.debug.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.debug.ui"
+         id="org.eclipse.ldt.debug.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt"
+         id="org.eclipse.ldt"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -98,14 +98,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.support.lua51"
+         id="org.eclipse.ldt.support.lua51"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.support.lua52"
+         id="org.eclipse.ldt.support.lua52"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -212,7 +212,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.branding"
+         id="org.eclipse.ldt.branding"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.koneki.ldt-feature/license.html b/features/org.eclipse.ldt-feature/license.html
index 98b25ac..98b25ac 100644
--- a/features/org.eclipse.koneki.ldt-feature/license.html
+++ b/features/org.eclipse.ldt-feature/license.html
diff --git a/features/org.eclipse.koneki.ldt-feature/pom.xml b/features/org.eclipse.ldt-feature/pom.xml
index 070e89f..0d2c948 100644
--- a/features/org.eclipse.koneki.ldt-feature/pom.xml
+++ b/features/org.eclipse.ldt-feature/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>features</artifactId>
-		<groupId>org.eclipse.koneki.ldt-features</groupId>
+		<groupId>org.eclipse.ldt-features</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt-features</groupId>
-	<artifactId>org.eclipse.koneki.ldt</artifactId>
+	<groupId>org.eclipse.ldt-features</groupId>
+	<artifactId>org.eclipse.ldt</artifactId>
 	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<build>
@@ -32,9 +32,9 @@
 						<plugin id="com.naef.jnlua.linux"/>
 						<plugin id="com.naef.jnlua.linux64"/>
 						<plugin id="com.naef.jnlua.macosx"/>
-						<plugin id="org.eclipse.koneki.ldt.metalua.32bits"/>
-						<plugin id="org.eclipse.koneki.ldt.metalua.64bits"/>
-						<plugin id="org.eclipse.koneki.ldt.doc.user"/>
+						<plugin id="org.eclipse.ldt.metalua.32bits"/>
+						<plugin id="org.eclipse.ldt.metalua.64bits"/>
+						<plugin id="org.eclipse.ldt.doc.user"/>
 					</excludes>
 				</configuration>
 			</plugin>
diff --git a/features/org.eclipse.koneki.ldt-feature/sourceTemplateFeature/.gitkeep b/features/org.eclipse.ldt-feature/sourceTemplateFeature/.gitkeep
index e69de29..e69de29 100644
--- a/features/org.eclipse.koneki.ldt-feature/sourceTemplateFeature/.gitkeep
+++ b/features/org.eclipse.ldt-feature/sourceTemplateFeature/.gitkeep
diff --git a/features/org.eclipse.koneki.ldt.product-feature/.project b/features/org.eclipse.ldt.product-feature/.project
index ade6b4f..7955104 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/.project
+++ b/features/org.eclipse.ldt.product-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.product-feature</name>
+	<name>org.eclipse.ldt.product-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/features/org.eclipse.koneki.ldt.product-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.ldt.product-feature/.settings/org.eclipse.core.resources.prefs
index 64e0d78..64e0d78 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/.settings/org.eclipse.core.resources.prefs
+++ b/features/org.eclipse.ldt.product-feature/.settings/org.eclipse.core.resources.prefs
diff --git a/features/org.eclipse.koneki.ldt.product-feature/build.properties b/features/org.eclipse.ldt.product-feature/build.properties
index 78a5882..78a5882 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/build.properties
+++ b/features/org.eclipse.ldt.product-feature/build.properties
diff --git a/features/org.eclipse.koneki.ldt.product-feature/epl-v10.html b/features/org.eclipse.ldt.product-feature/epl-v10.html
index ed4b196..ed4b196 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/epl-v10.html
+++ b/features/org.eclipse.ldt.product-feature/epl-v10.html
diff --git a/features/org.eclipse.koneki.ldt.product-feature/feature.xml b/features/org.eclipse.ldt.product-feature/feature.xml
index 7f162e6..22ae0b6 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/feature.xml
+++ b/features/org.eclipse.ldt.product-feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.koneki.ldt.product"
+      id="org.eclipse.ldt.product"
       label="Lua Development Tools - branding"
       version="1.3.0.qualifier"
-      provider-name="Koneki"
-      plugin="org.eclipse.koneki.ldt.branding">
+      provider-name="Eclipse LDT"
+      plugin="org.eclipse.ldt.branding">
 
    <description>
       Enable Lua development with source code files edition, lua project,
@@ -111,7 +111,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.koneki.ldt"
+         id="org.eclipse.ldt"
          version="0.0.0"/>
 
    <includes
diff --git a/features/org.eclipse.koneki.ldt.product-feature/license.html b/features/org.eclipse.ldt.product-feature/license.html
index 61d632d..61d632d 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/license.html
+++ b/features/org.eclipse.ldt.product-feature/license.html
diff --git a/features/org.eclipse.koneki.ldt.product-feature/p2.inf b/features/org.eclipse.ldt.product-feature/p2.inf
index e28c152..f43a5f0 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/p2.inf
+++ b/features/org.eclipse.ldt.product-feature/p2.inf
@@ -5,5 +5,5 @@ requires.1.namespace = org.eclipse.equinox.p2.iu
 requires.1.name = org.eclipse.dltk.core.feature.group

 requires.1.range = [3.0.0,100.0.0)

 requires.2.namespace = org.eclipse.equinox.p2.iu

-requires.2.name = org.eclipse.koneki.ldt.feature.group

+requires.2.name = org.eclipse.ldt.feature.group

 requires.2.range = [0.9.0,100.0.0)
\ No newline at end of file
diff --git a/features/org.eclipse.koneki.ldt.remote-feature/pom.xml b/features/org.eclipse.ldt.product-feature/pom.xml
index 4e0edff..03f46fa 100644
--- a/features/org.eclipse.koneki.ldt.remote-feature/pom.xml
+++ b/features/org.eclipse.ldt.product-feature/pom.xml
@@ -4,11 +4,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>features</artifactId>
-    <groupId>org.eclipse.koneki.ldt-features</groupId>
+    <groupId>org.eclipse.ldt-features</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt-features</groupId>
-  <artifactId>org.eclipse.koneki.ldt.remote</artifactId>
+  <groupId>org.eclipse.ldt-features</groupId>
+  <artifactId>org.eclipse.ldt.product</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.koneki.ldt.remote-feature/.project b/features/org.eclipse.ldt.remote-feature/.project
index 5ef543e..7987845 100644
--- a/features/org.eclipse.koneki.ldt.remote-feature/.project
+++ b/features/org.eclipse.ldt.remote-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt.remote-feature</name>

+	<name>org.eclipse.ldt.remote-feature</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/features/org.eclipse.koneki.ldt.remote-feature/build.properties b/features/org.eclipse.ldt.remote-feature/build.properties
index dec87bd..dec87bd 100644
--- a/features/org.eclipse.koneki.ldt.remote-feature/build.properties
+++ b/features/org.eclipse.ldt.remote-feature/build.properties
diff --git a/features/org.eclipse.koneki.ldt.remote-feature/epl-v10.html b/features/org.eclipse.ldt.remote-feature/epl-v10.html
index ed4b196..ed4b196 100644
--- a/features/org.eclipse.koneki.ldt.remote-feature/epl-v10.html
+++ b/features/org.eclipse.ldt.remote-feature/epl-v10.html
diff --git a/features/org.eclipse.koneki.ldt.remote-feature/feature.properties b/features/org.eclipse.ldt.remote-feature/feature.properties
index a9daad6..d469563 100644
--- a/features/org.eclipse.koneki.ldt.remote-feature/feature.properties
+++ b/features/org.eclipse.ldt.remote-feature/feature.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 featureName=Lua Development Tools - Remote Development Support
 description=Lua Development Tools - Remote Development Support. (Binary runtime).
-providerName=Eclipse Koneki
+providerName=Eclipse LDT
 copyright=Copyright (c) 2009, 2012 Sierra Wireless and others. All rights reserved.
 
 license=\
diff --git a/features/org.eclipse.koneki.ldt.remote-feature/feature.xml b/features/org.eclipse.ldt.remote-feature/feature.xml
index fe3c7dd..5638eef 100644
--- a/features/org.eclipse.koneki.ldt.remote-feature/feature.xml
+++ b/features/org.eclipse.ldt.remote-feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.koneki.ldt.remote"
+      id="org.eclipse.ldt.remote"
       label="%featureName"
       version="1.3.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.koneki.ldt.branding">
+      plugin="org.eclipse.ldt.branding">
 
    <description>
       %description
@@ -20,32 +20,32 @@
 
    <requires>
       <import feature="org.eclipse.rse" version="3.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.koneki.ldt" version="0.9.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.ldt" version="0.9.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
-         id="org.eclipse.koneki.ldt.remote.core"
+         id="org.eclipse.ldt.remote.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.remote.debug.core"
+         id="org.eclipse.ldt.remote.debug.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.remote.debug.ui"
+         id="org.eclipse.ldt.remote.debug.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.koneki.ldt.remote.ui"
+         id="org.eclipse.ldt.remote.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.koneki.ldt.remote-feature/license.html b/features/org.eclipse.ldt.remote-feature/license.html
index 98b25ac..98b25ac 100644
--- a/features/org.eclipse.koneki.ldt.remote-feature/license.html
+++ b/features/org.eclipse.ldt.remote-feature/license.html
diff --git a/features/org.eclipse.koneki.ldt.product-feature/pom.xml b/features/org.eclipse.ldt.remote-feature/pom.xml
index 75a7328..655c383 100644
--- a/features/org.eclipse.koneki.ldt.product-feature/pom.xml
+++ b/features/org.eclipse.ldt.remote-feature/pom.xml
@@ -4,11 +4,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>features</artifactId>
-    <groupId>org.eclipse.koneki.ldt-features</groupId>
+    <groupId>org.eclipse.ldt-features</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt-features</groupId>
-  <artifactId>org.eclipse.koneki.ldt.product</artifactId>
+  <groupId>org.eclipse.ldt-features</groupId>
+  <artifactId>org.eclipse.ldt.remote</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 004b34e..1eecd14 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -3,18 +3,18 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<parent>
 		<artifactId>aggregator</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.koneki.ldt-features</groupId>
+  <groupId>org.eclipse.ldt-features</groupId>
   <artifactId>features</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
-    <module>org.eclipse.koneki.ldt-feature</module>
-    <module>org.eclipse.koneki.ldt.product-feature</module>
-    <module>org.eclipse.koneki.ldt.remote-feature</module>
+    <module>org.eclipse.ldt-feature</module>
+    <module>org.eclipse.ldt.product-feature</module>
+    <module>org.eclipse.ldt.remote-feature</module>
   </modules>
 
   <build>
diff --git a/libraries/luadbgpclient/pom.xml b/libraries/luadbgpclient/pom.xml
index e9ca2dd..a0e6695 100644
--- a/libraries/luadbgpclient/pom.xml
+++ b/libraries/luadbgpclient/pom.xml
@@ -5,10 +5,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>libraries</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>luadbgpclient</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
diff --git a/libraries/luadocumentor/.buildpath b/libraries/luadocumentor/.buildpath
index 79d49f9..330dfa2 100644
--- a/libraries/luadocumentor/.buildpath
+++ b/libraries/luadocumentor/.buildpath
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <buildpath>
-	<buildpathentry kind="con" path="org.eclipse.koneki.ldt.ExecutionEnvironmentContainer/lua/5.1"/>
+	<buildpathentry kind="con" path="org.eclipse.ldt.ExecutionEnvironmentContainer/lua/5.1"/>
 	<buildpathentry kind="src" path="."/>
 </buildpath>
diff --git a/libraries/luadocumentor/.project b/libraries/luadocumentor/.project
index a741df7..005f174 100644
--- a/libraries/luadocumentor/.project
+++ b/libraries/luadocumentor/.project
@@ -12,6 +12,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.koneki.ldt.nature</nature>
+		<nature>org.eclipse.ldt.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/libraries/luadocumentor/pom.xml b/libraries/luadocumentor/pom.xml
index 929f341..cf22e3d 100644
--- a/libraries/luadocumentor/pom.xml
+++ b/libraries/luadocumentor/pom.xml
@@ -5,10 +5,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>libraries</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>luadocumentor</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
diff --git a/libraries/metalua/VERSION b/libraries/metalua/VERSION
index 8c225ed..6251c88 100644
--- a/libraries/metalua/VERSION
+++ b/libraries/metalua/VERSION
@@ -1,4 +1,4 @@
 This version of Metalua is available at:
-    * git://git.eclipse.org/gitroot/koneki/org.eclipse.koneki.metalua.git
+    * git://git.eclipse.org/gitroot/ldt/org.eclipse.metalua.git
     * The commit is e9723422c7d77b8ecb80a9c27fa8ff040cb4a8a1
 + removal of checks() calls in the lexer to fix performance issue.
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 502c57b..765fc6a 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -5,10 +5,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>aggregator</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>libraries</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
diff --git a/plugins/com.cforcoding.jmd/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.cforcoding.jmd/.settings/org.eclipse.jdt.ui.prefs
index 578a17e..43a0378 100644
--- a/plugins/com.cforcoding.jmd/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.cforcoding.jmd/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.cforcoding.jmd/pom.xml b/plugins/com.cforcoding.jmd/pom.xml
index 19162bc..07d61d0 100644
--- a/plugins/com.cforcoding.jmd/pom.xml
+++ b/plugins/com.cforcoding.jmd/pom.xml
@@ -4,10 +4,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
+  <groupId>org.eclipse.ldt</groupId>
   <artifactId>com.cforcoding.jmd</artifactId>
   <version>0.8.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua-lua51/.checkstyle b/plugins/com.naef.jnlua-lua51/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua-lua51/.checkstyle
+++ b/plugins/com.naef.jnlua-lua51/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua-lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua-lua51/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua-lua51/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua-lua51/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua-lua51/pom.xml b/plugins/com.naef.jnlua-lua51/pom.xml
index cccafdf..62a64a7 100644
--- a/plugins/com.naef.jnlua-lua51/pom.xml
+++ b/plugins/com.naef.jnlua-lua51/pom.xml
@@ -4,10 +4,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
+  <groupId>org.eclipse.ldt</groupId>
   <artifactId>com.naef.jnlua</artifactId>
   <version>0.9.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua-lua52/.checkstyle b/plugins/com.naef.jnlua-lua52/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua-lua52/.checkstyle
+++ b/plugins/com.naef.jnlua-lua52/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua-lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua-lua52/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua-lua52/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua-lua52/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua-lua52/pom.xml b/plugins/com.naef.jnlua-lua52/pom.xml
index 7c1270a..f42e678 100644
--- a/plugins/com.naef.jnlua-lua52/pom.xml
+++ b/plugins/com.naef.jnlua-lua52/pom.xml
@@ -4,10 +4,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
+  <groupId>org.eclipse.ldt</groupId>
   <artifactId>com.naef.jnlua</artifactId>
   <version>1.0.3-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.linux-lua51/.checkstyle b/plugins/com.naef.jnlua.linux-lua51/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.linux-lua51/.checkstyle
+++ b/plugins/com.naef.jnlua.linux-lua51/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.linux-lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.linux-lua51/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.linux-lua51/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.linux-lua51/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.linux-lua51/pom.xml b/plugins/com.naef.jnlua.linux-lua51/pom.xml
index 4682333..9229382 100644
--- a/plugins/com.naef.jnlua.linux-lua51/pom.xml
+++ b/plugins/com.naef.jnlua.linux-lua51/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.linux</artifactId>
 	<version>0.9.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.linux-lua52/.checkstyle b/plugins/com.naef.jnlua.linux-lua52/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.linux-lua52/.checkstyle
+++ b/plugins/com.naef.jnlua.linux-lua52/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.linux-lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.linux-lua52/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.linux-lua52/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.linux-lua52/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.linux-lua52/pom.xml b/plugins/com.naef.jnlua.linux-lua52/pom.xml
index 3440e52..3f8ca5f 100644
--- a/plugins/com.naef.jnlua.linux-lua52/pom.xml
+++ b/plugins/com.naef.jnlua.linux-lua52/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.linux</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.linux64-lua51/.checkstyle b/plugins/com.naef.jnlua.linux64-lua51/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.linux64-lua51/.checkstyle
+++ b/plugins/com.naef.jnlua.linux64-lua51/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.linux64-lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.linux64-lua51/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.linux64-lua51/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.linux64-lua51/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.linux64-lua51/pom.xml b/plugins/com.naef.jnlua.linux64-lua51/pom.xml
index 4c77597..504ec87 100644
--- a/plugins/com.naef.jnlua.linux64-lua51/pom.xml
+++ b/plugins/com.naef.jnlua.linux64-lua51/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.linux64</artifactId>
 	<version>0.9.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.linux64-lua52/.checkstyle b/plugins/com.naef.jnlua.linux64-lua52/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.linux64-lua52/.checkstyle
+++ b/plugins/com.naef.jnlua.linux64-lua52/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.linux64-lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.linux64-lua52/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.linux64-lua52/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.linux64-lua52/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.linux64-lua52/pom.xml b/plugins/com.naef.jnlua.linux64-lua52/pom.xml
index f9c9fae..d727722 100644
--- a/plugins/com.naef.jnlua.linux64-lua52/pom.xml
+++ b/plugins/com.naef.jnlua.linux64-lua52/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.linux64</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.macosx-lua51/.checkstyle b/plugins/com.naef.jnlua.macosx-lua51/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.macosx-lua51/.checkstyle
+++ b/plugins/com.naef.jnlua.macosx-lua51/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.macosx-lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.macosx-lua51/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.macosx-lua51/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.macosx-lua51/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.macosx-lua51/pom.xml b/plugins/com.naef.jnlua.macosx-lua51/pom.xml
index 373beba..4503a29 100644
--- a/plugins/com.naef.jnlua.macosx-lua51/pom.xml
+++ b/plugins/com.naef.jnlua.macosx-lua51/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.macosx</artifactId>
 	<version>0.9.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.macosx-lua52/.checkstyle b/plugins/com.naef.jnlua.macosx-lua52/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.macosx-lua52/.checkstyle
+++ b/plugins/com.naef.jnlua.macosx-lua52/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.macosx-lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.macosx-lua52/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.macosx-lua52/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.macosx-lua52/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.macosx-lua52/pom.xml b/plugins/com.naef.jnlua.macosx-lua52/pom.xml
index 092a18b..c881041 100644
--- a/plugins/com.naef.jnlua.macosx-lua52/pom.xml
+++ b/plugins/com.naef.jnlua.macosx-lua52/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.macosx</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.windows-lua51/.checkstyle b/plugins/com.naef.jnlua.windows-lua51/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.windows-lua51/.checkstyle
+++ b/plugins/com.naef.jnlua.windows-lua51/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.windows-lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.windows-lua51/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.windows-lua51/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.windows-lua51/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.windows-lua51/pom.xml b/plugins/com.naef.jnlua.windows-lua51/pom.xml
index c707b41..836fb13 100644
--- a/plugins/com.naef.jnlua.windows-lua51/pom.xml
+++ b/plugins/com.naef.jnlua.windows-lua51/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.windows</artifactId>
 	<version>0.9.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.windows-lua52/.checkstyle b/plugins/com.naef.jnlua.windows-lua52/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.windows-lua52/.checkstyle
+++ b/plugins/com.naef.jnlua.windows-lua52/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.windows-lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.windows-lua52/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.windows-lua52/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.windows-lua52/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.windows-lua52/pom.xml b/plugins/com.naef.jnlua.windows-lua52/pom.xml
index 6f18ed4..d7aebdd 100644
--- a/plugins/com.naef.jnlua.windows-lua52/pom.xml
+++ b/plugins/com.naef.jnlua.windows-lua52/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.windows</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.windows64-lua51/.checkstyle b/plugins/com.naef.jnlua.windows64-lua51/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.windows64-lua51/.checkstyle
+++ b/plugins/com.naef.jnlua.windows64-lua51/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.windows64-lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.windows64-lua51/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.windows64-lua51/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.windows64-lua51/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.windows64-lua51/pom.xml b/plugins/com.naef.jnlua.windows64-lua51/pom.xml
index 2fc6799..0a4c04a 100644
--- a/plugins/com.naef.jnlua.windows64-lua51/pom.xml
+++ b/plugins/com.naef.jnlua.windows64-lua51/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.windows64</artifactId>
 	<version>0.9.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/com.naef.jnlua.windows64-lua52/.checkstyle b/plugins/com.naef.jnlua.windows64-lua52/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/com.naef.jnlua.windows64-lua52/.checkstyle
+++ b/plugins/com.naef.jnlua.windows64-lua52/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/com.naef.jnlua.windows64-lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/com.naef.jnlua.windows64-lua52/.settings/org.eclipse.jdt.ui.prefs
index 2ac8426..ab8ba28 100644
--- a/plugins/com.naef.jnlua.windows64-lua52/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/com.naef.jnlua.windows64-lua52/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} Sierra Wireless and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Sierra Wireless - initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * TODO Comment this class\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/com.naef.jnlua.windows64-lua52/pom.xml b/plugins/com.naef.jnlua.windows64-lua52/pom.xml
index bcab01b..89eab17 100644
--- a/plugins/com.naef.jnlua.windows64-lua52/pom.xml
+++ b/plugins/com.naef.jnlua.windows64-lua52/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>com.naef.jnlua.windows64</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/.api_filters b/plugins/org.eclipse.koneki.ldt.debug.core/.settings/.api_filters
deleted file mode 100644
index b258fef..0000000
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/.api_filters
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.koneki.ldt.debug.core" version="2">
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/Info.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/InterpreterFactory.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterFactory">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterFactory"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/InterpreterPackage.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InfoImpl.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InterpreterFactoryImpl.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InterpreterPackageImpl.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/util/InterpreterAdapterFactory.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.util.InterpreterAdapterFactory">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.util.InterpreterAdapterFactory"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/util/InterpreterSwitch.java" type="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.util.InterpreterSwitch">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.util.InterpreterSwitch"/>
-                <message_argument value="org.eclipse.koneki.ldt.debug.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.koneki.ldt.debug.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 82a11dc..0000000
--- a/plugins/org.eclipse.koneki.ldt.debug.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.debug.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.debug.core.internal.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.debug;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt,
- org.apache.commons.lang,
- org.eclipse.core.variables
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.koneki.ldt.debug.core,
- org.eclipse.koneki.ldt.debug.core.internal;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.remote.debug.core",
- org.eclipse.koneki.ldt.debug.core.internal.attach;x-friends:="org.eclipse.koneki.ldt.remote.debug.core",
- org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;x-friends:="org.eclipse.koneki.ldt.support.lua51,org.eclipse.koneki.ldt.debug.ui",
- org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;x-friends:="org.eclipse.koneki.ldt.support.lua51,org.eclipse.koneki.ldt.support.lua52",
- org.eclipse.koneki.ldt.debug.core.internal.interpreter.luajit;x-internal:=true,
- org.eclipse.koneki.ldt.debug.core.internal.local;x-friends:="org.eclipse.debug.core",
- org.eclipse.koneki.ldt.debug.core.internal.model.interpreter;x-friends:="org.eclipse.koneki.ldt.support.lua51,org.eclipse.koneki.ldt.support.lua52",
- org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl;x-friends:="org.eclipse.koneki.ldt.support.lua51,org.eclipse.koneki.ldt.support.lua52",
- org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.util;x-friends:="org.eclipse.koneki.ldt.support.lua51,org.eclipse.koneki.ldt.support.lua52",
- org.eclipse.koneki.ldt.debug.core.interpreter
-Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/plugin.xml b/plugins/org.eclipse.koneki.ldt.debug.core/plugin.xml
deleted file mode 100644
index b92498e..0000000
--- a/plugins/org.eclipse.koneki.ldt.debug.core/plugin.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?><!--

-    Copyright (c) 2009, 2011 Sierra Wireless and others.

-    All rights reserved. This program and the accompanying materials

-    are made available under the terms of the Eclipse Public License v1.0

-    which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

-   

-    Contributors:

-        Sierra Wireless - initial API and implementation

- -->

-<plugin>

-   <extension

-         point="org.eclipse.debug.core.launchConfigurationTypes">

-      <launchConfigurationType

-            delegate="org.eclipse.koneki.ldt.debug.core.internal.attach.LuaAttachLaunchConfigurationDelegate"

-            id="org.eclipse.koneki.ldt.debug.core.luaattachdebug"

-            modes="debug"

-            name="%RemoteLuaLaunchConfigurationType.name"

-            sourceLocatorId="org.eclipse.koneki.ldt.debug.core.SourceLookup"

-            sourcePathComputerId="org.eclipse.koneki.ldt.debug.core.LuaAttachSourcePathComputer">

-      </launchConfigurationType>

-      <launchConfigurationType

-            delegate="org.eclipse.koneki.ldt.debug.core.internal.local.LuaLaunchConfigurationDelegate"

-            id="org.eclipse.koneki.ldt.debug.core.lualocaldebug"

-            modes="run, debug"

-            name="%LocalLuaLaunchConfigurationType.name"

-            sourceLocatorId="org.eclipse.koneki.ldt.debug.core.SourceLookup"

-            sourcePathComputerId="org.eclipse.koneki.ldt.debug.core.LuaLocalSourcePathComputer">

-      </launchConfigurationType>

-   </extension>

-   <extension

-         point="org.eclipse.dltk.debug.scriptDebugModel">

-      <debugModel

-            debugModelId="org.eclipse.koneki.ldt.nature.debugModel"

-            natureId="org.eclipse.koneki.ldt.nature"

-            typeFactory="org.eclipse.koneki.ldt.debug.core.internal.LuaTypeFactory"

-            variableNameComparator="org.eclipse.koneki.ldt.debug.core.internal.LuaVariableComparator">

-      </debugModel>

-   </extension>

-   <extension point="org.eclipse.core.runtime.preferences">

-      <initializer 

-        class="org.eclipse.koneki.ldt.debug.core.internal.LuaDebugPreferenceInitializer"/>

-  </extension>

-    <extension

-        point="org.eclipse.debug.core.sourceLocators">

-        <sourceLocator

-           class="org.eclipse.koneki.ldt.debug.core.internal.LuaSourceLookupDirector"

-           id="org.eclipse.koneki.ldt.debug.core.SourceLookup"

-           name="%LuaSourceLocator.name" />

-   </extension>

-    <extension

-          point="org.eclipse.debug.core.sourcePathComputers">

-       <sourcePathComputer

-             class="org.eclipse.koneki.ldt.debug.core.internal.local.LuaLocalSourcePathComputer"

-             id="org.eclipse.koneki.ldt.debug.core.LuaLocalSourcePathComputer">

-       </sourcePathComputer>

-    </extension>

-   <extension 

-        point="org.eclipse.debug.core.sourcePathComputers">

-        <sourcePathComputer

-            class="org.eclipse.koneki.ldt.debug.core.internal.attach.LuaAttachSourcePathComputer"

-            id="org.eclipse.koneki.ldt.debug.core.LuaAttachSourcePathComputer"/>

-   </extension>

-    <extension

-		point="org.eclipse.debug.core.watchExpressionDelegates">

-		<watchExpressionDelegate

-			debugModel="org.eclipse.koneki.ldt.nature.debugModel"

-			delegateClass="org.eclipse.dltk.internal.debug.core.model.ScriptWatchExpressionDelegate">

-		</watchExpressionDelegate>

-	</extension>

-	<extension

-          point="org.eclipse.dltk.launching.interpreterInstallTypes">

-       <interpreterInstallType

-             class="org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterInstallType"

-             id="org.eclipse.koneki.ldt.debug.core.LuaGenericInterpreterInstallType">

-       </interpreterInstallType>

-       <interpreterInstallType

-             class="org.eclipse.koneki.ldt.debug.core.internal.interpreter.luajit.LuaJITInterpreterInstallType"

-             id="org.eclipse.koneki.ldt.debug.core.LuaJITInterpreterInstallType">

-       </interpreterInstallType>

-    </extension>

- <extension

-       point="org.eclipse.emf.ecore.generated_package">

-    <package

-          class="org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage"

-          uri="http://eclipse.org/koneki">

-    </package>

- </extension>
-</plugin>

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.koneki.ldt.debug.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bcfd480..0000000
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.debug.ui;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.debug.ui.internal.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.jface.text;bundle-version="3.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.ui.workbench.texteditor;bundle-version="3.6.0",
- org.eclipse.dltk.debug.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.debug;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt;bundle-version="0.9.0",
- org.eclipse.koneki.ldt.ui;bundle-version="0.9.0",
- org.eclipse.koneki.ldt.debug.core;bundle-version="0.9.0",
- org.eclipse.core.expressions;bundle-version="3.4.300",
- org.apache.commons.io;bundle-version="1.4.0",
- org.eclipse.jface
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.koneki.ldt.debug.ui.internal;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.debug.ui.internal.actions;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.debug.ui.internal.interpreters;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui"
-Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.project b/plugins/org.eclipse.koneki.ldt.remote.core/.project
deleted file mode 100644
index d6ea327..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.koneki.ldt.remote.core</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.checkstyle b/plugins/org.eclipse.koneki.ldt.remote.debug.core/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.project b/plugins/org.eclipse.koneki.ldt.remote.debug.core/.project
deleted file mode 100644
index 122fde6..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.koneki.ldt.remote.debug.core</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/plugin.xml b/plugins/org.eclipse.koneki.ldt.remote.debug.core/plugin.xml
deleted file mode 100644
index 9eccad7..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            id="org.eclipse.koneki.ldt.remote.debug.core.luaremotedebug"
-            modes="run, debug"
-            name="%launchConfigurationType.name"
-            delegate="org.eclipse.koneki.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationDelegate"
-            sourceLocatorId="org.eclipse.koneki.ldt.debug.core.SourceLookup"
-            sourcePathComputerId="org.eclipse.koneki.ldt.remote.debug.core.LuaRemoteSourcePathComputer">
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.sourcePathComputers">
-      <sourcePathComputer
-            class="org.eclipse.koneki.ldt.remote.debug.core.internal.launch.LuaRemoteSourcePathComputer"
-            id="org.eclipse.koneki.ldt.remote.debug.core.LuaRemoteSourcePathComputer">
-      </sourcePathComputer>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/pom.xml b/plugins/org.eclipse.koneki.ldt.remote.debug.core/pom.xml
deleted file mode 100644
index e9f5838..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-    Copyright (c) 2009, 2011 Sierra Wireless and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-        Sierra Wireless - initial API and implementation
- -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.remote.debug.core</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.checkstyle b/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.project b/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.project
deleted file mode 100644
index c9a1312..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.koneki.ldt.remote.debug.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.koneki.ldt.remote.debug.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 41485ab..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.remote.debug.ui;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.remote.debug.ui.internal.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.ui,
- org.eclipse.koneki.ldt.ui,
- org.eclipse.ui,
- org.eclipse.koneki.ldt.remote.debug.core,
- org.eclipse.rse.ui,
- org.eclipse.rse.core,
- org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.debug.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt,
- org.eclipse.koneki.ldt.remote.core,
- org.eclipse.koneki.ldt.debug.ui,
- org.eclipse.rse.subsystems.files.core
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.koneki.ldt.remote.debug.ui.internal;x-internal:=true,
- org.eclipse.koneki.ldt.remote.debug.ui.internal.launch;x-internal:=true,
- org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab;x-internal:=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.checkstyle b/plugins/org.eclipse.koneki.ldt.remote.ui/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.checkstyle b/plugins/org.eclipse.koneki.ldt.support.lua51/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.checkstyle b/plugins/org.eclipse.koneki.ldt.support.lua52/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.checkstyle b/plugins/org.eclipse.koneki.ldt.ui/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/plugins/org.eclipse.koneki.ldt.ui/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.koneki.ldt.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0013445..0000000
--- a/plugins/org.eclipse.koneki.ldt.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.ui.internal.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.ui.editors,
- org.eclipse.jface.text;bundle-version="3.5.0",
- org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.debug.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.formatter;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt.metalua;bundle-version="0.9.0",
- org.eclipse.koneki.ldt;bundle-version="0.1.0",
- org.eclipse.compare;bundle-version="3.5.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.ui,
- org.eclipse.koneki.ldt.ui.internal;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests,org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.ui.internal.buildpath;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.compare;x-internal:=true,
- org.eclipse.koneki.ldt.ui.internal.documentation;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.editor;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.editor.completion;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.editor.formatter;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.editor.navigation;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.editor.quickfix;x-internal:=true,
- org.eclipse.koneki.ldt.ui.internal.editor.templates;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.editor.text;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.editor.text.folding;x-internal:=true,
- org.eclipse.koneki.ldt.ui.internal.editor.text.rules;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.handlers;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.preferences;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.properties;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.propertytesters;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.search;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.internal.views;x-friends:="org.eclipse.koneki.ldt.debug.ui,org.eclipse.koneki.ldt.ui.tests",
- org.eclipse.koneki.ldt.ui.wizards,
- org.eclipse.koneki.ldt.ui.wizards.pages
-Import-Package: org.apache.commons.io;version="1.4.0"
diff --git a/plugins/org.eclipse.koneki.ldt/.checkstyle b/plugins/org.eclipse.koneki.ldt/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/plugins/org.eclipse.koneki.ldt/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt/META-INF/MANIFEST.MF b/plugins/org.eclipse.koneki.ldt/META-INF/MANIFEST.MF
deleted file mode 100644
index 3c40483..0000000
--- a/plugins/org.eclipse.koneki.ldt/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,74 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.core.internal.Activator
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.core.resources;bundle-version="3.5.0",
- org.eclipse.core.runtime,
- org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt.metalua;bundle-version="0.9.0",
- com.naef.jnlua;bundle-version="[0.9.1,1.0.0)",
- com.cforcoding.jmd;bundle-version="0.8.1",
- org.eclipse.text
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.core,
- org.eclipse.koneki.ldt.core.internal;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.ast;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.ast.models;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.ast.models.api;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.ast.models.common;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.ast.models.dltk;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.ast.models.file;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.ast.parser;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.buildpath;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.formatter;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests",
- org.eclipse.koneki.ldt.core.internal.todo;
-  x-friends:="org.eclipse.koneki.ldt.debug.core,
-   org.eclipse.koneki.ldt.debug.ui,
-   org.eclipse.koneki.ldt.ui,
-   org.eclipse.koneki.ldt.core.tests"
-Import-Package: org.apache.commons.io;version="1.4.0"
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.checkstyle b/plugins/org.eclipse.ldt.branding/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.checkstyle
+++ b/plugins/org.eclipse.ldt.branding/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.classpath b/plugins/org.eclipse.ldt.branding/.classpath
index 8a8f166..8a8f166 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.classpath
+++ b/plugins/org.eclipse.ldt.branding/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.fbprefs b/plugins/org.eclipse.ldt.branding/.fbprefs
index d2967a0..d2967a0 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.fbprefs
+++ b/plugins/org.eclipse.ldt.branding/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.gitignore b/plugins/org.eclipse.ldt.branding/.gitignore
index 5e56e04..5e56e04 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.gitignore
+++ b/plugins/org.eclipse.ldt.branding/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.project b/plugins/org.eclipse.ldt.branding/.project
index 4110fcc..2b50fe3 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/.project
+++ b/plugins/org.eclipse.ldt.branding/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.ui</name>
+	<name>org.eclipse.ldt.branding</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.core.resources.prefs
index 0c00bef..0c00bef 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.jdt.core.prefs
index 8afa7c8..8afa7c8 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.jdt.ui.prefs
index 8edc1b6..cfb0178 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.branding/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.branding/LDT_Splash_1.3_.xcf b/plugins/org.eclipse.ldt.branding/LDT_Splash_1.3_.xcf
index 4487b0b..4487b0b 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/LDT_Splash_1.3_.xcf
+++ b/plugins/org.eclipse.ldt.branding/LDT_Splash_1.3_.xcf
diff --git a/plugins/org.eclipse.koneki.ldt.branding/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.branding/META-INF/MANIFEST.MF
index fa89b5d..9e3821e 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.branding/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.branding;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.branding;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.p2.core;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.branding,
- org.eclipse.koneki.ldt.branding.splash.internal;x-internal:=true
-Bundle-Activator: org.eclipse.koneki.ldt.branding.Activator
+Export-Package: org.eclipse.ldt.branding,
+ org.eclipse.ldt.branding.splash.internal;x-internal:=true
+Bundle-Activator: org.eclipse.ldt.branding.Activator
diff --git a/plugins/org.eclipse.koneki.ldt.branding/META-INF/p2.inf b/plugins/org.eclipse.ldt.branding/META-INF/p2.inf
index 9004e71..b1eb450 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/META-INF/p2.inf
+++ b/plugins/org.eclipse.ldt.branding/META-INF/p2.inf
@@ -1,3 +1,3 @@
 instructions.configure=\
-	  addRepository(type:0,location:http${#58}//download.eclipse.org/koneki/releases/stable);\
-	  addRepository(type:1,location:http${#58}//download.eclipse.org/koneki/releases/stable);
\ No newline at end of file
+	  addRepository(type:0,location:http${#58}//download.eclipse.org/ldt/releases/stable);\
+	  addRepository(type:1,location:http${#58}//download.eclipse.org/ldt/releases/stable);
\ No newline at end of file
diff --git a/plugins/org.eclipse.koneki.ldt.branding/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.branding/OSGI-INF/l10n/bundle.properties
index c54daca..aaf86c2 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.branding/OSGI-INF/l10n/bundle.properties
@@ -8,7 +8,7 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.branding
-Bundle-Vendor = Eclipse Koneki
+#Properties file for org.eclipse.ldt.branding
+Bundle-Vendor = Eclipse LDT
 Bundle-Name = Lua Development Tools - All-in-one distribution
 product.name = Lua Development Tools
\ No newline at end of file
diff --git a/plugins/org.eclipse.koneki.ldt.branding/about.ini b/plugins/org.eclipse.ldt.branding/about.ini
index 4a4b030..4a4b030 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/about.ini
+++ b/plugins/org.eclipse.ldt.branding/about.ini
diff --git a/plugins/org.eclipse.koneki.ldt.branding/build.properties b/plugins/org.eclipse.ldt.branding/build.properties
index e437b0d..e437b0d 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/build.properties
+++ b/plugins/org.eclipse.ldt.branding/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_128.png b/plugins/org.eclipse.ldt.branding/icons/LDT_128.png
index 0fc6938..0fc6938 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_128.png
+++ b/plugins/org.eclipse.ldt.branding/icons/LDT_128.png
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_16.png b/plugins/org.eclipse.ldt.branding/icons/LDT_16.png
index 171dfae..171dfae 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_16.png
+++ b/plugins/org.eclipse.ldt.branding/icons/LDT_16.png
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_32.png b/plugins/org.eclipse.ldt.branding/icons/LDT_32.png
index 8307209..8307209 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_32.png
+++ b/plugins/org.eclipse.ldt.branding/icons/LDT_32.png
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_48.png b/plugins/org.eclipse.ldt.branding/icons/LDT_48.png
index 9e350c9..9e350c9 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_48.png
+++ b/plugins/org.eclipse.ldt.branding/icons/LDT_48.png
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_64.png b/plugins/org.eclipse.ldt.branding/icons/LDT_64.png
index df6af0a..df6af0a 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/LDT_64.png
+++ b/plugins/org.eclipse.ldt.branding/icons/LDT_64.png
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/ldt.icns b/plugins/org.eclipse.ldt.branding/icons/ldt.icns
index b4b8576..b4b8576 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/ldt.icns
+++ b/plugins/org.eclipse.ldt.branding/icons/ldt.icns
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/ldt.ico b/plugins/org.eclipse.ldt.branding/icons/ldt.ico
index 06328ff..06328ff 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/ldt.ico
+++ b/plugins/org.eclipse.ldt.branding/icons/ldt.ico
diff --git a/plugins/org.eclipse.koneki.ldt.branding/icons/ldt.xpm b/plugins/org.eclipse.ldt.branding/icons/ldt.xpm
index 1c89969..1c89969 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/icons/ldt.xpm
+++ b/plugins/org.eclipse.ldt.branding/icons/ldt.xpm
diff --git a/plugins/org.eclipse.koneki.ldt.branding/ldt_about.png b/plugins/org.eclipse.ldt.branding/ldt_about.png
index a3ae5b0..a3ae5b0 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/ldt_about.png
+++ b/plugins/org.eclipse.ldt.branding/ldt_about.png
diff --git a/plugins/org.eclipse.koneki.ldt.branding/ldt_logo.svg b/plugins/org.eclipse.ldt.branding/ldt_logo.svg
index 59bd5f9..59bd5f9 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/ldt_logo.svg
+++ b/plugins/org.eclipse.ldt.branding/ldt_logo.svg
diff --git a/plugins/org.eclipse.koneki.ldt.branding/ldt_logo_proposal.svg b/plugins/org.eclipse.ldt.branding/ldt_logo_proposal.svg
index 46fc741..46fc741 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/ldt_logo_proposal.svg
+++ b/plugins/org.eclipse.ldt.branding/ldt_logo_proposal.svg
diff --git a/plugins/org.eclipse.koneki.ldt.branding/plugin.xml b/plugins/org.eclipse.ldt.branding/plugin.xml
index 0779390..43d79d1 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/plugin.xml
+++ b/plugins/org.eclipse.ldt.branding/plugin.xml
@@ -6,10 +6,10 @@
          point="org.eclipse.core.runtime.products">
       <product
             application="org.eclipse.ui.ide.workbench"
-            name="%product.name">
+            name="Lua Development Tools Product">
          <property
                name="appName"
-               value="Lua Development Tools">
+               value="Lua Development Tools Product">
          </property>
          <property
                name="preferenceCustomization"
@@ -17,7 +17,7 @@
          </property>
             <property
                name="windowImages"
-               value="icons/LDT_16.png,icons/LDT_32.png,icons/LDT_64.png,icons/LDT_128.png">
+               value="icons/LDT_16.png,icons/LDT_32.png,icons/LDT_48.png,icons/LDT_64.png,icons/LDT_128.png">
          </property>
                <property
                name="startupProgressRect"
@@ -51,12 +51,12 @@
    <extension
          point="org.eclipse.ui.splashHandlers">
       <splashHandler
-            class="org.eclipse.koneki.ldt.branding.splash.internal.SplashHandler"
-            id="org.eclipse.koneki.ldt.ui.splashhandler">
+            class="org.eclipse.ldt.branding.splash.internal.SplashHandler"
+            id="org.eclipse.ldt.ui.splashhandler">
       </splashHandler>
       <splashHandlerProductBinding
-            productId="org.eclipse.koneki.ldt.branding.product"
-            splashId="org.eclipse.koneki.ldt.ui.splashhandler">
+            productId="org.eclipse.ldt.branding.product"
+            splashId="org.eclipse.ldt.ui.splashhandler">
       </splashHandlerProductBinding>
    </extension>
 </plugin>
diff --git a/plugins/org.eclipse.koneki.ldt.branding/plugin_customization.ini b/plugins/org.eclipse.ldt.branding/plugin_customization.ini
index 9a6fb62..9889973 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/plugin_customization.ini
+++ b/plugins/org.eclipse.ldt.branding/plugin_customization.ini
@@ -8,8 +8,8 @@ org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
 org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
 
 # default perspectiveId
-org.eclipse.ui/defaultPerspectiveId = org.eclipse.koneki.ldt.ui.luaperspective
-org.eclipse.ui/PERSPECTIVE_BAR_EXTRAS = org.eclipse.koneki.ldt.ui.luaperspective,org.eclipse.debug.ui.DebugPerspective
+org.eclipse.ui/defaultPerspectiveId = org.eclipse.ldt.ui.luaperspective
+org.eclipse.ui/PERSPECTIVE_BAR_EXTRAS = org.eclipse.ldt.ui.luaperspective,org.eclipse.debug.ui.DebugPerspective
 
 # check for updates on startup
 org.eclipse.equinox.p2.ui.sdk.scheduler/enabled=true
diff --git a/plugins/org.eclipse.koneki.ldt.branding/pom.xml b/plugins/org.eclipse.ldt.branding/pom.xml
index da50ea0..bd43800 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/pom.xml
+++ b/plugins/org.eclipse.ldt.branding/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 	    <artifactId>plugins</artifactId>
-	    <groupId>org.eclipse.koneki.ldt</groupId>
+	    <groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-	<artifactId>org.eclipse.koneki.ldt.branding</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+	<artifactId>org.eclipse.ldt.branding</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.koneki.ldt.branding/splash.bmp b/plugins/org.eclipse.ldt.branding/splash.bmp
index 01ba21c..01ba21c 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/splash.bmp
+++ b/plugins/org.eclipse.ldt.branding/splash.bmp
diff --git a/plugins/org.eclipse.koneki.ldt.branding/src/org/eclipse/koneki/ldt/branding/Activator.java b/plugins/org.eclipse.ldt.branding/src/org/eclipse/ldt/branding/Activator.java
index 1671309..5a346d6 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/src/org/eclipse/koneki/ldt/branding/Activator.java
+++ b/plugins/org.eclipse.ldt.branding/src/org/eclipse/ldt/branding/Activator.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.branding;
+package org.eclipse.ldt.branding;
 
 import java.util.Iterator;
 
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.branding"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.ldt.branding"; //$NON-NLS-1$
 
 	public static final String PRODUCT_VERSION_PROPERTY = "product.version"; //$NON-NLS-1$
 
@@ -69,7 +69,7 @@ public class Activator extends AbstractUIPlugin {
 			return;
 		}
 
-		String pId = "org.eclipse.koneki.ldt.product-product"; //$NON-NLS-1$
+		String pId = "org.eclipse.ldt.product-product"; //$NON-NLS-1$
 
 		if (null != queryable) {
 			IQueryResult<IInstallableUnit> iqr = queryable.query(QueryUtil.createIUQuery(pId), null);
diff --git a/plugins/org.eclipse.koneki.ldt.branding/src/org/eclipse/koneki/ldt/branding/splash/internal/SplashHandler.java b/plugins/org.eclipse.ldt.branding/src/org/eclipse/ldt/branding/splash/internal/SplashHandler.java
index d0544a3..ef78eaf 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/src/org/eclipse/koneki/ldt/branding/splash/internal/SplashHandler.java
+++ b/plugins/org.eclipse.ldt.branding/src/org/eclipse/ldt/branding/splash/internal/SplashHandler.java
@@ -9,12 +9,12 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.branding.splash.internal;
+package org.eclipse.ldt.branding.splash.internal;
 
 import org.eclipse.core.runtime.IProduct;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.koneki.ldt.branding.Activator;
+import org.eclipse.ldt.branding.Activator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.checkstyle b/plugins/org.eclipse.ldt.debug.core/.checkstyle
index 42d3a4e..17a2df6 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.checkstyle
+++ b/plugins/org.eclipse.ldt.debug.core/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.classpath b/plugins/org.eclipse.ldt.debug.core/.classpath
index ffed9ce..ffed9ce 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.classpath
+++ b/plugins/org.eclipse.ldt.debug.core/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.externalToolBuilders/Import Lua Files.launch b/plugins/org.eclipse.ldt.debug.core/.externalToolBuilders/Import Lua Files.launch
index ef39af0..a3ca95f 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.externalToolBuilders/Import Lua Files.launch
+++ b/plugins/org.eclipse.ldt.debug.core/.externalToolBuilders/Import Lua Files.launch
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">

-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>

-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>

-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt.debug.core/script/external&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.koneki.ldt.debug.core"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="4"/>

-</listAttribute>

-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>

-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>

-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.koneki.ldt.debug.core"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/luadbgpclient/debugger&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.koneki.ldt.debug.core/build.xml}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>

-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ldt.debug.core/script/external&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.ldt.debug.core"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ldt.debug.core"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/luadbgpclient/debugger&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ldt.debug.core/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.fbprefs b/plugins/org.eclipse.ldt.debug.core/.fbprefs
index 31bdf7e..31bdf7e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.fbprefs
+++ b/plugins/org.eclipse.ldt.debug.core/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.project b/plugins/org.eclipse.ldt.debug.core/.project
index 9a91b86..1db677f 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.project
+++ b/plugins/org.eclipse.ldt.debug.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt.debug.core</name>

+	<name>org.eclipse.ldt.debug.core</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/org.eclipse.ldt.debug.core/.settings/.api_filters b/plugins/org.eclipse.ldt.debug.core/.settings/.api_filters
new file mode 100644
index 0000000..ccf129d
--- /dev/null
+++ b/plugins/org.eclipse.ldt.debug.core/.settings/.api_filters
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.ldt.debug.core" version="2">
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/Info.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.Info">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.Info"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/InterpreterFactory.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterFactory">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterFactory"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/InterpreterPackage.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InfoImpl.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InterpreterFactoryImpl.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InterpreterPackageImpl.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/util/InterpreterAdapterFactory.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.util.InterpreterAdapterFactory">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.util.InterpreterAdapterFactory"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/util/InterpreterSwitch.java" type="org.eclipse.ldt.debug.core.internal.model.interpreter.util.InterpreterSwitch">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.ldt.debug.core.internal.model.interpreter.util.InterpreterSwitch"/>
+                <message_argument value="org.eclipse.ldt.debug.core_1.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.jdt.core.prefs
index c8dd566..c8dd566 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.jdt.ui.prefs
index 8edc1b6..cfb0178 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.debug.core/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.ldt.debug.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.debug.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..38a2b90
--- /dev/null
+++ b/plugins/org.eclipse.ldt.debug.core/META-INF/MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.ldt.debug.core;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.ldt.debug.core.internal.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.debug;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.ldt,
+ org.apache.commons.lang,
+ org.eclipse.core.variables
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.ldt.debug.core.internal.model.interpreter;x-friends:="org.eclipse.ldt.support.lua51,org.eclipse.ldt.support.lua52",
+ org.eclipse.ldt.debug.core.internal.model.interpreter.impl;x-friends:="org.eclipse.ldt.support.lua51,org.eclipse.ldt.support.lua52",
+ org.eclipse.ldt.debug.core.internal.model.interpreter.util;x-friends:="org.eclipse.ldt.support.lua51,org.eclipse.ldt.support.lua52",
+ org.eclipse.ldt.debug.core,
+ org.eclipse.ldt.debug.core.internal;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.remote.debug.core",
+ org.eclipse.ldt.debug.core.internal.attach;x-friends:="org.eclipse.ldt.remote.debug.core",
+ org.eclipse.ldt.debug.core.internal.interpreter.generic;x-friends:="org.eclipse.ldt.support.lua51,org.eclipse.ldt.debug.ui",
+ org.eclipse.ldt.debug.core.internal.interpreter.jnlua;x-friends:="org.eclipse.ldt.support.lua51,org.eclipse.ldt.support.lua52",
+ org.eclipse.ldt.debug.core.internal.interpreter.luajit;x-internal:=true,
+ org.eclipse.ldt.debug.core.internal.local;x-friends:="org.eclipse.debug.core",
+ org.eclipse.ldt.debug.core.interpreter
+Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.debug.core/OSGI-INF/l10n/bundle.properties
index 0f2c790..472a800 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.debug.core/OSGI-INF/l10n/bundle.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.debug.core.internal

+#Properties file for org.eclipse.ldt.debug.core.internal

 Bundle-Name = Lua Development Tools Debug Core

-Bundle-Vendor = Eclipse Koneki

+Bundle-Vendor = Eclipse LDT

 RemoteLuaLaunchConfigurationType.name = Lua Attach to Application

 LuaSourceLocator.name = Lua Source Lookup

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/about.html b/plugins/org.eclipse.ldt.debug.core/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/about.html
+++ b/plugins/org.eclipse.ldt.debug.core/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/build.properties b/plugins/org.eclipse.ldt.debug.core/build.properties
index eef2163..eef2163 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/build.properties
+++ b/plugins/org.eclipse.ldt.debug.core/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/build.xml b/plugins/org.eclipse.ldt.debug.core/build.xml
index 8196ed1..8196ed1 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/build.xml
+++ b/plugins/org.eclipse.ldt.debug.core/build.xml
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/models/interpreter.ecore b/plugins/org.eclipse.ldt.debug.core/models/interpreter.ecore
index 4ff074f..fa803cf 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/models/interpreter.ecore
+++ b/plugins/org.eclipse.ldt.debug.core/models/interpreter.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="interpreter" nsURI="http://eclipse.org/koneki" nsPrefix="">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="interpreter" nsURI="http://eclipse.org/ldt" nsPrefix="">
   <eClassifiers xsi:type="ecore:EClass" name="Info">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="executeOptionCapable" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/models/interpreter.genmodel b/plugins/org.eclipse.ldt.debug.core/models/interpreter.genmodel
index 4b218a8..94b34e6 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/models/interpreter.genmodel
+++ b/plugins/org.eclipse.ldt.debug.core/models/interpreter.genmodel
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.koneki.ldt.debug.core/src-gen" editDirectory="/org.eclipse.koneki.ldt.debug.core.edit/src-gen"
-    modelPluginID="org.eclipse.koneki.ldt.debug.ui" modelName="Interpreter" rootImplementsInterface=""
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.ldt.debug.core/src-gen" editDirectory="/org.eclipse.ldt.debug.core.edit/src-gen"
+    modelPluginID="org.eclipse.ldt.debug.ui" modelName="Interpreter" rootImplementsInterface=""
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    editPluginID="org.eclipse.koneki.ldt.debug.core.edit" language="">
+    editPluginID="org.eclipse.ldt.debug.core.edit" language="">
   <foreignModel>interpreter.ecore</foreignModel>
-  <genPackages prefix="Interpreter" basePackage="org.eclipse.koneki.ldt.debug.core.internal.model"
+  <genPackages prefix="Interpreter" basePackage="org.eclipse.ldt.debug.core.internal.model"
       disposableProviderFactory="true" ecorePackage="interpreter.ecore#/">
     <genClasses ecoreClass="interpreter.ecore#//Info">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interpreter.ecore#//Info/executeOptionCapable"/>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/plugin.properties b/plugins/org.eclipse.ldt.debug.core/plugin.properties
index c2b388c..9e80153 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/plugin.properties
+++ b/plugins/org.eclipse.ldt.debug.core/plugin.properties
@@ -11,4 +11,4 @@
 #
 
 pluginName = Interpreter Model
-providerName = www.eclipse.org/koneki/
+providerName = www.eclipse.org/ldt/
diff --git a/plugins/org.eclipse.ldt.debug.core/plugin.xml b/plugins/org.eclipse.ldt.debug.core/plugin.xml
new file mode 100644
index 0000000..3a08862
--- /dev/null
+++ b/plugins/org.eclipse.ldt.debug.core/plugin.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?><!--

+    Copyright (c) 2009, 2011 Sierra Wireless and others.

+    All rights reserved. This program and the accompanying materials

+    are made available under the terms of the Eclipse Public License v1.0

+    which accompanies this distribution, and is available at

+    http://www.eclipse.org/legal/epl-v10.html

+   

+    Contributors:

+        Sierra Wireless - initial API and implementation

+ -->

+<plugin>

+   <extension

+         point="org.eclipse.debug.core.launchConfigurationTypes">

+      <launchConfigurationType

+            delegate="org.eclipse.ldt.debug.core.internal.attach.LuaAttachLaunchConfigurationDelegate"

+            id="org.eclipse.ldt.debug.core.luaattachdebug"

+            modes="debug"

+            name="%RemoteLuaLaunchConfigurationType.name"

+            sourceLocatorId="org.eclipse.ldt.debug.core.SourceLookup"

+            sourcePathComputerId="org.eclipse.ldt.debug.core.LuaAttachSourcePathComputer">

+      </launchConfigurationType>

+      <launchConfigurationType

+            delegate="org.eclipse.ldt.debug.core.internal.local.LuaLaunchConfigurationDelegate"

+            id="org.eclipse.ldt.debug.core.lualocaldebug"

+            modes="run, debug"

+            name="%LocalLuaLaunchConfigurationType.name"

+            sourceLocatorId="org.eclipse.ldt.debug.core.SourceLookup"

+            sourcePathComputerId="org.eclipse.ldt.debug.core.LuaLocalSourcePathComputer">

+      </launchConfigurationType>

+   </extension>

+   <extension

+         point="org.eclipse.dltk.debug.scriptDebugModel">

+      <debugModel

+            debugModelId="org.eclipse.ldt.nature.debugModel"

+            natureId="org.eclipse.ldt.nature"

+            typeFactory="org.eclipse.ldt.debug.core.internal.LuaTypeFactory"

+            variableNameComparator="org.eclipse.ldt.debug.core.internal.LuaVariableComparator">

+      </debugModel>

+   </extension>

+   <extension point="org.eclipse.core.runtime.preferences">

+      <initializer 

+        class="org.eclipse.ldt.debug.core.internal.LuaDebugPreferenceInitializer"/>

+  </extension>

+    <extension

+        point="org.eclipse.debug.core.sourceLocators">

+        <sourceLocator

+           class="org.eclipse.ldt.debug.core.internal.LuaSourceLookupDirector"

+           id="org.eclipse.ldt.debug.core.SourceLookup"

+           name="%LuaSourceLocator.name" />

+   </extension>

+    <extension

+          point="org.eclipse.debug.core.sourcePathComputers">

+       <sourcePathComputer

+             class="org.eclipse.ldt.debug.core.internal.local.LuaLocalSourcePathComputer"

+             id="org.eclipse.ldt.debug.core.LuaLocalSourcePathComputer">

+       </sourcePathComputer>

+    </extension>

+   <extension 

+        point="org.eclipse.debug.core.sourcePathComputers">

+        <sourcePathComputer

+            class="org.eclipse.ldt.debug.core.internal.attach.LuaAttachSourcePathComputer"

+            id="org.eclipse.ldt.debug.core.LuaAttachSourcePathComputer"/>

+   </extension>

+    <extension

+		point="org.eclipse.debug.core.watchExpressionDelegates">

+		<watchExpressionDelegate

+			debugModel="org.eclipse.ldt.nature.debugModel"

+			delegateClass="org.eclipse.dltk.internal.debug.core.model.ScriptWatchExpressionDelegate">

+		</watchExpressionDelegate>

+	</extension>

+	<extension

+          point="org.eclipse.dltk.launching.interpreterInstallTypes">

+       <interpreterInstallType

+             class="org.eclipse.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterInstallType"

+             id="org.eclipse.ldt.debug.core.LuaGenericInterpreterInstallType">

+       </interpreterInstallType>

+       <interpreterInstallType

+             class="org.eclipse.ldt.debug.core.internal.interpreter.luajit.LuaJITInterpreterInstallType"

+             id="org.eclipse.ldt.debug.core.LuaJITInterpreterInstallType">

+       </interpreterInstallType>

+    </extension>

+ <extension

+       point="org.eclipse.emf.ecore.generated_package">

+    <package

+          class="org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage"

+          uri="http://eclipse.org/ldt">

+    </package>

+ </extension>
+</plugin>

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/pom.xml b/plugins/org.eclipse.ldt.debug.core/pom.xml
index 83ed696..42369c0 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/pom.xml
+++ b/plugins/org.eclipse.ldt.debug.core/pom.xml
@@ -10,11 +10,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
-	<artifactId>org.eclipse.koneki.ldt.debug.core</artifactId>
+	<groupId>org.eclipse.ldt</groupId>
+	<artifactId>org.eclipse.ldt.debug.core</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/script/external/.gitignore b/plugins/org.eclipse.ldt.debug.core/script/external/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/script/external/.gitignore
+++ b/plugins/org.eclipse.ldt.debug.core/script/external/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/script/internal/debugger/transport/java.lua b/plugins/org.eclipse.ldt.debug.core/script/internal/debugger/transport/java.lua
index 6fdb0fa..6fdb0fa 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/script/internal/debugger/transport/java.lua
+++ b/plugins/org.eclipse.ldt.debug.core/script/internal/debugger/transport/java.lua
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/Info.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/Info.java
index 13ffaac..71004ce 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/Info.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/Info.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter;
+package org.eclipse.ldt.debug.core.internal.model.interpreter;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -22,14 +22,14 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable <em>Execute Option Capable</em>}</li>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}</li>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}</li>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable <em>Execute Option Capable</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo()
+ * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo()
  * @model
  * @generated
  */
@@ -45,14 +45,14 @@ public interface Info extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Execute Option Capable</em>' attribute.
 	 * @see #setExecuteOptionCapable(boolean)
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_ExecuteOptionCapable()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_ExecuteOptionCapable()
 	 * @model default="true" required="true"
 	 * @generated
 	 */
 	boolean isExecuteOptionCapable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable <em>Execute Option Capable</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable <em>Execute Option Capable</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Execute Option Capable</em>' attribute.
@@ -72,14 +72,14 @@ public interface Info extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>File As Arguments Capable</em>' attribute.
 	 * @see #setFileAsArgumentsCapable(boolean)
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_FileAsArgumentsCapable()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_FileAsArgumentsCapable()
 	 * @model default="true"
 	 * @generated
 	 */
 	boolean isFileAsArgumentsCapable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>File As Arguments Capable</em>' attribute.
@@ -98,14 +98,14 @@ public interface Info extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Linked Execution Environment Name</em>' attribute.
 	 * @see #setLinkedExecutionEnvironmentName(String)
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_LinkedExecutionEnvironmentName()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_LinkedExecutionEnvironmentName()
 	 * @model
 	 * @generated
 	 */
 	String getLinkedExecutionEnvironmentName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Linked Execution Environment Name</em>' attribute.
@@ -124,14 +124,14 @@ public interface Info extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Linked Execution Environment Version</em>' attribute.
 	 * @see #setLinkedExecutionEnvironmentVersion(String)
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_LinkedExecutionEnvironmentVersion()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage#getInfo_LinkedExecutionEnvironmentVersion()
 	 * @model
 	 * @generated
 	 */
 	String getLinkedExecutionEnvironmentVersion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Linked Execution Environment Version</em>' attribute.
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/InterpreterFactory.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/InterpreterFactory.java
index e8296c9..eba59a6 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/InterpreterFactory.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/InterpreterFactory.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter;
+package org.eclipse.ldt.debug.core.internal.model.interpreter;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage
+ * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage
  * @generated
  */
 public interface InterpreterFactory extends EFactory {
@@ -29,7 +29,7 @@ public interface InterpreterFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InterpreterFactory eINSTANCE = org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl.init();
+	InterpreterFactory eINSTANCE = org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Info</em>'.
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/InterpreterPackage.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/InterpreterPackage.java
index 7286527..08302e4 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/InterpreterPackage.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/InterpreterPackage.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter;
+package org.eclipse.ldt.debug.core.internal.model.interpreter;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterFactory
+ * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterFactory
  * @model kind="package"
  * @generated
  */
@@ -46,7 +46,7 @@ public interface InterpreterPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://eclipse.org/koneki";
+	String eNS_URI = "http://eclipse.org/ldt";
 
 	/**
 	 * The package namespace name.
@@ -62,14 +62,14 @@ public interface InterpreterPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InterpreterPackage eINSTANCE = org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl.init();
+	InterpreterPackage eINSTANCE = org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl <em>Info</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl <em>Info</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl#getInfo()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl#getInfo()
 	 * @generated
 	 */
 	int INFO = 0;
@@ -121,54 +121,54 @@ public interface InterpreterPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info <em>Info</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info <em>Info</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Info</em>'.
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.Info
 	 * @generated
 	 */
 	EClass getInfo();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable <em>Execute Option Capable</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable <em>Execute Option Capable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Execute Option Capable</em>'.
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isExecuteOptionCapable()
 	 * @see #getInfo()
 	 * @generated
 	 */
 	EAttribute getInfo_ExecuteOptionCapable();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>File As Arguments Capable</em>'.
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.Info#isFileAsArgumentsCapable()
 	 * @see #getInfo()
 	 * @generated
 	 */
 	EAttribute getInfo_FileAsArgumentsCapable();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Linked Execution Environment Name</em>'.
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentName()
 	 * @see #getInfo()
 	 * @generated
 	 */
 	EAttribute getInfo_LinkedExecutionEnvironmentName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Linked Execution Environment Version</em>'.
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion()
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.Info#getLinkedExecutionEnvironmentVersion()
 	 * @see #getInfo()
 	 * @generated
 	 */
@@ -197,11 +197,11 @@ public interface InterpreterPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl <em>Info</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl <em>Info</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl
-		 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl#getInfo()
+		 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl
+		 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl#getInfo()
 		 * @generated
 		 */
 		EClass INFO = eINSTANCE.getInfo();
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InfoImpl.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InfoImpl.java
index 0afc414..53bff69 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InfoImpl.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InfoImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl;
+package org.eclipse.ldt.debug.core.internal.model.interpreter.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info;
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.Info;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,10 +29,10 @@ import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterP
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#isExecuteOptionCapable <em>Execute Option Capable</em>}</li>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}</li>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}</li>
- *   <li>{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#isExecuteOptionCapable <em>Execute Option Capable</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#isFileAsArgumentsCapable <em>File As Arguments Capable</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#getLinkedExecutionEnvironmentName <em>Linked Execution Environment Name</em>}</li>
+ *   <li>{@link org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InfoImpl#getLinkedExecutionEnvironmentVersion <em>Linked Execution Environment Version</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InterpreterFactoryImpl.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InterpreterFactoryImpl.java
index c5a968d..3bd1cf2 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InterpreterFactoryImpl.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InterpreterFactoryImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl;
+package org.eclipse.ldt.debug.core.internal.model.interpreter.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.*;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InterpreterPackageImpl.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InterpreterPackageImpl.java
index 1eb16a7..4d99177 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/impl/InterpreterPackageImpl.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/impl/InterpreterPackageImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl;
+package org.eclipse.ldt.debug.core.internal.model.interpreter.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -18,9 +18,9 @@ import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info;
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterFactory;
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.Info;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterFactory;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -47,7 +47,7 @@ public class InterpreterPackageImpl extends EPackageImpl implements InterpreterP
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage#eNS_URI
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/util/InterpreterAdapterFactory.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/util/InterpreterAdapterFactory.java
index 1de7f0f..039715c 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/util/InterpreterAdapterFactory.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/util/InterpreterAdapterFactory.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.util;
+package org.eclipse.ldt.debug.core.internal.model.interpreter.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,14 +19,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.*;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage
+ * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage
  * @generated
  */
 public class InterpreterAdapterFactory extends AdapterFactoryImpl {
@@ -102,13 +102,13 @@ public class InterpreterAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info <em>Info</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.ldt.debug.core.internal.model.interpreter.Info <em>Info</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info
+	 * @see org.eclipse.ldt.debug.core.internal.model.interpreter.Info
 	 * @generated
 	 */
 	public Adapter createInfoAdapter() {
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/util/InterpreterSwitch.java b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/util/InterpreterSwitch.java
index dae8345..930e46e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src-gen/org/eclipse/koneki/ldt/debug/core/internal/model/interpreter/util/InterpreterSwitch.java
+++ b/plugins/org.eclipse.ldt.debug.core/src-gen/org/eclipse/ldt/debug/core/internal/model/interpreter/util/InterpreterSwitch.java
@@ -10,14 +10,14 @@
  *******************************************************************************/
 /**
  */
-package org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.util;
+package org.eclipse.ldt.debug.core.internal.model.interpreter.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.*;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage
+ * @see org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage
  * @generated
  */
 public class InterpreterSwitch<T> extends Switch<T> {
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/IEmbeddedInterpreterInstallType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/IEmbeddedInterpreterInstallType.java
index a8f8319..d04cce1 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/IEmbeddedInterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/IEmbeddedInterpreterInstallType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core;
+package org.eclipse.ldt.debug.core;
 
 import org.eclipse.dltk.launching.IInterpreterInstallType;
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/Activator.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/Activator.java
index c64c1cf..2109e01 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal;

+package org.eclipse.ldt.debug.core.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Plugin;

@@ -17,7 +17,7 @@ import org.osgi.framework.BundleContext;
 

 public class Activator extends Plugin {

 

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.debug.core"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.debug.core"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaAbsoluteFileURIBreakpointPathMapper.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaAbsoluteFileURIBreakpointPathMapper.java
index 7906228..8e559aa 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaAbsoluteFileURIBreakpointPathMapper.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaAbsoluteFileURIBreakpointPathMapper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import java.net.URI;
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaAbsoluteFileURIBuildpathSourceContainer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaAbsoluteFileURIBuildpathSourceContainer.java
index 5b203fc..67010ce 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaAbsoluteFileURIBuildpathSourceContainer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaAbsoluteFileURIBuildpathSourceContainer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal;

+package org.eclipse.ldt.debug.core.internal;

 

 import java.net.URI;

 import java.net.URISyntaxException;

@@ -26,7 +26,7 @@ import org.eclipse.dltk.compiler.env.IModuleSource;
 import org.eclipse.dltk.core.DLTKCore;

 import org.eclipse.dltk.core.IScriptProject;

 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;

-import org.eclipse.koneki.ldt.core.LuaUtils;

+import org.eclipse.ldt.core.LuaUtils;

 

 /**

  * A source path container which searches in a lua project buildpath

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaCoroutine.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaCoroutine.java
index f919b59..f260886 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaCoroutine.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaCoroutine.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaCoroutineDbgpSession.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaCoroutineDbgpSession.java
index 9ca61f2..9174691 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaCoroutineDbgpSession.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaCoroutineDbgpSession.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaCoroutineStack.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaCoroutineStack.java
index 58e6321..bf9de0c 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaCoroutineStack.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaCoroutineStack.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.dltk.dbgp.IDbgpStackLevel;
 import org.eclipse.dltk.dbgp.exceptions.DbgpException;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaDebugConstants.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaDebugConstants.java
index e92b5fc..0e8182f 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaDebugConstants.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaDebugConstants.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal;

+package org.eclipse.ldt.debug.core.internal;

 

 import java.io.File;

 

@@ -20,8 +20,8 @@ public interface LuaDebugConstants {
 	/**

 	 * Extension point constants

 	 */

-	String ATTACH_LAUNCH_CONFIGURATION_ID = "org.eclipse.koneki.ldt.debug.core.luaattachdebug"; //$NON-NLS-1$

-	String LOCAL_LAUNCH_CONFIGURATION_ID = "org.eclipse.koneki.ldt.debug.core.lualocaldebug"; //$NON-NLS-1$

+	String ATTACH_LAUNCH_CONFIGURATION_ID = "org.eclipse.ldt.debug.core.luaattachdebug"; //$NON-NLS-1$

+	String LOCAL_LAUNCH_CONFIGURATION_ID = "org.eclipse.ldt.debug.core.lualocaldebug"; //$NON-NLS-1$

 

 	/**

 	 * Launch Configuration constant

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaDebugPreferenceInitializer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaDebugPreferenceInitializer.java
index 2c5be45..2c201a7 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaDebugPreferenceInitializer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaDebugPreferenceInitializer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaDebugTarget.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaDebugTarget.java
index 5b53a95..6c53081 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaDebugTarget.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaDebugTarget.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaFunctionType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaFunctionType.java
index c36eb2d..950d99e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaFunctionType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaFunctionType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import java.net.URI;
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaModuleURIBreakpointPathMapper.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaModuleURIBreakpointPathMapper.java
index 97155b3..4fb9eed 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaModuleURIBreakpointPathMapper.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaModuleURIBreakpointPathMapper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -17,7 +17,7 @@ import java.util.HashMap;
 import org.eclipse.dltk.core.IScriptProject;
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.internal.debug.core.model.IScriptBreakpointPathMapperExtension;
-import org.eclipse.koneki.ldt.core.LuaUtils;
+import org.eclipse.ldt.core.LuaUtils;
 
 /**
  * A breakpoint path mapper which support "module://" URI Protocol. <br>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaModuleURIBuildpathSourceContainer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaModuleURIBuildpathSourceContainer.java
index 07edcb1..5f1bedf 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaModuleURIBuildpathSourceContainer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaModuleURIBuildpathSourceContainer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal;

+package org.eclipse.ldt.debug.core.internal;

 

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.IStorage;

@@ -22,7 +22,7 @@ import org.eclipse.dltk.core.DLTKCore;
 import org.eclipse.dltk.core.IModelElement;

 import org.eclipse.dltk.core.IScriptProject;

 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;

-import org.eclipse.koneki.ldt.core.LuaUtils;

+import org.eclipse.ldt.core.LuaUtils;

 

 /**

  * A source path container which searches in a lua project buildpath

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaModuleURIUtil.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaModuleURIUtil.java
index ce17c4d..1077aa5 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaModuleURIUtil.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaModuleURIUtil.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal;

+package org.eclipse.ldt.debug.core.internal;

 

 import java.net.URI;

 import java.net.URISyntaxException;

 

 import org.eclipse.dltk.core.ISourceModule;

-import org.eclipse.koneki.ldt.core.LuaUtils;

+import org.eclipse.ldt.core.LuaUtils;

 

 public final class LuaModuleURIUtil {

 	public static final String MODULE_SCHEME = "module"; //$NON-NLS-1$

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaMultivalType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaMultivalType.java
index f984c48..c86c42e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaMultivalType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaMultivalType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IVariable;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaReplacePathSourceContainer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaReplacePathSourceContainer.java
index 5a2e9d8..b943930 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaReplacePathSourceContainer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaReplacePathSourceContainer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal;

+package org.eclipse.ldt.debug.core.internal;

 

 import java.net.URI;

 import java.net.URISyntaxException;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaSequenceType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaSequenceType.java
index 4d99424..289114f 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaSequenceType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaSequenceType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IIndexedValue;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaSourceLookupDirector.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaSourceLookupDirector.java
index fbb0386..820e7b8 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaSourceLookupDirector.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaSourceLookupDirector.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import java.net.URI;
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaTableType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaTableType.java
index 438532f..319472c 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaTableType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaTableType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IVariable;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaTypeFactory.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaTypeFactory.java
index c6795f2..cddd1a4 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaTypeFactory.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaTypeFactory.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal;

+package org.eclipse.ldt.debug.core.internal;

 

 import org.eclipse.dltk.debug.core.model.AtomicScriptType;

 import org.eclipse.dltk.debug.core.model.IScriptType;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaVariableComparator.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaVariableComparator.java
index 7745bbc..11fb0f7 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/LuaVariableComparator.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/LuaVariableComparator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import java.io.Serializable;
 import java.text.MessageFormat;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/Messages.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/Messages.java
index 96a7400..50a64ff 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/Messages.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.debug.core.internal.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.debug.core.internal.messages"; //$NON-NLS-1$
 	public static String LuaDebugTarget_error_coro_list;
 	public static String LuaDebugTargetAdd;
 	public static String LuaDebugTargetRemove;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/UnreachableStackFrame.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/UnreachableStackFrame.java
index 9f8229b..6a9e93a 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/UnreachableStackFrame.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/UnreachableStackFrame.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal;
+package org.eclipse.ldt.debug.core.internal;
 
 import org.eclipse.dltk.debug.core.model.IScriptStackFrame;
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachBreakpointPathMapper.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachBreakpointPathMapper.java
index 6d60127..9e9ee09 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachBreakpointPathMapper.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachBreakpointPathMapper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal.attach;
+package org.eclipse.ldt.debug.core.internal.attach;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -21,7 +21,7 @@ import org.eclipse.dltk.core.IScriptProject;
 import org.eclipse.dltk.core.environment.EnvironmentPathUtils;
 import org.eclipse.dltk.internal.debug.core.model.IScriptBreakpointPathMapperExtension;
 import org.eclipse.dltk.internal.debug.core.model.ScriptLineBreakpoint;
-import org.eclipse.koneki.ldt.debug.core.internal.Activator;
+import org.eclipse.ldt.debug.core.internal.Activator;
 
 /**
  * Breakpoint path mapper for lua project use to translate uri of breakpoint from ide file system to remote file system
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachDebugTarget.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachDebugTarget.java
index 530e55b..c337e31 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachDebugTarget.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachDebugTarget.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.internal.attach;
+package org.eclipse.ldt.debug.core.internal.attach;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunch;
@@ -23,11 +23,11 @@ import org.eclipse.dltk.internal.debug.core.model.ScriptDebugTarget;
 import org.eclipse.dltk.internal.debug.core.model.ScriptThread;
 import org.eclipse.dltk.internal.debug.core.model.operations.DbgpDebugger;
 import org.eclipse.dltk.internal.launching.LaunchConfigurationUtils;
-import org.eclipse.koneki.ldt.debug.core.internal.Activator;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaAbsoluteFileURIBreakpointPathMapper;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugTarget;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaModuleURIBreakpointPathMapper;
+import org.eclipse.ldt.debug.core.internal.Activator;
+import org.eclipse.ldt.debug.core.internal.LuaAbsoluteFileURIBreakpointPathMapper;
+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;
+import org.eclipse.ldt.debug.core.internal.LuaDebugTarget;
+import org.eclipse.ldt.debug.core.internal.LuaModuleURIBreakpointPathMapper;
 
 public abstract class LuaAttachDebugTarget extends LuaDebugTarget {
 
@@ -72,7 +72,7 @@ public abstract class LuaAttachDebugTarget extends LuaDebugTarget {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.debug.core.internal.LuaDebugTarget#createPathMapper()
+	 * @see org.eclipse.ldt.debug.core.internal.LuaDebugTarget#createPathMapper()
 	 */
 	@Override
 	protected IScriptBreakpointPathMapper createPathMapper() {
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachDebuggingEngineRunner.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachDebuggingEngineRunner.java
index 6446972..d54059e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachDebuggingEngineRunner.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachDebuggingEngineRunner.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.attach;

+package org.eclipse.ldt.debug.core.internal.attach;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.debug.core.ILaunch;

@@ -18,8 +18,8 @@ import org.eclipse.dltk.debug.core.ScriptDebugManager;
 import org.eclipse.dltk.debug.core.model.IScriptDebugTarget;

 import org.eclipse.dltk.launching.RemoteDebuggingEngineRunner;

 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;

-import org.eclipse.koneki.ldt.core.LuaNature;

-import org.eclipse.koneki.ldt.debug.core.internal.Activator;

+import org.eclipse.ldt.core.LuaNature;

+import org.eclipse.ldt.debug.core.internal.Activator;

 

 /**

  * Debugging Engine Runner for lua in attach mode

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachLaunchConfigurationDelegate.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachLaunchConfigurationDelegate.java
index d5db818..255f8d5 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachLaunchConfigurationDelegate.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.attach;

+package org.eclipse.ldt.debug.core.internal.attach;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.debug.core.ILaunchConfiguration;

 import org.eclipse.dltk.launching.AbstractRemoteLaunchConfigurationDelegate;

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.RemoteDebuggingEngineRunner;

-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;

+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;

 

 public class LuaAttachLaunchConfigurationDelegate extends AbstractRemoteLaunchConfigurationDelegate {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachSourcePathComputer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachSourcePathComputer.java
index 24027c6..2beec9a 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/attach/LuaAttachSourcePathComputer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/attach/LuaAttachSourcePathComputer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.attach;

+package org.eclipse.ldt.debug.core.internal.attach;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

@@ -16,10 +16,10 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.sourcelookup.ISourceContainer;

 import org.eclipse.dltk.internal.launching.LaunchConfigurationUtils;

 import org.eclipse.dltk.launching.sourcelookup.ScriptSourcePathComputer;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaAbsoluteFileURIBuildpathSourceContainer;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaModuleURIBuildpathSourceContainer;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaReplacePathSourceContainer;

+import org.eclipse.ldt.debug.core.internal.LuaAbsoluteFileURIBuildpathSourceContainer;

+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;

+import org.eclipse.ldt.debug.core.internal.LuaModuleURIBuildpathSourceContainer;

+import org.eclipse.ldt.debug.core.internal.LuaReplacePathSourceContainer;

 

 /**

  * This class is responsible to find the object (in most of case IResource) for a given sourcename.<br>

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineConfigurer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineConfigurer.java
index 2d9ef3d..0e0adcf 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineConfigurer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineConfigurer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;

+package org.eclipse.ldt.debug.core.internal.interpreter.generic;

 

 import java.io.File;

 import java.io.IOException;

@@ -27,8 +27,8 @@ import org.eclipse.debug.core.ILaunch;
 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

 import org.eclipse.dltk.launching.debug.DbgpConnectionConfig;

-import org.eclipse.koneki.ldt.debug.core.internal.Activator;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;

+import org.eclipse.ldt.debug.core.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;

 

 public class LuaGenericDebuggingEngineConfigurer extends LuaGenericInterpreterConfigurer {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineRunner.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineRunner.java
index aa15e30..6616612 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineRunner.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericDebuggingEngineRunner.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;

+package org.eclipse.ldt.debug.core.internal.interpreter.generic;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.debug.core.ILaunch;

@@ -19,9 +19,9 @@ import org.eclipse.dltk.debug.core.model.IScriptDebugTarget;
 import org.eclipse.dltk.launching.DebuggingEngineRunner;

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.core.LuaNature;

-import org.eclipse.koneki.ldt.debug.core.internal.Activator;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugTarget;

+import org.eclipse.ldt.core.LuaNature;

+import org.eclipse.ldt.debug.core.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.LuaDebugTarget;

 

 public class LuaGenericDebuggingEngineRunner extends DebuggingEngineRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterCommandLineRenderer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterCommandLineRenderer.java
index f133be3..57996e5 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterCommandLineRenderer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterCommandLineRenderer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;

+package org.eclipse.ldt.debug.core.internal.interpreter.generic;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -17,7 +17,7 @@ import java.util.List;
 import org.eclipse.dltk.launching.ExecutionArguments;

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.debug.core.interpreter.LuaInterpreterUtil;

+import org.eclipse.ldt.debug.core.interpreter.LuaInterpreterUtil;

 

 public class LuaGenericInterpreterCommandLineRenderer {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterConfigurer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterConfigurer.java
index a20d87a..91144fd 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterConfigurer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterConfigurer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;

+package org.eclipse.ldt.debug.core.internal.interpreter.generic;

 

 import java.io.File;

 import java.util.ArrayList;

@@ -32,11 +32,11 @@ import org.eclipse.dltk.launching.EnvironmentVariable;
 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;

-import org.eclipse.koneki.ldt.core.IProjectSourceRootFolderVisitor2;

-import org.eclipse.koneki.ldt.core.LuaUtils;

-import org.eclipse.koneki.ldt.core.LuaUtils.ProjectFragmentFilter;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;

-import org.eclipse.koneki.ldt.debug.core.interpreter.LuaInterpreterUtil;

+import org.eclipse.ldt.core.IProjectSourceRootFolderVisitor2;

+import org.eclipse.ldt.core.LuaUtils;

+import org.eclipse.ldt.core.LuaUtils.ProjectFragmentFilter;

+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;

+import org.eclipse.ldt.debug.core.interpreter.LuaInterpreterUtil;

 

 public class LuaGenericInterpreterConfigurer {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstall.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstall.java
index 51f5e89..e1effdb 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstall.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;

+package org.eclipse.ldt.debug.core.internal.interpreter.generic;

 

 import org.eclipse.dltk.launching.IInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

 

 public class LuaGenericInterpreterInstall extends AbstractLuaInterpreterInstall {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstallType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstallType.java
index e28d752..edaf6c6 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterInstallType.java
@@ -8,12 +8,12 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;

+package org.eclipse.ldt.debug.core.internal.interpreter.generic;

 

 import org.eclipse.core.runtime.ILog;

 import org.eclipse.dltk.launching.IInterpreterInstall;

-import org.eclipse.koneki.ldt.debug.core.internal.Activator;

-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;

+import org.eclipse.ldt.debug.core.internal.Activator;

+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;

 

 public class LuaGenericInterpreterInstallType extends AbstractLuaInterpreterInstallType {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterRunner.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterRunner.java
index 6b7bfc4..563605c 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterRunner.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/generic/LuaGenericInterpreterRunner.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic;

+package org.eclipse.ldt.debug.core.internal.interpreter.generic;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.debug.core.ILaunch;

 import org.eclipse.dltk.launching.AbstractInterpreterRunner;

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.debug.core.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.Activator;

 

 public class LuaGenericInterpreterRunner extends AbstractInterpreterRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/AbstractJNLuaInterpreterInstallType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/AbstractJNLuaInterpreterInstallType.java
index b38b845..9962647 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/AbstractJNLuaInterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/AbstractJNLuaInterpreterInstallType.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;

+package org.eclipse.ldt.debug.core.internal.interpreter.jnlua;

 

 import org.eclipse.core.runtime.ILog;

 import org.eclipse.core.runtime.IProgressMonitor;

@@ -17,9 +17,9 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.dltk.core.environment.IFileHandle;

 import org.eclipse.dltk.launching.EnvironmentVariable;

 import org.eclipse.dltk.launching.LibraryLocation;

-import org.eclipse.koneki.ldt.debug.core.internal.Activator;

-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.interpreter.ILuaInterpreterInstallType;

+import org.eclipse.ldt.debug.core.internal.Activator;

+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;

+import org.eclipse.ldt.debug.core.interpreter.ILuaInterpreterInstallType;

 

 public abstract class AbstractJNLuaInterpreterInstallType extends AbstractLuaInterpreterInstallType implements ILuaInterpreterInstallType {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebugginEngineCommandLineRenderer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebugginEngineCommandLineRenderer.java
index ad89695..57270ee 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebugginEngineCommandLineRenderer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebugginEngineCommandLineRenderer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;

+package org.eclipse.ldt.debug.core.internal.interpreter.jnlua;

 

 import java.io.IOException;

 import java.net.URL;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineConfigurer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineConfigurer.java
index b3f2be0..ba26afa 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineConfigurer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineConfigurer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;

+package org.eclipse.ldt.debug.core.internal.interpreter.jnlua;

 

 import java.io.File;

 import java.io.IOException;

@@ -23,8 +23,8 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;

 import org.eclipse.debug.core.ILaunch;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.debug.core.internal.Activator;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic.LuaGenericDebuggingEngineConfigurer;

+import org.eclipse.ldt.debug.core.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.interpreter.generic.LuaGenericDebuggingEngineConfigurer;

 

 public class JNLuaDebuggingEngineConfigurer extends LuaGenericDebuggingEngineConfigurer {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineRunner.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineRunner.java
index 74a59f4..1f18961 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineRunner.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaDebuggingEngineRunner.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;

+package org.eclipse.ldt.debug.core.internal.interpreter.jnlua;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.debug.core.ILaunch;

 import org.eclipse.dltk.core.PreferencesLookupDelegate;

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic.LuaGenericDebuggingEngineRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.generic.LuaGenericDebuggingEngineRunner;

 

 public abstract class JNLuaDebuggingEngineRunner extends LuaGenericDebuggingEngineRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterCommandLineRenderer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterCommandLineRenderer.java
index 9f54c8c..4c8206a 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterCommandLineRenderer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterCommandLineRenderer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;

+package org.eclipse.ldt.debug.core.internal.interpreter.jnlua;

 

 import java.io.File;

 import java.io.IOException;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterInstall.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterInstall.java
index a405cbc..4810d29 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterInstall.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;

+package org.eclipse.ldt.debug.core.internal.interpreter.jnlua;

 

 import org.eclipse.debug.core.ILaunchManager;

 import org.eclipse.dltk.launching.AbstractInterpreterInstall;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterRunner.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterRunner.java
index 9592614..98ddcad 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterRunner.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/jnlua/JNLuaInterpreterRunner.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua;

+package org.eclipse.ldt.debug.core.internal.interpreter.jnlua;

 

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterRunner;

 

 public abstract class JNLuaInterpreterRunner extends LuaGenericInterpreterRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstall.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstall.java
index 16f20d1..86d4901 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstall.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.luajit;

+package org.eclipse.ldt.debug.core.internal.interpreter.luajit;

 

 import org.eclipse.dltk.launching.IInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

 

 public class LuaJITInterpreterInstall extends AbstractLuaInterpreterInstall {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstallType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstallType.java
index 6af55ac..10251cb 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/interpreter/luajit/LuaJITInterpreterInstallType.java
@@ -1,10 +1,10 @@
-package org.eclipse.koneki.ldt.debug.core.internal.interpreter.luajit;
+package org.eclipse.ldt.debug.core.internal.interpreter.luajit;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.dltk.launching.IInterpreterInstall;
-import org.eclipse.koneki.ldt.core.internal.Activator;
-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;
-import org.eclipse.koneki.ldt.debug.core.interpreter.ILuaInterpreterInstallType;
+import org.eclipse.ldt.core.internal.Activator;
+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;
+import org.eclipse.ldt.debug.core.interpreter.ILuaInterpreterInstallType;
 
 public class LuaJITInterpreterInstallType extends AbstractLuaInterpreterInstallType implements ILuaInterpreterInstallType {
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/local/LuaLaunchConfigurationDelegate.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/local/LuaLaunchConfigurationDelegate.java
index e762b3f..7febb6c 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/local/LuaLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/local/LuaLaunchConfigurationDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.local;

+package org.eclipse.ldt.debug.core.internal.local;

 

 import java.text.MessageFormat;

 

@@ -26,8 +26,8 @@ import org.eclipse.dltk.internal.launching.DLTKLaunchingPlugin;
 import org.eclipse.dltk.launching.AbstractScriptLaunchConfigurationDelegate;

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;

-import org.eclipse.koneki.ldt.core.LuaNature;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;

+import org.eclipse.ldt.core.LuaNature;

+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;

 

 public class LuaLaunchConfigurationDelegate extends AbstractScriptLaunchConfigurationDelegate {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/local/LuaLocalSourcePathComputer.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/local/LuaLocalSourcePathComputer.java
index 69ec1fe..8f87c52 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/local/LuaLocalSourcePathComputer.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/local/LuaLocalSourcePathComputer.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.internal.local;

+package org.eclipse.ldt.debug.core.internal.local;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.debug.core.ILaunchConfiguration;

 import org.eclipse.debug.core.sourcelookup.ISourceContainer;

 import org.eclipse.dltk.launching.sourcelookup.ScriptSourcePathComputer;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaAbsoluteFileURIBuildpathSourceContainer;

+import org.eclipse.ldt.debug.core.internal.LuaAbsoluteFileURIBuildpathSourceContainer;

 

 /**

  * This class is responsible to find the object (in most of case IResource) for a given sourcename.<br>

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/messages.properties b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/messages.properties
index c54f0bc..c54f0bc 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/internal/messages.properties
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/internal/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/AbstractLuaInterpreterInstall.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/AbstractLuaInterpreterInstall.java
index ab17a23..efc95b4 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/AbstractLuaInterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/AbstractLuaInterpreterInstall.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.interpreter;

+package org.eclipse.ldt.debug.core.interpreter;

 

 import org.eclipse.debug.core.ILaunchManager;

 import org.eclipse.dltk.launching.AbstractInterpreterInstall;

 import org.eclipse.dltk.launching.IInterpreterInstallType;

 import org.eclipse.dltk.launching.IInterpreterRunner;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic.LuaGenericDebuggingEngineRunner;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.generic.LuaGenericDebuggingEngineRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterRunner;

 

 /**

  * @since 1.2

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/AbstractLuaInterpreterInstallType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/AbstractLuaInterpreterInstallType.java
index a0e251e..5b9d130 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/AbstractLuaInterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/AbstractLuaInterpreterInstallType.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.core.interpreter;

+package org.eclipse.ldt.debug.core.interpreter;

 

 import java.io.IOException;

 

@@ -19,7 +19,7 @@ import org.eclipse.dltk.core.environment.IFileHandle;
 import org.eclipse.dltk.internal.launching.AbstractInterpreterInstallType;

 import org.eclipse.dltk.launching.EnvironmentVariable;

 import org.eclipse.dltk.launching.LibraryLocation;

-import org.eclipse.koneki.ldt.core.LuaNature;

+import org.eclipse.ldt.core.LuaNature;

 

 /**

  * @since 1.2

diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/ILuaInterpreterInstallType.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/ILuaInterpreterInstallType.java
index d4a3263..f8ecf50 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/ILuaInterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/ILuaInterpreterInstallType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.interpreter;
+package org.eclipse.ldt.debug.core.interpreter;
 
 import org.eclipse.dltk.launching.IInterpreterInstallType;
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/LuaInterpreterUtil.java b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/LuaInterpreterUtil.java
index f8dc5cf..cf7a48d 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/src/org/eclipse/koneki/ldt/debug/core/interpreter/LuaInterpreterUtil.java
+++ b/plugins/org.eclipse.ldt.debug.core/src/org/eclipse/ldt/debug/core/interpreter/LuaInterpreterUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.core.interpreter;
+package org.eclipse.ldt.debug.core.interpreter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,9 +17,9 @@ import org.eclipse.dltk.launching.IInterpreterInstall;
 import org.eclipse.dltk.launching.IInterpreterInstallType;
 import org.eclipse.dltk.launching.ScriptRuntime;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info;
-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterPackage;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.Info;
+import org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterPackage;
+import org.eclipse.ldt.core.LuaNature;
 
 /**
  * @since 1.2
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.checkstyle b/plugins/org.eclipse.ldt.debug.ui/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.checkstyle
+++ b/plugins/org.eclipse.ldt.debug.ui/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.classpath b/plugins/org.eclipse.ldt.debug.ui/.classpath
index ad32c83..ad32c83 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.classpath
+++ b/plugins/org.eclipse.ldt.debug.ui/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.fbprefs b/plugins/org.eclipse.ldt.debug.ui/.fbprefs
index 444d063..444d063 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.fbprefs
+++ b/plugins/org.eclipse.ldt.debug.ui/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.project b/plugins/org.eclipse.ldt.debug.ui/.project
index 283faae..3ff334e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.project
+++ b/plugins/org.eclipse.ldt.debug.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt.debug.ui</name>

+	<name>org.eclipse.ldt.debug.ui</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.jdt.core.prefs
index c8dd566..c8dd566 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.jdt.ui.prefs
index 8edc1b6..cfb0178 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.debug.ui/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.ldt.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.debug.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f31db20
--- /dev/null
+++ b/plugins/org.eclipse.ldt.debug.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.ldt.debug.ui;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.ldt.debug.ui.internal.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.jface.text;bundle-version="3.6.0",
+ org.eclipse.ui.ide;bundle-version="3.6.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.6.0",
+ org.eclipse.dltk.debug.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.debug;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.ldt;bundle-version="0.9.0",
+ org.eclipse.ldt.ui;bundle-version="0.9.0",
+ org.eclipse.ldt.debug.core;bundle-version="0.9.0",
+ org.eclipse.core.expressions;bundle-version="3.4.300",
+ org.apache.commons.io;bundle-version="1.4.0",
+ org.eclipse.jface
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.ldt.debug.ui.internal;x-friends:="org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.debug.ui.internal.actions;x-friends:="org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.debug.ui.internal.interpreters;x-friends:="org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach;x-friends:="org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.debug.ui.internal.launchconfiguration.local;x-friends:="org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab;x-friends:="org.eclipse.ldt.remote.debug.ui"
+Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.debug.ui/OSGI-INF/l10n/bundle.properties
index 0e16f93..ae78105 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.debug.ui/OSGI-INF/l10n/bundle.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.debug.ui.internal
-Bundle-Vendor = Eclipse Koneki
+#Properties file for org.eclipse.ldt.debug.ui.internal
+Bundle-Vendor = Eclipse LDT
 Bundle-Name = Lua Development Tools Debug UI
 
 action.label.doubleclicktogglebreakpoint = Toogle Breakpoint (label not used)
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/about.html b/plugins/org.eclipse.ldt.debug.ui/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/about.html
+++ b/plugins/org.eclipse.ldt.debug.ui/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/build.properties b/plugins/org.eclipse.ldt.debug.ui/build.properties
index f6e321c..f6e321c 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/build.properties
+++ b/plugins/org.eclipse.ldt.debug.ui/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/lua_attach.gif b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/lua_attach.gif
index 9b39f5a..9b39f5a 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/lua_attach.gif
+++ b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/lua_attach.gif
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/lua_attach_maintab.gif b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/lua_attach_maintab.gif
index d0002ad..d0002ad 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/lua_attach_maintab.gif
+++ b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/lua_attach_maintab.gif
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/lua_local.gif b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/lua_local.gif
index 0fe4de9..0fe4de9 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/lua_local.gif
+++ b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/lua_local.gif
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/specialfield_obj.gif b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/specialfield_obj.gif
index f951bd6..f951bd6 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/specialfield_obj.gif
+++ b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/specialfield_obj.gif
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/stckframe_ccode.gif b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/stckframe_ccode.gif
index 0b5bdbe..0b5bdbe 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/stckframe_ccode.gif
+++ b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/stckframe_ccode.gif
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/stckframe_unreachable.gif b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/stckframe_unreachable.gif
index c242dfb..c242dfb 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/icons/obj16/stckframe_unreachable.gif
+++ b/plugins/org.eclipse.ldt.debug.ui/icons/obj16/stckframe_unreachable.gif
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/plugin.xml b/plugins/org.eclipse.ldt.debug.ui/plugin.xml
index 147d85b..9d59dfa 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/plugin.xml
+++ b/plugins/org.eclipse.ldt.debug.ui/plugin.xml
@@ -13,20 +13,20 @@
    <extension

          point="org.eclipse.debug.ui.launchConfigurationTabGroups">

       <launchConfigurationTabGroup

-            class="org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach.LuaAttachLaunchConfigurationTabGroup"

+            class="org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach.LuaAttachLaunchConfigurationTabGroup"

             description="%LuaAttachLaunchConfigurationTabGroup.description"

-            id="org.eclipse.koneki.ldt.debug.ui.luaAttachLaunchConfigurationTabGroup"

-            type="org.eclipse.koneki.ldt.debug.core.luaattachdebug">

+            id="org.eclipse.ldt.debug.ui.luaAttachLaunchConfigurationTabGroup"

+            type="org.eclipse.ldt.debug.core.luaattachdebug">

          <launchMode

                mode="debug"

                perspective="org.eclipse.debug.ui.DebugPerspective">

          </launchMode>

       </launchConfigurationTabGroup>

       <launchConfigurationTabGroup

-            class="org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.LuaLaunchConfigurationTabGroup"

+            class="org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.LuaLaunchConfigurationTabGroup"

             description="%LuaLocalLaunchConfigurationTabGroup.description"

-            id="org.eclipse.koneki.ldt.debug.ui.LuaLocalLaunchConfigurationTabGroup"

-            type="org.eclipse.koneki.ldt.debug.core.lualocaldebug">

+            id="org.eclipse.ldt.debug.ui.LuaLocalLaunchConfigurationTabGroup"

+            type="org.eclipse.ldt.debug.core.lualocaldebug">

          <launchMode

                mode="debug"

                perspective="org.eclipse.debug.ui.DebugPerspective">

@@ -39,15 +39,15 @@
    </extension>

    <extension point="org.eclipse.debug.ui.debugModelPresentations">

 		<debugModelPresentation

-			class="org.eclipse.koneki.ldt.debug.ui.internal.LuaDebugModelPresentation"

-			id="org.eclipse.koneki.ldt.nature.debugModel">

+			class="org.eclipse.ldt.debug.ui.internal.LuaDebugModelPresentation"

+			id="org.eclipse.ldt.nature.debugModel">

 		</debugModelPresentation>

    </extension>

    <extension

            point="org.eclipse.dltk.debug.ui.language">

         <language

-              class="org.eclipse.koneki.ldt.debug.ui.internal.LuaDebugUILanguageToolkit"

-              nature="org.eclipse.koneki.ldt.nature"

+              class="org.eclipse.ldt.debug.ui.internal.LuaDebugUILanguageToolkit"

+              nature="org.eclipse.ldt.nature"

 		priority="0">

       </language>

    </extension>

@@ -55,32 +55,32 @@
     <extension

     point="org.eclipse.ui.popupMenus">

     <viewerContribution

-      id="org.eclipse.koneki.ldt.ui.rulerContribution"

+      id="org.eclipse.ldt.ui.rulerContribution"

      targetID="#RulerContext">

       <action

         class="org.eclipse.debug.ui.actions.RulerEnableDisableBreakpointActionDelegate"

-        id="org.eclipse.koneki.ldt.ui.actions.RulerEnableDisableBreakpointActionDelegate"

+        id="org.eclipse.ldt.ui.actions.RulerEnableDisableBreakpointActionDelegate"

         label="%action.label.enablebreakpoint"

         menubarPath="debug" />

       <action

         class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"

-        id="org.eclipse.koneki.ldt.ui.actions.RulerToggleBreakpointActionDelegate"

+        id="org.eclipse.ldt.ui.actions.RulerToggleBreakpointActionDelegate"

         label="%action.label.togglebreakpoint"

         menubarPath="debug" />

       <action

         class="org.eclipse.dltk.debug.ui.actions.ScriptBreakpointPropertiesRulerActionDelegate"

-        id="org.eclipse.koneki.ldt.ui.actions.ScriptBreakpointPropertiesRulerActionDelegate"

+        id="org.eclipse.ldt.ui.actions.ScriptBreakpointPropertiesRulerActionDelegate"

         label="%action.label.breakpointproperties"

         menubarPath="group.properties" />

     </viewerContribution>

     <objectContribution

           adaptable="false"

-          id="org.eclipse.koneki.ldt.ui.debug.contextExtensions"

+          id="org.eclipse.ldt.ui.debug.contextExtensions"

           objectClass="org.eclipse.dltk.debug.core.model.IScriptVariable">

        <action

-             class="org.eclipse.koneki.ldt.debug.ui.internal.actions.GotoFunctionDefinitionAction"

+             class="org.eclipse.ldt.debug.ui.internal.actions.GotoFunctionDefinitionAction"

              enablesFor="1"

-             id="org.eclipse.koneki.ldt.ui.debug.GotoFunctionDefinitionAction"

+             id="org.eclipse.ldt.ui.debug.GotoFunctionDefinitionAction"

              label="%action.label.GotoFunctionDefinitionAction">

        </action>

     </objectContribution>

@@ -88,14 +88,14 @@
       <extension 

     point="org.eclipse.core.runtime.adapters">

     <factory

-      adaptableType="org.eclipse.koneki.ldt.ui.internal.editor.LuaEditor"

-      class="org.eclipse.koneki.ldt.debug.ui.internal.LuaEditorDebugAdapterFactory">

+      adaptableType="org.eclipse.ldt.ui.internal.editor.LuaEditor"

+      class="org.eclipse.ldt.debug.ui.internal.LuaEditorDebugAdapterFactory">

       <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>

       <adapter type="org.eclipse.debug.ui.actions.IRunToLineTarget"/>

     </factory>

     <factory

           adaptableType="org.eclipse.dltk.internal.debug.core.model.ScriptVariable"

-          class="org.eclipse.koneki.ldt.debug.ui.internal.LuaDebugElementAdapterFactory">

+          class="org.eclipse.ldt.debug.ui.internal.LuaDebugElementAdapterFactory">

        <adapter

              type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor">

        </adapter>

@@ -104,8 +104,8 @@
       <extension

     point="org.eclipse.ui.editorActions">

     <editorContribution

-      id="org.eclipse.koneki.ldt.ui.BreakpointRulerActions"

-      targetID="org.eclipse.koneki.ldt.ui.editor">

+      id="org.eclipse.ldt.ui.BreakpointRulerActions"

+      targetID="org.eclipse.ldt.ui.editor">

       <action

         actionID="RulerDoubleClick"

         class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"

@@ -117,20 +117,20 @@
       <extension

             point="org.eclipse.debug.ui.launchConfigurationTypeImages">

          <launchConfigurationTypeImage

-               configTypeID="org.eclipse.koneki.ldt.debug.core.luaattachdebug"

+               configTypeID="org.eclipse.ldt.debug.core.luaattachdebug"

                icon="icons/obj16/lua_attach.gif"

-               id="org.eclipse.koneki.ldt.debug.ui.luaattachdebug.image">

+               id="org.eclipse.ldt.debug.ui.luaattachdebug.image">

          </launchConfigurationTypeImage>

          <launchConfigurationTypeImage

-               configTypeID="org.eclipse.koneki.ldt.debug.core.lualocaldebug"

+               configTypeID="org.eclipse.ldt.debug.core.lualocaldebug"

                icon="icons/obj16/lua_local.gif"

-               id="org.eclipse.koneki.ldt.debug.ui.lualocaldebug.image">

+               id="org.eclipse.ldt.debug.ui.lualocaldebug.image">

          </launchConfigurationTypeImage>

       </extension>

       <extension

             point="org.eclipse.ui.perspectiveExtensions">

          <perspectiveExtension

-               targetID="org.eclipse.koneki.ldt.ui.luaperspective">

+               targetID="org.eclipse.ldt.ui.luaperspective">

             <perspectiveShortcut

                   id="org.eclipse.debug.ui.DebugPerspective">

             </perspectiveShortcut>

@@ -143,7 +143,7 @@
    <extension

          point="org.eclipse.ui.handlers">

       <handler

-            class="org.eclipse.koneki.ldt.debug.ui.internal.actions.DoNothingHandler"

+            class="org.eclipse.ldt.debug.ui.internal.actions.DoNothingHandler"

             commandId="org.eclipse.debug.ui.actions.WatchCommand">

          <activeWhen>

 			<iterate>

@@ -153,7 +153,7 @@
 					</adapt>

 					<test

 						property="org.eclipse.debug.ui.getModelIdentifier"

-						value="org.eclipse.koneki.ldt.nature.debugModel">

+						value="org.eclipse.ldt.nature.debugModel">

 					</test>

 				</and>

             </iterate>

@@ -170,9 +170,9 @@
    <extension

              point="org.eclipse.core.expressions.propertyTesters">

        <propertyTester

-                class="org.eclipse.koneki.ldt.debug.ui.internal.LuaDebugPropertyTester"

-                id="org.eclipse.koneki.ldt.debug.ui.propertytester"

-                namespace="org.eclipse.koneki.ldt.debug.ui.propertytester"

+                class="org.eclipse.ldt.debug.ui.internal.LuaDebugPropertyTester"

+                id="org.eclipse.ldt.debug.ui.propertytester"

+                namespace="org.eclipse.ldt.debug.ui.propertytester"

                 properties="isLaunchableProjectFragment"

                 type="org.eclipse.dltk.core.IProjectFragment">

        </propertyTester>

@@ -180,9 +180,9 @@
    <extension

          point="org.eclipse.ui.preferencePages">

       <page

-            category="org.eclipse.koneki.ldt.ui.globalpreferencepage"

-            class="org.eclipse.koneki.ldt.debug.ui.internal.interpreters.LuaInterpreterPreferencePage"

-            id="org.eclipse.koneki.ldt.debug.ui.interpreters"

+            category="org.eclipse.ldt.ui.globalpreferencepage"

+            class="org.eclipse.ldt.debug.ui.internal.interpreters.LuaInterpreterPreferencePage"

+            id="org.eclipse.ldt.debug.ui.interpreters"

             name="%interpreterspage.name">

       </page>

    </extension>

@@ -192,9 +192,9 @@
     icon="icons/obj16/lua_local.gif"

     helpContextId="org.eclipse.jdt.debug.ui"

     modes="run, debug"

-    class="org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.LuaApplicationLaunchShortcut"

+    class="org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.LuaApplicationLaunchShortcut"

     description="%launchShortcut.luaApp.description"

-    id="org.eclipse.koneki.ldt.debug.ui.localLuaShortcut">

+    id="org.eclipse.ldt.debug.ui.localLuaShortcut">

     <description

      description="%launchShortcut.luaApp.run.description"

      mode="run">

@@ -211,7 +211,7 @@
    		<and>

 	 		<adapt type="org.eclipse.core.resources.IResource">

         		<test property="org.eclipse.core.resources.projectNature"

-               		  value="org.eclipse.koneki.ldt.nature"/>

+               		  value="org.eclipse.ldt.nature"/>

          	</adapt>

 	        <or>

 	        	<adapt type="org.eclipse.core.resources.IResource">

@@ -223,7 +223,7 @@
 	        	<adapt type="org.eclipse.dltk.core.IProjectFragment">

             		<test

                			forcePluginActivation="true"

-                  		property="org.eclipse.koneki.ldt.debug.ui.propertytester.isLaunchableProjectFragment">

+                  		property="org.eclipse.ldt.debug.ui.propertytester.isLaunchableProjectFragment">

                   	</test>

          	    </adapt>

           		<instanceof value="org.eclipse.dltk.core.IScriptFolder"></instanceof>

@@ -234,7 +234,7 @@
   </enablement>

   </contextualLaunch>

   <configurationType

-    id="org.eclipse.koneki.ldt.debug.core.lualocaldebug">

+    id="org.eclipse.ldt.debug.core.lualocaldebug">

   </configurationType>

   </shortcut>

 </extension>

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/pom.xml b/plugins/org.eclipse.ldt.debug.ui/pom.xml
index e23dcc9..53eec3c 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/pom.xml
+++ b/plugins/org.eclipse.ldt.debug.ui/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.debug.ui</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.debug.ui</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/Activator.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/Activator.java
index 2db5dac..4de76f6 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal;

+package org.eclipse.ldt.debug.ui.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.debug.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.debug.ui"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/DocumentationLinksConstants.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/DocumentationLinksConstants.java
index 92673a7..6ee3dd1 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/DocumentationLinksConstants.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/DocumentationLinksConstants.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal;
+package org.eclipse.ldt.debug.ui.internal;
 
 public interface DocumentationLinksConstants {
 
-	String BASE_URL = "/org.eclipse.koneki.ldt.doc.user/help/LDT/User_Area/User_Guides/User_Guide_1.3/"; //$NON-NLS-1$
+	String BASE_URL = "/org.eclipse.ldt.doc.user/help/LDT/User_Area/User_Guides/User_Guide_1.3/"; //$NON-NLS-1$
 	String SOURCE_MAPPING = BASE_URL + "Concepts.html#Source_Mapping"; //$NON-NLS-1$
 	String ATTACH_DEBUG = BASE_URL + "Tasks.html#Attach_session"; //$NON-NLS-1$
 }
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/ImageConstants.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/ImageConstants.java
index 6b72627..c60089a 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/ImageConstants.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/ImageConstants.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal;
+package org.eclipse.ldt.debug.ui.internal;
 
 public interface ImageConstants {
 	String LUA_DEBUG_UNREACHABLE_STACK_FRAME = "icons/obj16/stckframe_unreachable.gif"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugElementAdapterFactory.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugElementAdapterFactory.java
index 19f58b1..6b9e7c5 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugElementAdapterFactory.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugElementAdapterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal;

+package org.eclipse.ldt.debug.ui.internal;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.debug.core.model.IVariable;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugModelPresentation.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugModelPresentation.java
index 3674e97..bb14b29 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugModelPresentation.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugModelPresentation.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal;
+package org.eclipse.ldt.debug.ui.internal;
 
 import java.net.URI;
 import java.text.MessageFormat;
@@ -32,11 +32,11 @@ import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaCoroutine;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaModuleURIUtil;
-import org.eclipse.koneki.ldt.debug.core.internal.UnreachableStackFrame;
-import org.eclipse.koneki.ldt.ui.internal.editor.LuaEditor;
+import org.eclipse.ldt.debug.core.internal.LuaCoroutine;
+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;
+import org.eclipse.ldt.debug.core.internal.LuaModuleURIUtil;
+import org.eclipse.ldt.debug.core.internal.UnreachableStackFrame;
+import org.eclipse.ldt.ui.internal.editor.LuaEditor;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorInput;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugPropertyTester.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugPropertyTester.java
index d478e1f..3dec23a 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugPropertyTester.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugPropertyTester.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal;
+package org.eclipse.ldt.debug.ui.internal;
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.dltk.core.IProjectFragment;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugUILanguageToolkit.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugUILanguageToolkit.java
index 17d6686..a8ff4d4 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaDebugUILanguageToolkit.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaDebugUILanguageToolkit.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal;
+package org.eclipse.ldt.debug.ui.internal;
 
 import org.eclipse.dltk.debug.ui.AbstractDebugUILanguageToolkit;
 import org.eclipse.dltk.debug.ui.IDLTKDebugUILanguageToolkit;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
 
 public class LuaDebugUILanguageToolkit extends AbstractDebugUILanguageToolkit implements IDLTKDebugUILanguageToolkit {
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaEditorDebugAdapterFactory.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaEditorDebugAdapterFactory.java
index 7ea76fa..c3538af 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaEditorDebugAdapterFactory.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaEditorDebugAdapterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal;

+package org.eclipse.ldt.debug.ui.internal;

 

 import org.eclipse.dltk.debug.ui.ScriptEditorDebugAdapterFactory;

 import org.eclipse.dltk.debug.ui.breakpoints.ScriptToggleBreakpointAdapter;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaToggleBreakpointAdapter.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaToggleBreakpointAdapter.java
index dcf3a0d..c9e192e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaToggleBreakpointAdapter.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaToggleBreakpointAdapter.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal;

+package org.eclipse.ldt.debug.ui.internal;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.dltk.debug.ui.breakpoints.ScriptToggleBreakpointAdapter;

@@ -78,7 +78,7 @@ public class LuaToggleBreakpointAdapter extends ScriptToggleBreakpointAdapter {
 	 */

 	@Override

 	protected String getDebugModelId() {

-		return "org.eclipse.koneki.ldt.nature.debugModel"; //$NON-NLS-1$

+		return "org.eclipse.ldt.nature.debugModel"; //$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaVariableEditor.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaVariableEditor.java
index 61846a2..bb9bf0e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/LuaVariableEditor.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/LuaVariableEditor.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal;

+package org.eclipse.ldt.debug.ui.internal;

 

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.IVariable;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/Messages.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/Messages.java
index 654528d..7fbac5f 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/Messages.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal;

+package org.eclipse.ldt.debug.ui.internal;

 

 import org.eclipse.osgi.util.NLS;

 

 //CHECKSTYLE NLS: OFF

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.debug.ui.internal.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.ldt.debug.ui.internal.messages"; //$NON-NLS-1$

 	public static String LuaDebugModelPresentation_ccode;

 	public static String LuaDebugModelPresentation_pause_coroutine;

 	public static String LuaDebugModelPresentation_running_coroutine;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/DoNothingHandler.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/DoNothingHandler.java
index b388b78..5b216c4 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/DoNothingHandler.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/DoNothingHandler.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.actions;

+package org.eclipse.ldt.debug.ui.internal.actions;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/GotoFunctionDefinitionAction.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/GotoFunctionDefinitionAction.java
index a83da27..bacec3d 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/GotoFunctionDefinitionAction.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/GotoFunctionDefinitionAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.actions;
+package org.eclipse.ldt.debug.ui.internal.actions;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -26,9 +26,9 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaFunctionType;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaFunctionType.FunctionData;
-import org.eclipse.koneki.ldt.debug.ui.internal.Activator;
+import org.eclipse.ldt.debug.core.internal.LuaFunctionType;
+import org.eclipse.ldt.debug.core.internal.LuaFunctionType.FunctionData;
+import org.eclipse.ldt.debug.ui.internal.Activator;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/Messages.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/Messages.java
index 7bb3047..2c8e57f 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/Messages.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.actions;
+package org.eclipse.ldt.debug.ui.internal.actions;
 
 import org.eclipse.osgi.util.NLS;
 
 //CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.debug.ui.internal.actions.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.debug.ui.internal.actions.messages"; //$NON-NLS-1$
 	public static String GotoFunctionDefinitionAction_lookup_failed_msg;
 	public static String GotoFunctionDefinitionAction_name;
 	public static String GotoFunctionDefinitionAction_open_error_msg;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/messages.properties b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/messages.properties
index 00595c8..00595c8 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/actions/messages.properties
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/actions/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/AddLuaInterpreterDialog.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/AddLuaInterpreterDialog.java
index 6684338..88e4f96 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/AddLuaInterpreterDialog.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/AddLuaInterpreterDialog.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.interpreters;

+package org.eclipse.ldt.debug.ui.internal.interpreters;

 

 import java.util.List;

 

@@ -42,22 +42,22 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.window.Window;

-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;

-import org.eclipse.koneki.ldt.core.internal.PreferenceInitializer;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentManager;

-import org.eclipse.koneki.ldt.debug.core.IEmbeddedInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.Info;

-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.InterpreterFactory;

-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl;

-import org.eclipse.koneki.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl;

-import org.eclipse.koneki.ldt.debug.core.interpreter.ILuaInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.interpreter.LuaInterpreterUtil;

-import org.eclipse.koneki.ldt.debug.ui.internal.Activator;

-import org.eclipse.koneki.ldt.ui.LuaExecutionEnvironmentUIManager;

-import org.eclipse.koneki.ldt.ui.SWTUtil;

-import org.eclipse.koneki.ldt.ui.internal.buildpath.LuaExecutionEnvironmentContentProvider;

+import org.eclipse.ldt.debug.core.internal.model.interpreter.Info;

+import org.eclipse.ldt.debug.core.internal.model.interpreter.InterpreterFactory;

+import org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterFactoryImpl;

+import org.eclipse.ldt.debug.core.internal.model.interpreter.impl.InterpreterPackageImpl;

+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;

+import org.eclipse.ldt.core.internal.PreferenceInitializer;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentManager;

+import org.eclipse.ldt.debug.core.IEmbeddedInterpreterInstallType;

+import org.eclipse.ldt.debug.core.internal.interpreter.generic.LuaGenericInterpreterInstallType;

+import org.eclipse.ldt.debug.core.interpreter.ILuaInterpreterInstallType;

+import org.eclipse.ldt.debug.core.interpreter.LuaInterpreterUtil;

+import org.eclipse.ldt.debug.ui.internal.Activator;

+import org.eclipse.ldt.ui.LuaExecutionEnvironmentUIManager;

+import org.eclipse.ldt.ui.SWTUtil;

+import org.eclipse.ldt.ui.internal.buildpath.LuaExecutionEnvironmentContentProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.ModifyEvent;

 import org.eclipse.swt.events.ModifyListener;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpreterDefinitionsContainer.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpreterDefinitionsContainer.java
index edd86da..9fa3929 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpreterDefinitionsContainer.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpreterDefinitionsContainer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.interpreters;
+package org.eclipse.ldt.debug.ui.internal.interpreters;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpreterEnvironmentVariablesBlock.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpreterEnvironmentVariablesBlock.java
index 4f0a598..309fd78 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpreterEnvironmentVariablesBlock.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpreterEnvironmentVariablesBlock.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.interpreters;
+package org.eclipse.ldt.debug.ui.internal.interpreters;
 
 import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterEnvironmentVariablesBlock;
 import org.eclipse.dltk.internal.debug.ui.interpreters.AddScriptInterpreterDialog;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpreterPreferencePage.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpreterPreferencePage.java
index 2a59af2..bf0a4ad 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpreterPreferencePage.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpreterPreferencePage.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.interpreters;

+package org.eclipse.ldt.debug.ui.internal.interpreters;

 

 import org.eclipse.dltk.core.environment.EnvironmentManager;

 import org.eclipse.dltk.core.environment.IEnvironment;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpretersBlock.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpretersBlock.java
index e7a7c8f..c5db9ca 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpretersBlock.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpretersBlock.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.interpreters;

+package org.eclipse.ldt.debug.ui.internal.interpreters;

 

 import org.eclipse.dltk.core.environment.IEnvironment;

 import org.eclipse.dltk.internal.debug.ui.interpreters.IScriptInterpreterDialog;

@@ -17,7 +17,7 @@ import org.eclipse.dltk.internal.debug.ui.interpreters.InterpretersMessages;
 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.ScriptRuntime;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.koneki.ldt.core.LuaNature;

+import org.eclipse.ldt.core.LuaNature;

 import org.eclipse.swt.widgets.Button;

 import org.eclipse.swt.widgets.Composite;

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpretersUpdater.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpretersUpdater.java
index 42850d8..2632e90 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/LuaInterpretersUpdater.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/LuaInterpretersUpdater.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.interpreters;
+package org.eclipse.ldt.debug.ui.internal.interpreters;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/Messages.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/Messages.java
index 246c7cb..683e223 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/Messages.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.interpreters;
+package org.eclipse.ldt.debug.ui.internal.interpreters;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.debug.ui.internal.interpreters.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.debug.ui.internal.interpreters.messages"; //$NON-NLS-1$
 	public static String AddLuaInterpreterDialog_CapabilitesGroupLabel;
 	public static String AddLuaInterpreterDialog_ExecutionOption;
 	public static String AddLuaInterpreterDialog_WhatAreCapabilitiesLabel;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/messages.properties b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/messages.properties
index 9ce20a4..9ce20a4 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/interpreters/messages.properties
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/interpreters/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachLaunchConfigurationTabGroup.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachLaunchConfigurationTabGroup.java
index da7976e..cbbe152 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachLaunchConfigurationTabGroup.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach;

+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach;

 

 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;

 import org.eclipse.debug.ui.ILaunchConfigurationDialog;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachMainTab.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachMainTab.java
index e1e1544..806de3b 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachMainTab.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/LuaAttachMainTab.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach;

+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach;

 

 import java.io.File;

 import java.io.IOException;

@@ -31,11 +31,11 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.GridDataFactory;

 import org.eclipse.jface.layout.GridLayoutFactory;

 import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;

-import org.eclipse.koneki.ldt.debug.ui.internal.Activator;

-import org.eclipse.koneki.ldt.debug.ui.internal.DocumentationLinksConstants;

-import org.eclipse.koneki.ldt.debug.ui.internal.Messages;

+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;

+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;

+import org.eclipse.ldt.debug.ui.internal.Activator;

+import org.eclipse.ldt.debug.ui.internal.DocumentationLinksConstants;

+import org.eclipse.ldt.debug.ui.internal.Messages;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.ModifyListener;

@@ -106,7 +106,7 @@ public class LuaAttachMainTab extends ScriptLaunchConfigurationTab {
 	 */

 	@Override

 	public Image getImage() {

-		return Activator.getDefault().getImageRegistry().get(org.eclipse.koneki.ldt.debug.ui.internal.ImageConstants.LUA_ATTACH_MAINTAB);

+		return Activator.getDefault().getImageRegistry().get(org.eclipse.ldt.debug.ui.internal.ImageConstants.LUA_ATTACH_MAINTAB);

 	}

 

 	private int getDefaultRemoteTimeout() {

@@ -242,7 +242,7 @@ public class LuaAttachMainTab extends ScriptLaunchConfigurationTab {
 		Link lnkDocumentation = new Link(comp, SWT.NONE);

 		GridDataFactory.fillDefaults().grab(true, false).applyTo(lnkDocumentation);

 		lnkDocumentation.setText(NLS.bind(

-				org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_client_info_description,

+				org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_client_info_description,

 				LuaDebugConstants.DEBUGGER_FILE_NAME));

 

 		lnkDocumentation.addListener(SWT.Selection, new Listener() {

@@ -259,7 +259,7 @@ public class LuaAttachMainTab extends ScriptLaunchConfigurationTab {
 

 						// get the debugger file

 						try {

-							URL debuggerEntry = org.eclipse.koneki.ldt.debug.core.internal.Activator.getDefault().getBundle()

+							URL debuggerEntry = org.eclipse.ldt.debug.core.internal.Activator.getDefault().getBundle()

 									.getEntry(LuaDebugConstants.DEBUGGER_PATH);

 							File debuggerFolder = new File(FileLocator.toFileURL(debuggerEntry).getFile());

 							File debuggerFile = new File(debuggerFolder, LuaDebugConstants.DEBUGGER_FILE_NAME);

@@ -267,8 +267,8 @@ public class LuaAttachMainTab extends ScriptLaunchConfigurationTab {
 							// copy debugger file in selected directory

 							FileUtils.copyFileToDirectory(debuggerFile, destDir, true);

 

-							if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getDisplay().getActiveShell(), org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_done_title, NLS.bind(

-									org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_done_question,

+							if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getDisplay().getActiveShell(), org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_done_title, NLS.bind(

+									org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_done_question,

 									LuaDebugConstants.DEBUGGER_FILE_NAME))) {

 								Program.launch(destDir.toString());

 							}

@@ -276,9 +276,9 @@ public class LuaAttachMainTab extends ScriptLaunchConfigurationTab {
 						} catch (IOException e) {

 							ErrorDialog.openError(

 									PlatformUI.getWorkbench().getDisplay().getActiveShell(),

-									org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_failed_title,

+									org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_failed_title,

 									null,

-									new Status(IStatus.WARNING, Activator.PLUGIN_ID, NLS.bind(org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_failed_description,

+									new Status(IStatus.WARNING, Activator.PLUGIN_ID, NLS.bind(org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach.Messages.LuaAttachMainTab_copy_failed_description,

 											LuaDebugConstants.DEBUGGER_FILE_NAME), e));

 						}

 					}

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/Messages.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/Messages.java
index 8261c7a..740a68f 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/Messages.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach;

+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach;

 

 import org.eclipse.osgi.util.NLS;

 

 //CHECKSTYLE NLS: OFF

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.attach.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.ldt.debug.ui.internal.launchconfiguration.attach.messages"; //$NON-NLS-1$

 	public static String LuaAttachMainTab_client_info_description;

 	public static String LuaAttachMainTab_copy_done_question;

 	public static String LuaAttachMainTab_copy_done_title;

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/messages.properties b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/messages.properties
index 68df50e..68df50e 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/attach/messages.properties
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/attach/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/LuaApplicationLaunchShortcut.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/LuaApplicationLaunchShortcut.java
index e468dfc..9e2d7ec 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/LuaApplicationLaunchShortcut.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/LuaApplicationLaunchShortcut.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local;
+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -47,13 +47,13 @@ import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;
 import org.eclipse.dltk.launching.ScriptRuntime;
 import org.eclipse.dltk.launching.process.ScriptRuntimeProcessFactory;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.core.LuaUtils;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;
-import org.eclipse.koneki.ldt.debug.core.interpreter.LuaInterpreterUtil;
-import org.eclipse.koneki.ldt.debug.ui.internal.Activator;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaUtils;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;
+import org.eclipse.ldt.debug.core.interpreter.LuaInterpreterUtil;
+import org.eclipse.ldt.debug.ui.internal.Activator;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.PlatformUI;
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/LuaLaunchConfigurationTabGroup.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/LuaLaunchConfigurationTabGroup.java
index d5e49cb..99b4f5b 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/LuaLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/LuaLaunchConfigurationTabGroup.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local;

+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local;

 

 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;

 import org.eclipse.debug.ui.CommonTab;

 import org.eclipse.debug.ui.ILaunchConfigurationDialog;

 import org.eclipse.debug.ui.ILaunchConfigurationTab;

-import org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab.LuaArgumentsTab;

-import org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab.LuaEnvironmentTab;

+import org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab.LuaArgumentsTab;

+import org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab.LuaEnvironmentTab;

 

 public class LuaLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {

 

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/LuaMainLaunchConfigurationTab.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/LuaMainLaunchConfigurationTab.java
index b977df8..f448cc6 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/LuaMainLaunchConfigurationTab.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/LuaMainLaunchConfigurationTab.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local;

+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

@@ -32,14 +32,14 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.koneki.ldt.core.LuaNature;

-import org.eclipse.koneki.ldt.core.LuaUtils;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;

-import org.eclipse.koneki.ldt.debug.core.interpreter.LuaInterpreterUtil;

-import org.eclipse.koneki.ldt.debug.ui.internal.Activator;

-import org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab.Messages;

-import org.eclipse.koneki.ldt.ui.SWTUtil;

-import org.eclipse.koneki.ldt.ui.internal.ImageConstants;

+import org.eclipse.ldt.core.LuaNature;

+import org.eclipse.ldt.core.LuaUtils;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;

+import org.eclipse.ldt.debug.core.interpreter.LuaInterpreterUtil;

+import org.eclipse.ldt.debug.ui.internal.Activator;

+import org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab.Messages;

+import org.eclipse.ldt.ui.SWTUtil;

+import org.eclipse.ldt.ui.internal.ImageConstants;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

@@ -69,7 +69,7 @@ public class LuaMainLaunchConfigurationTab extends MainLaunchConfigurationTab {
 

 	@Override

 	public Image getImage() {

-		return org.eclipse.koneki.ldt.ui.internal.Activator.getDefault().getImageRegistry().get(ImageConstants.MODULE_OBJ16);

+		return org.eclipse.ldt.ui.internal.Activator.getDefault().getImageRegistry().get(ImageConstants.MODULE_OBJ16);

 	}

 

 	@Override

diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTab.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTab.java
index f0bce19..a020519 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTab.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTab.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab;
+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab;
 
 import org.eclipse.dltk.debug.ui.launchConfigurations.ScriptArgumentsTab;
 import org.eclipse.dltk.internal.debug.ui.launcher.WorkingDirectoryBlock;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTabWorkingDirectoryBlock.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTabWorkingDirectoryBlock.java
index ed983f2..79f3ae2 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTabWorkingDirectoryBlock.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaArgumentsTabWorkingDirectoryBlock.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab;
+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab;
 
 import java.text.MessageFormat;
 
@@ -17,8 +17,8 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.dltk.compiler.util.Util;
 import org.eclipse.dltk.internal.debug.ui.launcher.WorkingDirectoryBlock;
 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;
-import org.eclipse.koneki.ldt.core.internal.Activator;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;
+import org.eclipse.ldt.core.internal.Activator;
+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;
 
 public class LuaArgumentsTabWorkingDirectoryBlock extends WorkingDirectoryBlock {
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaEnvironmentTab.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaEnvironmentTab.java
index b984b60..c770695 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaEnvironmentTab.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaEnvironmentTab.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab;
+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab;
 
 import org.eclipse.debug.internal.ui.launchConfigurations.EnvironmentVariable;
 import org.eclipse.debug.ui.EnvironmentTab;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTab.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTab.java
index aaa576e..31bdbf3 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTab.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTab.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab;
+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab;
 
 import java.text.MessageFormat;
 
@@ -24,7 +24,7 @@ import org.eclipse.dltk.launching.ScriptRuntime.DefaultInterpreterEntry;
 
 /**
  * @deprecated not used since lua interpreters is configurable in main Tab
- *             (org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.LuaMainLaunchConfigurationTab).
+ *             (org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.LuaMainLaunchConfigurationTab).
  */
 public class LuaInterpreterTab extends InterpreterTab {
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTabComboBlock.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTabComboBlock.java
index 087244b..65fff99 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTabComboBlock.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/LuaInterpreterTabComboBlock.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab;
+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,8 +31,8 @@ import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.koneki.ldt.debug.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.SWTUtil;
+import org.eclipse.ldt.debug.ui.internal.Activator;
+import org.eclipse.ldt.ui.SWTUtil;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -46,7 +46,7 @@ import org.eclipse.swt.widgets.Label;
 
 /**
  * @deprecated not used since lua interpreters is configurable in main
- *             Tab.(org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.LuaMainLaunchConfigurationTab).
+ *             Tab.(org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.LuaMainLaunchConfigurationTab).
  */
 public class LuaInterpreterTabComboBlock extends AbstractInterpreterComboBlock {
 
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/Messages.java b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/Messages.java
index f3a701f..8036204 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/Messages.java
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab;
+package org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab;
 
 import org.eclipse.osgi.util.NLS;
 
 public final class Messages extends NLS {
 	// CHECKSTYLE NLS: OFF
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.tab.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.tab.messages"; //$NON-NLS-1$
 	public static String LuaEnvironmentTabNewVariableDialogName;
 	public static String LuaEnvironmentTabNewVariableDialogTitle;
 	public static String LuaEnvironmentTabNewVariableDialogValue;
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/messages.properties b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/messages.properties
index 13e442b..13e442b 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/launchconfiguration/local/tab/messages.properties
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/launchconfiguration/local/tab/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/messages.properties b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/messages.properties
index d52f622..d52f622 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.ui/src/org/eclipse/koneki/ldt/debug/ui/internal/messages.properties
+++ b/plugins/org.eclipse.ldt.debug.ui/src/org/eclipse/ldt/debug/ui/internal/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/.gitignore b/plugins/org.eclipse.ldt.doc.user/.gitignore
index 491bd71..491bd71 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/.gitignore
+++ b/plugins/org.eclipse.ldt.doc.user/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/.project b/plugins/org.eclipse.ldt.doc.user/.project
index 21b0346..e1c8238 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/.project
+++ b/plugins/org.eclipse.ldt.doc.user/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.doc.user</name>
+	<name>org.eclipse.ldt.doc.user</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.doc.user/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.doc.user/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.doc.user/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.doc.user/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.doc.user/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.doc.user/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.doc.user/META-INF/MANIFEST.MF
index 2037966..b0ed1b2 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.doc.user/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.doc.user;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.doc.user;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,3.0.0)";resolution:=optional,
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.doc.user/OSGI-INF/l10n/bundle.properties
index 4e4e514..6fee9f3 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.doc.user/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.doc.user
+#Properties file for org.eclipse.ldt.doc.user
 Bundle-Name = Lua Development Tools User Documentation
-Bundle-Vendor = Eclipse Koneki
+Bundle-Vendor = Eclipse LDT
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/about.html b/plugins/org.eclipse.ldt.doc.user/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/about.html
+++ b/plugins/org.eclipse.ldt.doc.user/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/build-help.xml b/plugins/org.eclipse.ldt.doc.user/build-help.xml
index f7e66ad..f7e66ad 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/build-help.xml
+++ b/plugins/org.eclipse.ldt.doc.user/build-help.xml
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/build.properties b/plugins/org.eclipse.ldt.doc.user/build.properties
index 58a18c0..58a18c0 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/build.properties
+++ b/plugins/org.eclipse.ldt.doc.user/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/images/home.gif b/plugins/org.eclipse.ldt.doc.user/images/home.gif
index 4472e8c..4472e8c 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/images/home.gif
+++ b/plugins/org.eclipse.ldt.doc.user/images/home.gif
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/images/next.gif b/plugins/org.eclipse.ldt.doc.user/images/next.gif
index e2f8c3e..e2f8c3e 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/images/next.gif
+++ b/plugins/org.eclipse.ldt.doc.user/images/next.gif
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/images/prev.gif b/plugins/org.eclipse.ldt.doc.user/images/prev.gif
index 4fb4150..4fb4150 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/images/prev.gif
+++ b/plugins/org.eclipse.ldt.doc.user/images/prev.gif
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/images/topiclabel/git48.png b/plugins/org.eclipse.ldt.doc.user/images/topiclabel/git48.png
index ed944ac..ed944ac 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/images/topiclabel/git48.png
+++ b/plugins/org.eclipse.ldt.doc.user/images/topiclabel/git48.png
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.core_1.8.0.I20121113-1136.jar b/plugins/org.eclipse.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.core_1.8.0.I20121113-1136.jar
index f36f5a2..f36f5a2 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.core_1.8.0.I20121113-1136.jar
+++ b/plugins/org.eclipse.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.core_1.8.0.I20121113-1136.jar
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.8.0.I20121113-1136.jar b/plugins/org.eclipse.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.8.0.I20121113-1136.jar
index 861ece7..861ece7 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.8.0.I20121113-1136.jar
+++ b/plugins/org.eclipse.ldt.doc.user/lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.8.0.I20121113-1136.jar
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/plugin.xml b/plugins/org.eclipse.ldt.doc.user/plugin.xml
index ee6544e..ee6544e 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/plugin.xml
+++ b/plugins/org.eclipse.ldt.doc.user/plugin.xml
diff --git a/plugins/org.eclipse.koneki.ldt.doc.user/pom.xml b/plugins/org.eclipse.ldt.doc.user/pom.xml
index be905a2..54ad1f0 100644
--- a/plugins/org.eclipse.koneki.ldt.doc.user/pom.xml
+++ b/plugins/org.eclipse.ldt.doc.user/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.doc.user</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.doc.user</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.checkstyle b/plugins/org.eclipse.ldt.metalua/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.checkstyle
+++ b/plugins/org.eclipse.ldt.metalua/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.classpath b/plugins/org.eclipse.ldt.metalua/.classpath
index ad32c83..ad32c83 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.classpath
+++ b/plugins/org.eclipse.ldt.metalua/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.externalToolBuilders/Import Lua Files.launch b/plugins/org.eclipse.ldt.metalua/.externalToolBuilders/Import Lua Files.launch
index 6c1ad9a..fca24a4 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.externalToolBuilders/Import Lua Files.launch
+++ b/plugins/org.eclipse.ldt.metalua/.externalToolBuilders/Import Lua Files.launch
@@ -2,13 +2,19 @@
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt.metalua/lib&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ldt.metalua/lib&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.ldt.metalua"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.koneki.ldt.metalua"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/metalua&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.koneki.ldt.metalua/build.xml}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ldt.metalua"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/metalua&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ldt.metalua/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 </launchConfiguration>
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.fbprefs b/plugins/org.eclipse.ldt.metalua/.fbprefs
index 968afbf..968afbf 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.fbprefs
+++ b/plugins/org.eclipse.ldt.metalua/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.project b/plugins/org.eclipse.ldt.metalua/.project
index ad84d49..96242d2 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.project
+++ b/plugins/org.eclipse.ldt.metalua/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.metalua</name>
+	<name>org.eclipse.ldt.metalua</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.jdt.core.prefs
index 910ca67..910ca67 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.jdt.ui.prefs
index 8edc1b6..cfb0178 100644
--- a/plugins/org.eclipse.koneki.ldt.debug.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
+formatter_profile=_LDT
 formatter_settings_version=11
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.metalua/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.metalua/META-INF/MANIFEST.MF
index b13d2fe..b7264bf 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.metalua/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.metalua;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.metalua;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.metalua.Activator
+Bundle-Activator: org.eclipse.ldt.metalua.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.ui,
  com.naef.jnlua;bundle-version="[0.9.1,1.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.metalua;uses:="org.eclipse.ui.plugin,org.osgi.framework",
- org.eclipse.koneki.ldt.metalua.internal;x-friends:="org.eclipse.koneki.ldt.metalua.tests"
+Export-Package: org.eclipse.ldt.metalua;uses:="org.eclipse.ui.plugin,org.osgi.framework",
+ org.eclipse.ldt.metalua.internal;x-friends:="org.eclipse.ldt.metalua.tests"
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.metalua/OSGI-INF/l10n/bundle.properties
index 18f50fa..d997452 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.metalua/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.metalua
+#Properties file for org.eclipse.ldt.metalua
 Bundle-Name = Metalua
-Bundle-Vendor = Eclipse Koneki
+Bundle-Vendor = Eclipse LDT
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/about.html b/plugins/org.eclipse.ldt.metalua/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/about.html
+++ b/plugins/org.eclipse.ldt.metalua/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/build.properties b/plugins/org.eclipse.ldt.metalua/build.properties
index cef2858..cef2858 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/build.properties
+++ b/plugins/org.eclipse.ldt.metalua/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/build.xml b/plugins/org.eclipse.ldt.metalua/build.xml
index 9a3ffc2..9a3ffc2 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/build.xml
+++ b/plugins/org.eclipse.ldt.metalua/build.xml
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/lib/.gitignore b/plugins/org.eclipse.ldt.metalua/lib/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/lib/.gitignore
+++ b/plugins/org.eclipse.ldt.metalua/lib/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/pom.xml b/plugins/org.eclipse.ldt.metalua/pom.xml
index 5b37cfb..4171f3d 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/pom.xml
+++ b/plugins/org.eclipse.ldt.metalua/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.metalua</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.metalua</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/AbstractMetaLuaModule.java b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/AbstractMetaLuaModule.java
index a26fb74..bbbb2c7 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/AbstractMetaLuaModule.java
+++ b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/AbstractMetaLuaModule.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.metalua;

+package org.eclipse.ldt.metalua;

 

 import java.io.File;

 import java.io.IOException;

 import java.util.Collections;

 import java.util.List;

 

-import org.eclipse.koneki.ldt.metalua.internal.MetaluaStateFactory;

+import org.eclipse.ldt.metalua.internal.MetaluaStateFactory;

 import org.eclipse.osgi.util.NLS;

 

 import com.naef.jnlua.LuaState;

diff --git a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/Activator.java b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/Activator.java
index 0b2b473..758cc60 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/Activator.java
+++ b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/Activator.java
@@ -13,7 +13,7 @@
  * @author	Kevin KIN-FOO <kkinfoo@anyware-tech.com>
  * @date 
  */
-package org.eclipse.koneki.ldt.metalua;
+package org.eclipse.ldt.metalua;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -25,7 +25,7 @@ import org.osgi.framework.BundleContext;
  */
 public class Activator extends AbstractUIPlugin {
 
-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.metalua"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.ldt.metalua"; //$NON-NLS-1$
 
 	private static Activator plugin;
 
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/internal/Metalua.java b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/internal/Metalua.java
index d564f03..25072ed 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/internal/Metalua.java
+++ b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/internal/Metalua.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.metalua.internal;
+package org.eclipse.ldt.metalua.internal;
 
 import com.naef.jnlua.LuaException;
 import com.naef.jnlua.LuaRuntimeException;
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/internal/MetaluaStateFactory.java b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/internal/MetaluaStateFactory.java
index b33af46..3292c12 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/src/org/eclipse/koneki/ldt/metalua/internal/MetaluaStateFactory.java
+++ b/plugins/org.eclipse.ldt.metalua/src/org/eclipse/ldt/metalua/internal/MetaluaStateFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.metalua.internal;
+package org.eclipse.ldt.metalua.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,7 +16,7 @@ import java.net.URL;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.koneki.ldt.metalua.Activator;
+import org.eclipse.ldt.metalua.Activator;
 import org.eclipse.osgi.util.NLS;
 import org.osgi.framework.Bundle;
 
diff --git a/plugins/org.eclipse.koneki.ldt.metalua/.checkstyle b/plugins/org.eclipse.ldt.remote.core/.checkstyle
index 3bf8bc7..a45d105 100644
--- a/plugins/org.eclipse.koneki.ldt.metalua/.checkstyle
+++ b/plugins/org.eclipse.ldt.remote.core/.checkstyle
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
     <additional-data name="cache-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.classpath b/plugins/org.eclipse.ldt.remote.core/.classpath
index 8a8f166..8a8f166 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.classpath
+++ b/plugins/org.eclipse.ldt.remote.core/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.fbprefs b/plugins/org.eclipse.ldt.remote.core/.fbprefs
index c2f96f4..c2f96f4 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.fbprefs
+++ b/plugins/org.eclipse.ldt.remote.core/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.project b/plugins/org.eclipse.ldt.remote.core/.project
index cb76b77..0591f76 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.project
+++ b/plugins/org.eclipse.ldt.remote.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt.remote.ui</name>

+	<name>org.eclipse.ldt.remote.core</name>

 	<comment></comment>

 	<projects>

 	</projects>

@@ -21,12 +21,12 @@
 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

@@ -39,8 +39,8 @@
 	<natures>

 		<nature>org.eclipse.pde.PluginNature</nature>

 		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

 		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

 	</natures>

 </projectDescription>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.jdt.core.prefs
index 815a6dd..815a6dd 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.remote.core/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.remote.core/META-INF/MANIFEST.MF
index 43c374d..b0a6e06 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.remote.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.remote.core;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.remote.core;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.remote.core.internal.Activator
+Bundle-Activator: org.eclipse.ldt.remote.core.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  com.jcraft.jsch,
@@ -14,9 +14,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.subsystems.files.core,
  org.eclipse.rse.connectorservice.ssh,
  org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt
+ org.eclipse.ldt
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.koneki.ldt.remote.core.internal;x-friends:="org.eclipse.koneki.ldt.remote.ui,org.eclipse.koneki.ldt.remote.debug.core,org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.remote.core.internal.lua;x-friends:="org.eclipse.koneki.ldt.remote.ui,org.eclipse.koneki.ldt.remote.debug.core, org.eclipse.koneki.ldt.remote.debug.ui"
+Export-Package: org.eclipse.ldt.remote.core.internal;x-friends:="org.eclipse.ldt.remote.ui,org.eclipse.ldt.remote.debug.core,org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.remote.core.internal.lua;x-friends:="org.eclipse.ldt.remote.ui,org.eclipse.ldt.remote.debug.core,org.eclipse.ldt.remote.debug.ui"
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.remote.core/OSGI-INF/l10n/bundle.properties
index 5f1c0d3..29822eb 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.remote.core/OSGI-INF/l10n/bundle.properties
@@ -8,11 +8,11 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.remote.core

+#Properties file for org.eclipse.ldt.remote.core

 Bundle-Name = LDT Remote Development Support Core

-Bundle-Vendor = Eclipse Koneki

+Bundle-Vendor = Eclipse LDT

 lua.systemType.description = Connection for SSH System with Lua Interpreter.

 lua.systemType.label = Lua SSH System

 lua.configuration.description = Enable Lua Support on SSH

 lua.configuration.name = Ssh Lua

-lua.configuration.vendor = Eclipse Koneki
+lua.configuration.vendor = Eclipse LDT
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/about.html b/plugins/org.eclipse.ldt.remote.core/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/about.html
+++ b/plugins/org.eclipse.ldt.remote.core/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/build.properties b/plugins/org.eclipse.ldt.remote.core/build.properties
index 4094c1d..4094c1d 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/build.properties
+++ b/plugins/org.eclipse.ldt.remote.core/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/luasystem.png b/plugins/org.eclipse.ldt.remote.core/icons/obj16/luasystem.png
index 256659d..256659d 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/luasystem.png
+++ b/plugins/org.eclipse.ldt.remote.core/icons/obj16/luasystem.png
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/luasystem_live.png b/plugins/org.eclipse.ldt.remote.core/icons/obj16/luasystem_live.png
index 339dce7..339dce7 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/luasystem_live.png
+++ b/plugins/org.eclipse.ldt.remote.core/icons/obj16/luasystem_live.png
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/remote_lua.png b/plugins/org.eclipse.ldt.remote.core/icons/obj16/remote_lua.png
index 16a3d0e..16a3d0e 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/remote_lua.png
+++ b/plugins/org.eclipse.ldt.remote.core/icons/obj16/remote_lua.png
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/remote_lua_live.png b/plugins/org.eclipse.ldt.remote.core/icons/obj16/remote_lua_live.png
index a37b385..a37b385 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/icons/obj16/remote_lua_live.png
+++ b/plugins/org.eclipse.ldt.remote.core/icons/obj16/remote_lua_live.png
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/plugin.xml b/plugins/org.eclipse.ldt.remote.core/plugin.xml
index 0517abf..aee7cb2 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/plugin.xml
+++ b/plugins/org.eclipse.ldt.remote.core/plugin.xml
@@ -7,7 +7,7 @@
             description="%lua.systemType.description"

             icon="icons/obj16/luasystem.png"

             iconLive="icons/obj16/luasystem_live.png"

-            id="org.eclipse.koneki.ldt.remote.core.luasystemtype"

+            id="org.eclipse.ldt.remote.core.luasystemtype"

             label="%lua.systemType.label"

             name="luasystemtype"

             subsystemConfigurationIds="ssh.files;scp.files;ssh.terminals;ssh.lua">

@@ -16,7 +16,7 @@
    <extension

          point="org.eclipse.rse.core.subsystemConfigurations">

       <configuration

-            class="org.eclipse.koneki.ldt.remote.core.internal.lua.LuaSubSystemConfiguration"

+            class="org.eclipse.ldt.remote.core.internal.lua.LuaSubSystemConfiguration"

             description="%lua.configuration.description"

             icon="icons/obj16/remote_lua.png"

             iconlive="icons/obj16/remote_lua_live.png"

diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/pom.xml b/plugins/org.eclipse.ldt.remote.core/pom.xml
index 6f5eb4e..8c3f550 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/pom.xml
+++ b/plugins/org.eclipse.ldt.remote.core/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.remote.ui</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.remote.core</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/src/org/eclipse/koneki/ldt/remote/ui/internal/Activator.java b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/Activator.java
index 9896b02..d9f1b3c 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/src/org/eclipse/koneki/ldt/remote/ui/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.ui.internal;

+package org.eclipse.ldt.remote.core.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Plugin;

@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {

 

 	/** The plug-in ID */

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.remote.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.remote.core"; //$NON-NLS-1$

 

 	/** The shared instance */

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/NetworkUtil.java b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/NetworkUtil.java
index e649b8b..ccdac1f 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/NetworkUtil.java
+++ b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/NetworkUtil.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.core.internal;

+package org.eclipse.ldt.remote.core.internal;

 

 import java.io.IOException;

 import java.net.InetAddress;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/RSEUtil.java b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/RSEUtil.java
index 0e3fe62..9f18fd9 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/RSEUtil.java
+++ b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/RSEUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.core.internal;
+package org.eclipse.ldt.remote.core.internal;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/lua/LuaRSEUtil.java b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/lua/LuaRSEUtil.java
index ff38924..dc991d2 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/lua/LuaRSEUtil.java
+++ b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/lua/LuaRSEUtil.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.core.internal.lua;

+package org.eclipse.ldt.remote.core.internal.lua;

 

 import java.util.EnumSet;

 

@@ -21,9 +21,9 @@ import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.dltk.core.IScriptFolder;

 import org.eclipse.dltk.core.IScriptProject;

 import org.eclipse.dltk.core.ISourceModule;

-import org.eclipse.koneki.ldt.core.IProjectSourceVisitor2;

-import org.eclipse.koneki.ldt.core.LuaUtils;

-import org.eclipse.koneki.ldt.remote.core.internal.Activator;

+import org.eclipse.ldt.core.IProjectSourceVisitor2;

+import org.eclipse.ldt.core.LuaUtils;

+import org.eclipse.ldt.remote.core.internal.Activator;

 import org.eclipse.rse.core.model.IHost;

 import org.eclipse.rse.core.subsystems.ISubSystem;

 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/lua/LuaSubSystem.java b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/lua/LuaSubSystem.java
index bd6f180..d1c3d63 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/lua/LuaSubSystem.java
+++ b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/lua/LuaSubSystem.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.core.internal.lua;

+package org.eclipse.ldt.remote.core.internal.lua;

 

 import org.eclipse.core.runtime.IAdapterManager;

 import org.eclipse.core.runtime.Platform;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/lua/LuaSubSystemConfiguration.java b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/lua/LuaSubSystemConfiguration.java
index f52a71a..efc4ef3 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/lua/LuaSubSystemConfiguration.java
+++ b/plugins/org.eclipse.ldt.remote.core/src/org/eclipse/ldt/remote/core/internal/lua/LuaSubSystemConfiguration.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.core.internal.lua;

+package org.eclipse.ldt.remote.core.internal.lua;

 

 import org.eclipse.rse.core.model.IHost;

 import org.eclipse.rse.core.subsystems.IConnectorService;

diff --git a/plugins/org.eclipse.ldt.remote.debug.core/.checkstyle b/plugins/org.eclipse.ldt.remote.debug.core/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.classpath b/plugins/org.eclipse.ldt.remote.debug.core/.classpath
index 8a8f166..8a8f166 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.classpath
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.fbprefs b/plugins/org.eclipse.ldt.remote.debug.core/.fbprefs
index 4c6cb48..4c6cb48 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.fbprefs
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.fbprefs
diff --git a/plugins/org.eclipse.ldt.remote.debug.core/.project b/plugins/org.eclipse.ldt.remote.debug.core/.project
new file mode 100644
index 0000000..ca9dad6
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.ldt.remote.debug.core</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.jdt.core.prefs
index 728c2ab..728c2ab 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.core/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.remote.debug.core/META-INF/MANIFEST.MF
index ffcad5a..fca8827 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.remote.debug.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.remote.debug.core;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.remote.debug.core;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.remote.debug.core.internal.Activator
+Bundle-Activator: org.eclipse.ldt.remote.debug.core.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  com.jcraft.jsch,
@@ -17,12 +17,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.dltk.debug;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt,
- org.eclipse.koneki.ldt.debug.core,
- org.eclipse.koneki.ldt.remote.core
+ org.eclipse.ldt,
+ org.eclipse.ldt.debug.core,
+ org.eclipse.ldt.remote.core
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.koneki.ldt.remote.debug.core.internal;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.remote.debug.core.internal.launch;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui",
- org.eclipse.koneki.ldt.remote.debug.core.internal.sshprocess;x-friends:="org.eclipse.koneki.ldt.remote.debug.ui"
+Export-Package: org.eclipse.ldt.remote.debug.core.internal;x-friends:="org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.remote.debug.core.internal.launch;x-friends:="org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.remote.debug.core.internal.sshprocess;x-friends:="org.eclipse.ldt.remote.debug.ui"
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.remote.debug.core/OSGI-INF/l10n/bundle.properties
index 5330a38..8bbae5f 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.remote.debug.core/OSGI-INF/l10n/bundle.properties
@@ -8,7 +8,7 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.remote.debug.core

+#Properties file for org.eclipse.ldt.remote.debug.core

 Bundle-Name = LDT Remote Development Support Debug Core

-Bundle-Vendor = Eclipse Koneki

+Bundle-Vendor = Eclipse LDT

 launchConfigurationType.name = Lua Remote Application
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/about.html b/plugins/org.eclipse.ldt.remote.debug.core/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/about.html
+++ b/plugins/org.eclipse.ldt.remote.debug.core/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/build.properties b/plugins/org.eclipse.ldt.remote.debug.core/build.properties
index e2c8cb9..e2c8cb9 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/build.properties
+++ b/plugins/org.eclipse.ldt.remote.debug.core/build.properties
diff --git a/plugins/org.eclipse.ldt.remote.debug.core/plugin.xml b/plugins/org.eclipse.ldt.remote.debug.core/plugin.xml
new file mode 100644
index 0000000..2ffd153
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.core/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            id="org.eclipse.ldt.remote.debug.core.luaremotedebug"
+            modes="run, debug"
+            name="%launchConfigurationType.name"
+            delegate="org.eclipse.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationDelegate"
+            sourceLocatorId="org.eclipse.ldt.debug.core.SourceLookup"
+            sourcePathComputerId="org.eclipse.ldt.remote.debug.core.LuaRemoteSourcePathComputer">
+      </launchConfigurationType>
+   </extension>
+   <extension
+         point="org.eclipse.debug.core.sourcePathComputers">
+      <sourcePathComputer
+            class="org.eclipse.ldt.remote.debug.core.internal.launch.LuaRemoteSourcePathComputer"
+            id="org.eclipse.ldt.remote.debug.core.LuaRemoteSourcePathComputer">
+      </sourcePathComputer>
+   </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/pom.xml b/plugins/org.eclipse.ldt.remote.debug.core/pom.xml
index 6d798b1..c548fd2 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/pom.xml
+++ b/plugins/org.eclipse.ldt.remote.debug.core/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.remote.core</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.remote.debug.core</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/Activator.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/Activator.java
index 7886beb..85c9967 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.core/src/org/eclipse/koneki/ldt/remote/core/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.core.internal;

+package org.eclipse.ldt.remote.debug.core.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Plugin;

@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {

 

 	/** The plug-in ID */

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.remote.core"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.remote.debug.core"; //$NON-NLS-1$

 

 	/** The shared instance */

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/LuaRemoteDebugConstant.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/LuaRemoteDebugConstant.java
index 8f82d11..b32f7c2 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/LuaRemoteDebugConstant.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/LuaRemoteDebugConstant.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.core.internal;
+package org.eclipse.ldt.remote.debug.core.internal;
 
 import org.eclipse.dltk.launching.ScriptLaunchConfigurationConstants;
 
 public interface LuaRemoteDebugConstant {
 
-	String REMOTE_LAUNCH_CONFIGURATION_ID = "org.eclipse.koneki.ldt.remote.debug.core.luaremotedebug"; //$NON-NLS-1$
+	String REMOTE_LAUNCH_CONFIGURATION_ID = "org.eclipse.ldt.remote.debug.core.luaremotedebug"; //$NON-NLS-1$
 
 	String PROJECT_NAME = ScriptLaunchConfigurationConstants.ATTR_PROJECT_NAME;
 	String SCRIPT_NAME = ScriptLaunchConfigurationConstants.ATTR_MAIN_SCRIPT_NAME;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteDebugTarget.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteDebugTarget.java
index a0a6730..35206f3 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteDebugTarget.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteDebugTarget.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.core.internal.launch;

+package org.eclipse.ldt.remote.debug.core.internal.launch;

 

 import org.eclipse.debug.core.ILaunch;

 import org.eclipse.debug.core.model.IProcess;

 import org.eclipse.dltk.debug.core.IDbgpService;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;

-import org.eclipse.koneki.ldt.debug.core.internal.attach.LuaAttachDebugTarget;

+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;

+import org.eclipse.ldt.debug.core.internal.attach.LuaAttachDebugTarget;

 

 public abstract class LuaRemoteDebugTarget extends LuaAttachDebugTarget {

 

@@ -23,7 +23,7 @@ public abstract class LuaRemoteDebugTarget extends LuaAttachDebugTarget {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.debug.core.internal.attach.LuaAttachDebugTarget#getSourceMappingType()

+	 * @see org.eclipse.ldt.debug.core.internal.attach.LuaAttachDebugTarget#getSourceMappingType()

 	 */

 	@Override

 	protected String getSourceMappingType() {

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteDebuggingEngineRunner.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteDebuggingEngineRunner.java
index 833f652..0c9686e 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteDebuggingEngineRunner.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteDebuggingEngineRunner.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.core.internal.launch;

+package org.eclipse.ldt.remote.debug.core.internal.launch;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

@@ -18,8 +18,8 @@ import org.eclipse.dltk.debug.core.model.IScriptDebugTarget;
 import org.eclipse.dltk.internal.debug.core.model.ScriptDebugTarget;

 import org.eclipse.dltk.launching.DebugSessionAcceptor;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.debug.core.internal.attach.LuaAttachDebuggingEngineRunner;

-import org.eclipse.koneki.ldt.remote.debug.core.internal.sshprocess.SshProcess;

+import org.eclipse.ldt.debug.core.internal.attach.LuaAttachDebuggingEngineRunner;

+import org.eclipse.ldt.remote.debug.core.internal.sshprocess.SshProcess;

 

 /**

  * Debuging Engine Runner for lua embedded project

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationDelegate.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationDelegate.java
index eba0bb7..8381cc3 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.core.internal.launch;
+package org.eclipse.ldt.remote.debug.core.internal.launch;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,16 +43,16 @@ import org.eclipse.dltk.dbgp.DbgpSessionIdGenerator;
 import org.eclipse.dltk.debug.core.DLTKDebugLaunchConstants;
 import org.eclipse.dltk.debug.core.DLTKDebugPlugin;
 import org.eclipse.dltk.launching.InterpreterConfig;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.core.LuaUtils;
-import org.eclipse.koneki.ldt.debug.core.internal.LuaDebugConstants;
-import org.eclipse.koneki.ldt.remote.core.internal.NetworkUtil;
-import org.eclipse.koneki.ldt.remote.core.internal.RSEUtil;
-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaRSEUtil;
-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaSubSystem;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.Activator;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.sshprocess.SshProcess;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.core.LuaUtils;
+import org.eclipse.ldt.debug.core.internal.LuaDebugConstants;
+import org.eclipse.ldt.remote.core.internal.NetworkUtil;
+import org.eclipse.ldt.remote.core.internal.RSEUtil;
+import org.eclipse.ldt.remote.core.internal.lua.LuaRSEUtil;
+import org.eclipse.ldt.remote.core.internal.lua.LuaSubSystem;
+import org.eclipse.ldt.remote.debug.core.internal.Activator;
+import org.eclipse.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;
+import org.eclipse.ldt.remote.debug.core.internal.sshprocess.SshProcess;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -189,7 +189,7 @@ public class LuaRemoteLaunchConfigurationDelegate extends LaunchConfigurationDel
 
 					for (String luaFile : DEBUG_FILES) {
 						try {
-							Bundle bundle = Platform.getBundle(org.eclipse.koneki.ldt.debug.core.internal.Activator.PLUGIN_ID);
+							Bundle bundle = Platform.getBundle(org.eclipse.ldt.debug.core.internal.Activator.PLUGIN_ID);
 							URL resource = bundle.getResource(luaFile);
 							File result = new File(FileLocator.toFileURL(resource).getPath());
 							String remotePath = remoteApplicationFolderPath + remoteFileSubSystem.getSeparator() + result.getName();
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationUtil.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationUtil.java
index a12bb3d..5f9fa86 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationUtil.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteLaunchConfigurationUtil.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.core.internal.launch;

+package org.eclipse.ldt.remote.debug.core.internal.launch;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -20,11 +20,11 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.debug.core.ILaunchConfiguration;

 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;

-import org.eclipse.koneki.ldt.core.LuaNature;

-import org.eclipse.koneki.ldt.remote.core.internal.RSEUtil;

-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaRSEUtil;

-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaSubSystem;

-import org.eclipse.koneki.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;

+import org.eclipse.ldt.core.LuaNature;

+import org.eclipse.ldt.remote.core.internal.RSEUtil;

+import org.eclipse.ldt.remote.core.internal.lua.LuaRSEUtil;

+import org.eclipse.ldt.remote.core.internal.lua.LuaSubSystem;

+import org.eclipse.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.rse.core.RSECorePlugin;

 import org.eclipse.rse.core.model.IHost;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteSourcePathComputer.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteSourcePathComputer.java
index b9b6ed8..0d9928b 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/LuaRemoteSourcePathComputer.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/LuaRemoteSourcePathComputer.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.core.internal.launch;

+package org.eclipse.ldt.remote.debug.core.internal.launch;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.debug.core.ILaunchConfiguration;

 import org.eclipse.debug.core.sourcelookup.ISourceContainer;

 import org.eclipse.dltk.launching.sourcelookup.ScriptSourcePathComputer;

-import org.eclipse.koneki.ldt.debug.core.internal.LuaModuleURIBuildpathSourceContainer;

+import org.eclipse.ldt.debug.core.internal.LuaModuleURIBuildpathSourceContainer;

 

 /**

  * This class is responsible to find the object (in most of case IResource) for a given sourcename.<br>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/Messages.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/Messages.java
index 6d4601c..302440c 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/Messages.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.core.internal.launch;
+package org.eclipse.ldt.remote.debug.core.internal.launch;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.remote.debug.core.internal.launch.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.remote.debug.core.internal.launch.messages"; //$NON-NLS-1$
 	public static String LuaRemoteLaunchConfigurationDelegate_error_connectionfailed;
 	public static String LuaRemoteLaunchConfigurationDelegate_error_filealreadyexist;
 	public static String LuaRemoteLaunchConfigurationDelegate_error_noluasystem;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/messages.properties b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/messages.properties
index a4b47c7..a4b47c7 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/launch/messages.properties
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/launch/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/InputStreamMonitor.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/InputStreamMonitor.java
index dc46120..2c8989c 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/InputStreamMonitor.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/InputStreamMonitor.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 //FIXME This class is a copy from eclipse.debug.core plugin
-package org.eclipse.koneki.ldt.remote.debug.core.internal.sshprocess;
+package org.eclipse.ldt.remote.debug.core.internal.sshprocess;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/OutputStreamMonitor.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/OutputStreamMonitor.java
index 2883210..bda64c7 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/OutputStreamMonitor.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/OutputStreamMonitor.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 //FIXME This class is a copy from eclipse.debug.core plugin
-package org.eclipse.koneki.ldt.remote.debug.core.internal.sshprocess;
+package org.eclipse.ldt.remote.debug.core.internal.sshprocess;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IStreamListener;
 import org.eclipse.debug.core.model.IFlushableStreamMonitor;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.Activator;
+import org.eclipse.ldt.remote.debug.core.internal.Activator;
 
 /**
  * Monitors the output stream of a system process and notifies listeners of additions to the stream.
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/SshProcess.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/SshProcess.java
index 722c9b4..5a40aef 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/SshProcess.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/SshProcess.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.core.internal.sshprocess;

+package org.eclipse.ldt.remote.debug.core.internal.sshprocess;

 

 import java.io.IOException;

 import java.util.Map;

@@ -24,7 +24,7 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;

 import org.eclipse.debug.core.model.IProcess;

 import org.eclipse.debug.core.model.IStreamsProxy;

-import org.eclipse.koneki.ldt.remote.debug.core.internal.Activator;

+import org.eclipse.ldt.remote.debug.core.internal.Activator;

 

 import com.jcraft.jsch.Channel;

 import com.jcraft.jsch.ChannelExec;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/StreamsProxy.java b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/StreamsProxy.java
index 1f5254a..a19163f 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/sshprocess/StreamsProxy.java
+++ b/plugins/org.eclipse.ldt.remote.debug.core/src/org/eclipse/ldt/remote/debug/core/internal/sshprocess/StreamsProxy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.core.internal.sshprocess;
+package org.eclipse.ldt.remote.debug.core.internal.sshprocess;
 
 //FIXME This class is partial copy from eclipse.debug.core plugin
 
diff --git a/plugins/org.eclipse.ldt.remote.debug.ui/.checkstyle b/plugins/org.eclipse.ldt.remote.debug.ui/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.classpath b/plugins/org.eclipse.ldt.remote.debug.ui/.classpath
index 8a8f166..8a8f166 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.classpath
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.fbprefs b/plugins/org.eclipse.ldt.remote.debug.ui/.fbprefs
index 37c27b5..37c27b5 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.fbprefs
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.fbprefs
diff --git a/plugins/org.eclipse.ldt.remote.debug.ui/.project b/plugins/org.eclipse.ldt.remote.debug.ui/.project
new file mode 100644
index 0000000..167cc55
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.ldt.remote.debug.ui</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.jdt.core.prefs
index 5cf8cb7..5cf8cb7 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.ldt.remote.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.remote.debug.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..249d2e0
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.ldt.remote.debug.ui;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.ldt.remote.debug.ui.internal.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.debug.ui,
+ org.eclipse.ldt.ui,
+ org.eclipse.ui,
+ org.eclipse.ldt.remote.debug.core,
+ org.eclipse.rse.ui,
+ org.eclipse.rse.core,
+ org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.debug.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.ldt,
+ org.eclipse.ldt.remote.core,
+ org.eclipse.ldt.debug.ui,
+ org.eclipse.rse.subsystems.files.core
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: %Bundle-Vendor
+Export-Package: org.eclipse.ldt.remote.debug.ui.internal;x-internal:=true,
+ org.eclipse.ldt.remote.debug.ui.internal.launch;x-internal:=true,
+ org.eclipse.ldt.remote.debug.ui.internal.launch.tab;x-internal:=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.remote.debug.ui/OSGI-INF/l10n/bundle.properties
index 9109acf..6c90304 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/OSGI-INF/l10n/bundle.properties
@@ -8,10 +8,10 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.remote.debug.ui

+#Properties file for org.eclipse.ldt.remote.debug.ui

 Bundle-Name = LDT Remote Development Support Debug UI

-Bundle-Vendor = Eclipse Koneki

-org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab.description = Launch a Lua Application on Remote System.

+Bundle-Vendor = Eclipse LDT

+org.eclipse.ldt.remote.debug.ui.internal.launch.tab.description = Launch a Lua Application on Remote System.

 launchshortcut.label = Lua Remote Application

 launchshortcut.description = Launch a Lua application on remote host

 runasshortcut.description = Run a Lua application on a remote host

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/about.html b/plugins/org.eclipse.ldt.remote.debug.ui/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/about.html
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/build.properties b/plugins/org.eclipse.ldt.remote.debug.ui/build.properties
index 4094c1d..4094c1d 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/build.properties
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/icons/obj16/lua_remote.png b/plugins/org.eclipse.ldt.remote.debug.ui/icons/obj16/lua_remote.png
index c9a3b14..c9a3b14 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/icons/obj16/lua_remote.png
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/icons/obj16/lua_remote.png
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/icons/obj16/main_tab.gif b/plugins/org.eclipse.ldt.remote.debug.ui/icons/obj16/main_tab.gif
index 0193dbe..0193dbe 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/icons/obj16/main_tab.gif
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/icons/obj16/main_tab.gif
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/plugin.xml b/plugins/org.eclipse.ldt.remote.debug.ui/plugin.xml
index 8f3fc60..fd893c1 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/plugin.xml
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/plugin.xml
@@ -4,10 +4,10 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab.LuaRemoteLaunchConfigurationTabGroup"
-            id="org.eclipse.koneki.ldt.remote.debug.ui.luaRemoteApplicationLaunchTabGroup"
-            type="org.eclipse.koneki.ldt.remote.debug.core.luaremotedebug"
-            description="%org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab.description">
+            class="org.eclipse.ldt.remote.debug.ui.internal.launch.tab.LuaRemoteLaunchConfigurationTabGroup"
+            id="org.eclipse.ldt.remote.debug.ui.luaRemoteApplicationLaunchTabGroup"
+            type="org.eclipse.ldt.remote.debug.core.luaremotedebug"
+            description="%org.eclipse.ldt.remote.debug.ui.internal.launch.tab.description">
             <launchMode
                mode="debug"
                perspective="org.eclipse.debug.ui.DebugPerspective">
@@ -21,9 +21,9 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
       <launchConfigurationTypeImage
-            configTypeID="org.eclipse.koneki.ldt.remote.debug.core.luaremotedebug"
+            configTypeID="org.eclipse.ldt.remote.debug.core.luaremotedebug"
             icon="icons/obj16/lua_remote.png"
-            id="org.eclipse.koneki.ldt.remote.debug.core.luaremotedebug.image">
+            id="org.eclipse.ldt.remote.debug.core.luaremotedebug.image">
       </launchConfigurationTypeImage>
    </extension>
  <extension point="org.eclipse.debug.ui.launchShortcuts">
@@ -32,9 +32,9 @@
     icon="icons/obj16/lua_remote.png"
     helpContextId="org.eclipse.jdt.debug.ui"
     modes="run, debug"
-    class="org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.LuaRemoteLaunchShortcut"
+    class="org.eclipse.ldt.remote.debug.ui.internal.launch.LuaRemoteLaunchShortcut"
     description="%launchshortcut.description"
-    id="org.eclipse.koneki.ldt.debug.ui.localLuaShortcut">
+    id="org.eclipse.ldt.debug.ui.localLuaShortcut">
     <description
      description="%runasshortcut.description"
      mode="run">
@@ -51,7 +51,7 @@
    		<and>
 	 		<adapt type="org.eclipse.core.resources.IResource">
         		<test property="org.eclipse.core.resources.projectNature"
-               		  value="org.eclipse.koneki.ldt.nature"/>
+               		  value="org.eclipse.ldt.nature"/>
          	</adapt>
 	        <or>
 	        	<adapt type="org.eclipse.core.resources.IResource">
@@ -63,7 +63,7 @@
 	        	<adapt type="org.eclipse.dltk.core.IProjectFragment">
             		<test
                			forcePluginActivation="true"
-                  		property="org.eclipse.koneki.ldt.debug.ui.propertytester.isLaunchableProjectFragment">
+                  		property="org.eclipse.ldt.debug.ui.propertytester.isLaunchableProjectFragment">
                   	</test>
          	    </adapt>
           		<instanceof value="org.eclipse.dltk.core.IScriptFolder"></instanceof>
@@ -74,7 +74,7 @@
   </enablement>
   </contextualLaunch>
   <configurationType
-    id="org.eclipse.koneki.ldt.remote.debug.core.luaremotedebug">
+    id="org.eclipse.ldt.remote.debug.core.luaremotedebug">
   </configurationType>
   </shortcut>
 </extension>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/pom.xml b/plugins/org.eclipse.ldt.remote.debug.ui/pom.xml
index f3f9c1a..7f8c4d3 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/pom.xml
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.remote.debug.ui</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.remote.debug.ui</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/Activator.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/Activator.java
index e78b645..a1eb70a 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.ui.internal;

+package org.eclipse.ldt.remote.debug.ui.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	/** The plug-in ID */

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.remote.debug.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.remote.debug.ui"; //$NON-NLS-1$

 

 	/** The shared instance */

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/ImageConstants.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/ImageConstants.java
index 6bcf9bd..a71ca79 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/ImageConstants.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/ImageConstants.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.ui.internal;
+package org.eclipse.ldt.remote.debug.ui.internal;
 
 public interface ImageConstants {
 	String LUA_REMOTE_APP_LAUNCH_MAIN_TAB_ICON = "icons/obj16/main_tab.gif"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/LuaRemoteLaunchShortcut.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/LuaRemoteLaunchShortcut.java
index 9202b18..995d210 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/LuaRemoteLaunchShortcut.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/LuaRemoteLaunchShortcut.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.ui.internal.launch;
+package org.eclipse.ldt.remote.debug.ui.internal.launch;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -22,12 +22,12 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.koneki.ldt.debug.ui.internal.launchconfiguration.local.LuaApplicationLaunchShortcut;
-import org.eclipse.koneki.ldt.remote.core.internal.RSEUtil;
-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaSubSystem;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationUtil;
-import org.eclipse.koneki.ldt.remote.debug.ui.internal.Activator;
+import org.eclipse.ldt.debug.ui.internal.launchconfiguration.local.LuaApplicationLaunchShortcut;
+import org.eclipse.ldt.remote.core.internal.RSEUtil;
+import org.eclipse.ldt.remote.core.internal.lua.LuaSubSystem;
+import org.eclipse.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;
+import org.eclipse.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationUtil;
+import org.eclipse.ldt.remote.debug.ui.internal.Activator;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.ISubSystem;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/Messages.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/Messages.java
index 7ca869b..de60849 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/Messages.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.ui.internal.launch;
+package org.eclipse.ldt.remote.debug.ui.internal.launch;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE:OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.remote.debug.ui.internal.launch.messages"; //$NON-NLS-1$
 	public static String LuaRemoteLaunchShortcut_notargetdialog_message;
 	public static String LuaRemoteLaunchShortcut_notargetdialog_title;
 	public static String LuaRemoteLaunchShortcut_selectHost_message;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/messages.properties b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/messages.properties
index 196b1f3..196b1f3 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/messages.properties
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteArgumentsTab.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteArgumentsTab.java
index 044403c..96b8aab 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteArgumentsTab.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteArgumentsTab.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab;
+package org.eclipse.ldt.remote.debug.ui.internal.launch.tab;
 
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.dltk.debug.ui.launchConfigurations.ScriptArgumentsTab;
 import org.eclipse.dltk.debug.ui.messages.ScriptLaunchMessages;
 import org.eclipse.dltk.internal.debug.ui.launcher.WorkingDirectoryBlock;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationUtil;
+import org.eclipse.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationUtil;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteEnvironmentTab.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteEnvironmentTab.java
index 4218f50..5725595 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteEnvironmentTab.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteEnvironmentTab.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab;

+package org.eclipse.ldt.remote.debug.ui.internal.launch.tab;

 

 import java.text.MessageFormat;

 import java.util.ArrayList;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationMainTab.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationMainTab.java
index e2da364..45e6d73 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationMainTab.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationMainTab.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab;
+package org.eclipse.ldt.remote.debug.ui.internal.launch.tab;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -24,15 +24,15 @@ import org.eclipse.dltk.debug.ui.messages.DLTKLaunchConfigurationsMessages;
 import org.eclipse.dltk.debug.ui.preferences.ScriptDebugPreferencesMessages;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.remote.core.internal.RSEUtil;
-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaRSEUtil;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;
-import org.eclipse.koneki.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationUtil;
-import org.eclipse.koneki.ldt.remote.debug.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.LuaDialogUtil;
-import org.eclipse.koneki.ldt.ui.SWTUtil;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.remote.core.internal.RSEUtil;
+import org.eclipse.ldt.remote.core.internal.lua.LuaRSEUtil;
+import org.eclipse.ldt.remote.debug.core.internal.LuaRemoteDebugConstant;
+import org.eclipse.ldt.remote.debug.core.internal.launch.LuaRemoteLaunchConfigurationUtil;
+import org.eclipse.ldt.remote.debug.ui.internal.Activator;
+import org.eclipse.ldt.ui.LuaDialogUtil;
+import org.eclipse.ldt.ui.SWTUtil;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.ui.widgets.SystemHostCombo;
@@ -323,8 +323,8 @@ public class LuaRemoteLaunchConfigurationMainTab extends AbstractLaunchConfigura
 	 */
 	@Override
 	public Image getImage() {
-		return org.eclipse.koneki.ldt.ui.internal.Activator.getDefault().getImageRegistry()
-				.get(org.eclipse.koneki.ldt.ui.internal.ImageConstants.MODULE_OBJ16);
+		return org.eclipse.ldt.ui.internal.Activator.getDefault().getImageRegistry()
+				.get(org.eclipse.ldt.ui.internal.ImageConstants.MODULE_OBJ16);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationTabGroup.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationTabGroup.java
index 12b8d3e..45e9206 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/LuaRemoteLaunchConfigurationTabGroup.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab;
+package org.eclipse.ldt.remote.debug.ui.internal.launch.tab;
 
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.CommonTab;
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/Messages.java b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/Messages.java
index 7167a8e..d252c75 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/Messages.java
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/Messages.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab;

+package org.eclipse.ldt.remote.debug.ui.internal.launch.tab;

 

 import org.eclipse.osgi.util.NLS;

 

 //CHECKSTYLE NLS: OFF

 public class Messages extends NLS {

 

-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.remote.debug.ui.internal.launch.tab.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.ldt.remote.debug.ui.internal.launch.tab.messages"; //$NON-NLS-1$

 

 	public static String LuaRemoteLaunchConfigurationMainTab_debuggroup_title;

 

diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/messages.properties b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/messages.properties
index 60088e6..60088e6 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.ui/src/org/eclipse/koneki/ldt/remote/debug/ui/internal/launch/tab/messages.properties
+++ b/plugins/org.eclipse.ldt.remote.debug.ui/src/org/eclipse/ldt/remote/debug/ui/internal/launch/tab/messages.properties
diff --git a/plugins/org.eclipse.ldt.remote.ui/.checkstyle b/plugins/org.eclipse.ldt.remote.ui/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.ui/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.classpath b/plugins/org.eclipse.ldt.remote.ui/.classpath
index 8a8f166..8a8f166 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.classpath
+++ b/plugins/org.eclipse.ldt.remote.ui/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.fbprefs b/plugins/org.eclipse.ldt.remote.ui/.fbprefs
index 3dcf39d..3dcf39d 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.fbprefs
+++ b/plugins/org.eclipse.ldt.remote.ui/.fbprefs
diff --git a/plugins/org.eclipse.ldt.remote.ui/.project b/plugins/org.eclipse.ldt.remote.ui/.project
new file mode 100644
index 0000000..30f3a85
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.ui/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.ldt.remote.ui</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.jdt.core.prefs
index e20884b..e20884b 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.remote.ui/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.remote.ui/META-INF/MANIFEST.MF
index 8556cab..c521e7c 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.remote.ui/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.remote.ui;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.remote.ui;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.remote.ui.internal.Activator
+Bundle-Activator: org.eclipse.ldt.remote.ui.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.rse.ui,
  org.eclipse.rse.core,
  org.eclipse.ui.views,
- org.eclipse.koneki.ldt.remote.core
+ org.eclipse.ldt.remote.core
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.koneki.ldt.remote.ui.internal;x-internal:=true,
- org.eclipse.koneki.ldt.remote.ui.internal.lua;x-internal:=true
+Export-Package: org.eclipse.ldt.remote.ui.internal;x-internal:=true,
+ org.eclipse.ldt.remote.ui.internal.lua;x-internal:=true
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.remote.ui/OSGI-INF/l10n/bundle.properties
index 2494939..7aed0cf 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.remote.ui/OSGI-INF/l10n/bundle.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.remote.ui

+#Properties file for org.eclipse.ldt.remote.ui

 Bundle-Name = LDT Remote Development Support UI

-Bundle-Vendor = Eclipse Koneki

+Bundle-Vendor = Eclipse LDT

 

 rse.filter.description = Hide RSE Internal Projects

 rse.filter.name = RSE Internal Projects
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/about.html b/plugins/org.eclipse.ldt.remote.ui/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/about.html
+++ b/plugins/org.eclipse.ldt.remote.ui/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/build.properties b/plugins/org.eclipse.ldt.remote.ui/build.properties
index e2c8cb9..e2c8cb9 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/build.properties
+++ b/plugins/org.eclipse.ldt.remote.ui/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/plugin.xml b/plugins/org.eclipse.ldt.remote.ui/plugin.xml
index a50c60e..7e0fe90 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/plugin.xml
+++ b/plugins/org.eclipse.ldt.remote.ui/plugin.xml
@@ -4,8 +4,8 @@
    <extension

          point="org.eclipse.core.runtime.adapters">

       <factory

-            adaptableType="org.eclipse.koneki.ldt.remote.core.internal.lua.LuaSubSystem"

-            class="org.eclipse.koneki.ldt.remote.ui.internal.lua.LuaSubSystemAdapterFactory">

+            adaptableType="org.eclipse.ldt.remote.core.internal.lua.LuaSubSystem"

+            class="org.eclipse.ldt.remote.ui.internal.lua.LuaSubSystemAdapterFactory">

          <adapter

                type="org.eclipse.rse.ui.view.ISystemViewElementAdapter">

          </adapter>

@@ -19,7 +19,7 @@
       <filter

             description="%rse.filter.description"

             enabled="true"

-            id="org.eclipse.koneki.ldt.remote.ui.rsefilter"

+            id="org.eclipse.ldt.remote.ui.rsefilter"

             name="%rse.filter.name"

             pattern="RemoteSystemsTempFiles"

             targetId="org.eclipse.dltk.ui.ScriptExplorer">

diff --git a/plugins/org.eclipse.ldt.remote.ui/pom.xml b/plugins/org.eclipse.ldt.remote.ui/pom.xml
new file mode 100644
index 0000000..3e9a064
--- /dev/null
+++ b/plugins/org.eclipse.ldt.remote.ui/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+    Copyright (c) 2009, 2011 Sierra Wireless and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+        Sierra Wireless - initial API and implementation
+ -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>plugins</artifactId>
+    <groupId>org.eclipse.ldt</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.remote.ui</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/Activator.java b/plugins/org.eclipse.ldt.remote.ui/src/org/eclipse/ldt/remote/ui/internal/Activator.java
index c79ba2c..d57ea05 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.debug.core/src/org/eclipse/koneki/ldt/remote/debug/core/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.remote.ui/src/org/eclipse/ldt/remote/ui/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.debug.core.internal;

+package org.eclipse.ldt.remote.ui.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Plugin;

@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {

 

 	/** The plug-in ID */

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.remote.debug.core"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.remote.ui"; //$NON-NLS-1$

 

 	/** The shared instance */

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/src/org/eclipse/koneki/ldt/remote/ui/internal/lua/LuaSubSystemAdapter.java b/plugins/org.eclipse.ldt.remote.ui/src/org/eclipse/ldt/remote/ui/internal/lua/LuaSubSystemAdapter.java
index 9a8fcc3..163e3d3 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/src/org/eclipse/koneki/ldt/remote/ui/internal/lua/LuaSubSystemAdapter.java
+++ b/plugins/org.eclipse.ldt.remote.ui/src/org/eclipse/ldt/remote/ui/internal/lua/LuaSubSystemAdapter.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.remote.ui.internal.lua;

+package org.eclipse.ldt.remote.ui.internal.lua;

 

 import java.text.MessageFormat;

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaSubSystem;

-import org.eclipse.koneki.ldt.remote.ui.internal.Activator;

+import org.eclipse.ldt.remote.core.internal.lua.LuaSubSystem;

+import org.eclipse.ldt.remote.ui.internal.Activator;

 import org.eclipse.rse.internal.ui.view.SystemViewSubSystemAdapter;

 import org.eclipse.ui.views.properties.IPropertyDescriptor;

 import org.eclipse.ui.views.properties.IPropertySheetEntry;

diff --git a/plugins/org.eclipse.koneki.ldt.remote.ui/src/org/eclipse/koneki/ldt/remote/ui/internal/lua/LuaSubSystemAdapterFactory.java b/plugins/org.eclipse.ldt.remote.ui/src/org/eclipse/ldt/remote/ui/internal/lua/LuaSubSystemAdapterFactory.java
index 681f5ba..2d2c26f 100644
--- a/plugins/org.eclipse.koneki.ldt.remote.ui/src/org/eclipse/koneki/ldt/remote/ui/internal/lua/LuaSubSystemAdapterFactory.java
+++ b/plugins/org.eclipse.ldt.remote.ui/src/org/eclipse/ldt/remote/ui/internal/lua/LuaSubSystemAdapterFactory.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.remote.ui.internal.lua;
+package org.eclipse.ldt.remote.ui.internal.lua;
 
 import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.koneki.ldt.remote.core.internal.lua.LuaSubSystem;
+import org.eclipse.ldt.remote.core.internal.lua.LuaSubSystem;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
 import org.eclipse.ui.views.properties.IPropertySource;
 
diff --git a/plugins/org.eclipse.ldt.support.lua51/.checkstyle b/plugins/org.eclipse.ldt.support.lua51/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/plugins/org.eclipse.ldt.support.lua51/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.classpath b/plugins/org.eclipse.ldt.support.lua51/.classpath
index 8a8f166..8a8f166 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.classpath
+++ b/plugins/org.eclipse.ldt.support.lua51/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.externalToolBuilders/Build Execution Environment.launch b/plugins/org.eclipse.ldt.support.lua51/.externalToolBuilders/Build Execution Environment.launch
index e034734..1e37e64 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.externalToolBuilders/Build Execution Environment.launch
+++ b/plugins/org.eclipse.ldt.support.lua51/.externalToolBuilders/Build Execution Environment.launch
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">

-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>

-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>

-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt.support.lua51/resource&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.koneki.ldt.support.lua51"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="4"/>

-</listAttribute>

-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>

-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>

-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.koneki.ldt.support.lua51"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt.support.lua51/src-ee&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.koneki.ldt.support.lua51/build.xml}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>

-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ldt.support.lua51/resource&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.ldt.support.lua51"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ldt.support.lua51"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ldt.support.lua51/src-ee&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ldt.support.lua51/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.fbprefs b/plugins/org.eclipse.ldt.support.lua51/.fbprefs
index 31bdf7e..31bdf7e 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.fbprefs
+++ b/plugins/org.eclipse.ldt.support.lua51/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.project b/plugins/org.eclipse.ldt.support.lua51/.project
index d89c9a8..54f04ad 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.project
+++ b/plugins/org.eclipse.ldt.support.lua51/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt.support.lua51</name>

+	<name>org.eclipse.ldt.support.lua51</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.jdt.core.prefs
index e20884b..e20884b 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.support.lua51/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.support.lua51/META-INF/MANIFEST.MF
index bfe4994..044186d 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.support.lua51/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-SymbolicName: org.eclipse.koneki.ldt.support.lua51;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.support.lua51;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.support.lua51.internal.Activator
+Bundle-Activator: org.eclipse.ldt.support.lua51.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.dltk.debug;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt,
- org.eclipse.koneki.ldt.debug.core,
+ org.eclipse.ldt,
+ org.eclipse.ldt.debug.core,
  org.apache.commons.codec;bundle-version="1.3.0",
  com.naef.jnlua;bundle-version="[0.9.1,1.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.koneki.ldt.support.lua51.internal;x-internal:=true,
- org.eclipse.koneki.ldt.support.lua51.internal.interpreter;x-internal:=true
+Export-Package: org.eclipse.ldt.support.lua51.internal;x-internal:=true,
+ org.eclipse.ldt.support.lua51.internal.interpreter;x-internal:=true
 
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.support.lua51/OSGI-INF/l10n/bundle.properties
index 63ec30a..4f0bc34 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.support.lua51/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.support.lua51

+#Properties file for org.eclipse.ldt.support.lua51

 Bundle-Name = Lua 5.1 support for LDT

-Bundle-Vendor = Eclipse Koneki
\ No newline at end of file
+Bundle-Vendor = Eclipse LDT
\ No newline at end of file
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/about.html b/plugins/org.eclipse.ldt.support.lua51/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/about.html
+++ b/plugins/org.eclipse.ldt.support.lua51/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/build.properties b/plugins/org.eclipse.ldt.support.lua51/build.properties
index e6890ed..e6890ed 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/build.properties
+++ b/plugins/org.eclipse.ldt.support.lua51/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/build.xml b/plugins/org.eclipse.ldt.support.lua51/build.xml
index a88fbbb..a88fbbb 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/build.xml
+++ b/plugins/org.eclipse.ldt.support.lua51/build.xml
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/plugin.xml b/plugins/org.eclipse.ldt.support.lua51/plugin.xml
index d680288..6dd00f6 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/plugin.xml
+++ b/plugins/org.eclipse.ldt.support.lua51/plugin.xml
@@ -11,7 +11,7 @@
  -->

 <plugin>

    <extension

-         point="org.eclipse.koneki.ldt.executionEnvironment">

+         point="org.eclipse.ldt.executionEnvironment">

       <executionEnvironment

             id="lua"

             resourcedirectory="resource/lua-5.1/"

@@ -21,21 +21,21 @@
    <extension

          point="org.eclipse.dltk.launching.interpreterInstallTypes">

       <interpreterInstallType

-            class="org.eclipse.koneki.ldt.support.lua51.internal.interpreter.JNLua51InterpreterInstallType"

-            id="org.eclipse.koneki.ldt.support.lua51.JNLua51InterpreterInstallType">

+            class="org.eclipse.ldt.support.lua51.internal.interpreter.JNLua51InterpreterInstallType"

+            id="org.eclipse.ldt.support.lua51.JNLua51InterpreterInstallType">

       </interpreterInstallType>

       <interpreterInstallType

-            class="org.eclipse.koneki.ldt.support.lua51.internal.interpreter.Lua51InterpreterInstallType"

-            id="org.eclipse.koneki.ldt.support.lua51.Lua51InterpreterInstallType">

+            class="org.eclipse.ldt.support.lua51.internal.interpreter.Lua51InterpreterInstallType"

+            id="org.eclipse.ldt.support.lua51.Lua51InterpreterInstallType">

       </interpreterInstallType>

    </extension>

    <extension

          point="org.eclipse.dltk.launching.interpreterInstalls">

       <interpreterInstall

             home="(Embedded)"

-            id="org.eclipse.koneki.ldt.support.lua51.JNLua51InterpreterInstall"

+            id="org.eclipse.ldt.support.lua51.JNLua51InterpreterInstall"

             interpreterArgs="-e &quot;io.stdout:setvbuf(&apos;no&apos;)&quot;"

-            interpreterInstallType="org.eclipse.koneki.ldt.support.lua51.JNLua51InterpreterInstallType"

+            interpreterInstallType="org.eclipse.ldt.support.lua51.JNLua51InterpreterInstallType"

             name="Lua 5.1 on JNLua">

       </interpreterInstall>

    </extension>

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/pom.xml b/plugins/org.eclipse.ldt.support.lua51/pom.xml
index 716e6b0..340909b 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/pom.xml
+++ b/plugins/org.eclipse.ldt.support.lua51/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
-	<artifactId>org.eclipse.koneki.ldt.support.lua52</artifactId>
+	<groupId>org.eclipse.ldt</groupId>
+	<artifactId>org.eclipse.ldt.support.lua51</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/resource/lua-5.1/.gitignore b/plugins/org.eclipse.ldt.support.lua51/resource/lua-5.1/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/resource/lua-5.1/.gitignore
+++ b/plugins/org.eclipse.ldt.support.lua51/resource/lua-5.1/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/coroutine.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/coroutine.doclua
index 3bd0358..3bd0358 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/coroutine.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/coroutine.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/debug.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/debug.doclua
index 7e7026a..7e7026a 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/debug.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/debug.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/global.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/global.doclua
index efb868e..efb868e 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/global.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/global.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/io.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/io.doclua
index c3e608d..c3e608d 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/io.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/io.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/math.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/math.doclua
index 275bb72..275bb72 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/math.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/math.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/os.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/os.doclua
index 1d50331..1d50331 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/os.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/os.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/package.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/package.doclua
index 137b172..137b172 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/package.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/package.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/string.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/string.doclua
index 47a056d..47a056d 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/string.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/string.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/table.doclua b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/table.doclua
index f8561e9..f8561e9 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/api/table.doclua
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/api/table.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/coroutine.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/coroutine.html
index dd571b5..dd571b5 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/coroutine.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/coroutine.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/debug.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/debug.html
index 0b25320..0b25320 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/debug.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/debug.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/global.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/global.html
index 3fef8e4..3fef8e4 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/global.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/global.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/index.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/index.html
index 64f422a..64f422a 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/index.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/index.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/io.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/io.html
index ff11639..ff11639 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/io.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/io.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/math.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/math.html
index de3b4ef..de3b4ef 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/math.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/math.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/os.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/os.html
index 78d0c96..78d0c96 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/os.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/os.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/package.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/package.html
index 59f93d9..59f93d9 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/package.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/package.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/string.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/string.html
index f1c1284..f1c1284 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/string.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/string.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/stylesheet.css b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/stylesheet.css
index 1d2f010..1d2f010 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/stylesheet.css
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/stylesheet.css
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/table.html b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/table.html
index 4008208..4008208 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/docs/table.html
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/docs/table.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/lua-5.1.rockspec b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/lua-5.1.rockspec
index a1cef04..a1cef04 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src-ee/lua-5.1/lua-5.1.rockspec
+++ b/plugins/org.eclipse.ldt.support.lua51/src-ee/lua-5.1/lua-5.1.rockspec
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/Activator.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/Activator.java
index d1b2bd5..c8f01f0 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal;

+package org.eclipse.ldt.support.lua51.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Plugin;

@@ -18,7 +18,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {

 

 	/** The plug-in ID */

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.support.lua51"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.support.lua51"; //$NON-NLS-1$

 

 	/** The shared instance */

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51DebugLauncher.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51DebugLauncher.java
index 069d9d7..448b03b 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51DebugLauncher.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51DebugLauncher.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import com.naef.jnlua.LuaState;

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51DebugginEngineCommandLineRenderer.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51DebugginEngineCommandLineRenderer.java
index a84a4ca..f515a96 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51DebugginEngineCommandLineRenderer.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51DebugginEngineCommandLineRenderer.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

-import org.eclipse.koneki.ldt.support.lua51.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

+import org.eclipse.ldt.support.lua51.internal.Activator;

 import org.osgi.framework.Bundle;

 

 public class JNLua51DebugginEngineCommandLineRenderer extends JNLuaDebugginEngineCommandLineRenderer {

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51DebuggingEngineRunner.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51DebuggingEngineRunner.java
index adc10c9..b8c465a 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51DebuggingEngineRunner.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51DebuggingEngineRunner.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstall;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebuggingEngineRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebuggingEngineRunner;

 

 public class JNLua51DebuggingEngineRunner extends JNLuaDebuggingEngineRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterCommandLineRenderer.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterCommandLineRenderer.java
index 9ea53f4..0f47fba 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterCommandLineRenderer.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterCommandLineRenderer.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

-import org.eclipse.koneki.ldt.support.lua51.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

+import org.eclipse.ldt.support.lua51.internal.Activator;

 import org.osgi.framework.Bundle;

 

 public class JNLua51InterpreterCommandLineRenderer extends JNLuaInterpreterCommandLineRenderer {

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstall.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstall.java
index e940d4e..5b622d3 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstall.java
@@ -8,12 +8,12 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import org.eclipse.debug.core.ILaunchManager;

 import org.eclipse.dltk.launching.IInterpreterInstallType;

 import org.eclipse.dltk.launching.IInterpreterRunner;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterInstall;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterInstall;

 

 public class JNLua51InterpreterInstall extends JNLuaInterpreterInstall {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstallType.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstallType.java
index 5f67b1b..3fc2d59 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterInstallType.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstall;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.AbstractJNLuaInterpreterInstallType;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.AbstractJNLuaInterpreterInstallType;

 

 public class JNLua51InterpreterInstallType extends AbstractJNLuaInterpreterInstallType {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterRunner.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterRunner.java
index 0a77df3..2ac4afc 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51InterpreterRunner.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51InterpreterRunner.java
@@ -8,12 +8,12 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstall;

 import org.eclipse.dltk.launching.InterpreterConfig;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterRunner;

 

 public class JNLua51InterpreterRunner extends JNLuaInterpreterRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51Launcher.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51Launcher.java
index f5f2281..037b628 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/JNLua51Launcher.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/JNLua51Launcher.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstall.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstall.java
index 899445c..eae066b 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstall.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

 

 public class Lua51InterpreterInstall extends AbstractLuaInterpreterInstall {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstallType.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstallType.java
index 3bb1d6e..d070685 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/Lua51InterpreterInstallType.java
@@ -1,10 +1,10 @@
-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;
+package org.eclipse.ldt.support.lua51.internal.interpreter;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.dltk.launching.IInterpreterInstall;
-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;
-import org.eclipse.koneki.ldt.debug.core.interpreter.ILuaInterpreterInstallType;
-import org.eclipse.koneki.ldt.support.lua51.internal.Activator;
+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;
+import org.eclipse.ldt.debug.core.interpreter.ILuaInterpreterInstallType;
+import org.eclipse.ldt.support.lua51.internal.Activator;
 
 public class Lua51InterpreterInstallType extends AbstractLuaInterpreterInstallType implements ILuaInterpreterInstallType {
 
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/TransportLayerModule.java b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/TransportLayerModule.java
index 9c283bb..3563d09 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/interpreter/TransportLayerModule.java
+++ b/plugins/org.eclipse.ldt.support.lua51/src/org/eclipse/ldt/support/lua51/internal/interpreter/TransportLayerModule.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal.interpreter;

+package org.eclipse.ldt.support.lua51.internal.interpreter;

 

 import java.io.IOException;

 import java.net.InetSocketAddress;

diff --git a/plugins/org.eclipse.ldt.support.lua52/.checkstyle b/plugins/org.eclipse.ldt.support.lua52/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/plugins/org.eclipse.ldt.support.lua52/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.classpath b/plugins/org.eclipse.ldt.support.lua52/.classpath
index ad32c83..ad32c83 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.classpath
+++ b/plugins/org.eclipse.ldt.support.lua52/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.externalToolBuilders/Build Execution Environment.launch b/plugins/org.eclipse.ldt.support.lua52/.externalToolBuilders/Build Execution Environment.launch
index bb45356..b09626d 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.externalToolBuilders/Build Execution Environment.launch
+++ b/plugins/org.eclipse.ldt.support.lua52/.externalToolBuilders/Build Execution Environment.launch
@@ -2,9 +2,9 @@
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt.support.lua52/resource&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.ldt.support.lua52/resource&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.koneki.ldt.support.lua52"/>
+<listEntry value="/org.eclipse.ldt.support.lua52"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -12,9 +12,9 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.koneki.ldt.support.lua52"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt.support.lua52/src-ee&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.koneki.ldt.support.lua52/build.xml}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ldt.support.lua52"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.ldt.support.lua52/src-ee&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ldt.support.lua52/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 </launchConfiguration>
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.project b/plugins/org.eclipse.ldt.support.lua52/.project
index 8eeb066..5ea17f4 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.project
+++ b/plugins/org.eclipse.ldt.support.lua52/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.support.lua52</name>
+	<name>org.eclipse.ldt.support.lua52</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/edu.umd.cs.findbugs.core.prefs b/plugins/org.eclipse.ldt.support.lua52/.settings/edu.umd.cs.findbugs.core.prefs
index e8ff398..e8ff398 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/plugins/org.eclipse.ldt.support.lua52/.settings/edu.umd.cs.findbugs.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.jdt.core.prefs
index e20884b..e20884b 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.support.lua52/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.support.lua52/META-INF/MANIFEST.MF
index eccaefa..35f6d3e 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ldt.support.lua52/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-SymbolicName: org.eclipse.koneki.ldt.support.lua52;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.support.lua52;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.support.lua52.internal.Activator
+Bundle-Activator: org.eclipse.ldt.support.lua52.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.dltk.debug;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt,
- org.eclipse.koneki.ldt.debug.core,
+ org.eclipse.ldt,
+ org.eclipse.ldt.debug.core,
  org.apache.commons.codec;bundle-version="1.3.0",
  com.naef.jnlua;bundle-version="1.0.3"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.koneki.ldt.support.lua52.internal;x-internal:=true,
- org.eclipse.koneki.ldt.support.lua52.internal.interpreter;x-internal:=true
+Export-Package: org.eclipse.ldt.support.lua52.internal;x-internal:=true,
+ org.eclipse.ldt.support.lua52.internal.interpreter;x-internal:=true
 
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.support.lua52/OSGI-INF/l10n/bundle.properties
index 42d8f38..d17bd6c 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.support.lua52/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.support.lua51

+#Properties file for org.eclipse.ldt.support.lua51

 Bundle-Name = Lua 5.2 support for LDT

-Bundle-Vendor = Eclipse Koneki
\ No newline at end of file
+Bundle-Vendor = Eclipse LDT
\ No newline at end of file
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/about.html b/plugins/org.eclipse.ldt.support.lua52/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/about.html
+++ b/plugins/org.eclipse.ldt.support.lua52/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/build.properties b/plugins/org.eclipse.ldt.support.lua52/build.properties
index ffaaac7..ffaaac7 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/build.properties
+++ b/plugins/org.eclipse.ldt.support.lua52/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/build.xml b/plugins/org.eclipse.ldt.support.lua52/build.xml
index 050f690..050f690 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/build.xml
+++ b/plugins/org.eclipse.ldt.support.lua52/build.xml
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/plugin.xml b/plugins/org.eclipse.ldt.support.lua52/plugin.xml
index 5d53edf..35464b1 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/plugin.xml
+++ b/plugins/org.eclipse.ldt.support.lua52/plugin.xml
@@ -11,7 +11,7 @@
  -->

 <plugin>

    <extension

-         point="org.eclipse.koneki.ldt.executionEnvironment">

+         point="org.eclipse.ldt.executionEnvironment">

       <executionEnvironment

             id="lua"

             resourcedirectory="resource/lua-5.2/"

@@ -21,21 +21,21 @@
    <extension

          point="org.eclipse.dltk.launching.interpreterInstallTypes">

       <interpreterInstallType

-            class="org.eclipse.koneki.ldt.support.lua52.internal.interpreter.JNLua52InterpreterInstallType"

-            id="org.eclipse.koneki.ldt.support.lua52.JNLua52InterpreterInstallType">

+            class="org.eclipse.ldt.support.lua52.internal.interpreter.JNLua52InterpreterInstallType"

+            id="org.eclipse.ldt.support.lua52.JNLua52InterpreterInstallType">

       </interpreterInstallType>

       <interpreterInstallType

-            class="org.eclipse.koneki.ldt.support.lua52.internal.interpreter.Lua52InterpreterInstallType"

-            id="org.eclipse.koneki.ldt.support.lua52.Lua52InterpreterInstallType">

+            class="org.eclipse.ldt.support.lua52.internal.interpreter.Lua52InterpreterInstallType"

+            id="org.eclipse.ldt.support.lua52.Lua52InterpreterInstallType">

       </interpreterInstallType>

    </extension>

    <extension

          point="org.eclipse.dltk.launching.interpreterInstalls">

       <interpreterInstall

             home="(Embedded)"

-            id="org.eclipse.koneki.ldt.support.lua52.JNLua52InterpreterInstall"

+            id="org.eclipse.ldt.support.lua52.JNLua52InterpreterInstall"

             interpreterArgs="-e &quot;io.stdout:setvbuf(&apos;no&apos;)&quot;"

-            interpreterInstallType="org.eclipse.koneki.ldt.support.lua52.JNLua52InterpreterInstallType"

+            interpreterInstallType="org.eclipse.ldt.support.lua52.JNLua52InterpreterInstallType"

             name="Lua 5.2 on JNLua">

       </interpreterInstall>

    </extension>

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/pom.xml b/plugins/org.eclipse.ldt.support.lua52/pom.xml
index fc4080a..6321939 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/pom.xml
+++ b/plugins/org.eclipse.ldt.support.lua52/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>plugins</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
-	<artifactId>org.eclipse.koneki.ldt.support.lua51</artifactId>
+	<groupId>org.eclipse.ldt</groupId>
+	<artifactId>org.eclipse.ldt.support.lua52</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/resource/lua-5.2/.gitignore b/plugins/org.eclipse.ldt.support.lua52/resource/lua-5.2/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/resource/lua-5.2/.gitignore
+++ b/plugins/org.eclipse.ldt.support.lua52/resource/lua-5.2/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/bit32.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/bit32.doclua
index 329ab72..329ab72 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/bit32.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/bit32.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/coroutine.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/coroutine.doclua
index 249eef3..249eef3 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/coroutine.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/coroutine.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/debug.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/debug.doclua
index 01f39e5..01f39e5 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/debug.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/debug.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/global.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/global.doclua
index 1ef6bae..1ef6bae 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/global.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/global.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/io.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/io.doclua
index 69ebc68..69ebc68 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/io.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/io.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/math.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/math.doclua
index 6bda10b..6bda10b 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/math.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/math.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/os.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/os.doclua
index b10dd11..b10dd11 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/os.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/os.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/package.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/package.doclua
index 98ddf69..98ddf69 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/package.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/package.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/string.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/string.doclua
index 08d5cb5..08d5cb5 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/string.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/string.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/table.doclua b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/table.doclua
index 4e8d2bb..4e8d2bb 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/api/table.doclua
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/api/table.doclua
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/bit32.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/bit32.html
index 0d037b8..0d037b8 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/bit32.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/bit32.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/coroutine.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/coroutine.html
index 8f2683e..8f2683e 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/coroutine.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/coroutine.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/debug.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/debug.html
index 2ba1d7e..2ba1d7e 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/debug.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/debug.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/global.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/global.html
index aee41e8..aee41e8 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/global.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/global.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/index.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/index.html
index 43a1594..43a1594 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/index.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/index.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/io.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/io.html
index b01d3d7..b01d3d7 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/io.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/io.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/math.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/math.html
index 66ecde4..66ecde4 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/math.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/math.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/os.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/os.html
index b49f252..b49f252 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/os.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/os.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/package.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/package.html
index 1a534c4..1a534c4 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/package.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/package.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/string.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/string.html
index cc2d894..cc2d894 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/string.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/string.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/stylesheet.css b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/stylesheet.css
index 1b82635..1b82635 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/stylesheet.css
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/stylesheet.css
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/table.html b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/table.html
index d154fc8..d154fc8 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/docs/table.html
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/docs/table.html
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/lua-5.2.rockspec b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/lua-5.2.rockspec
index 8981654..8981654 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src-ee/lua-5.2/lua-5.2.rockspec
+++ b/plugins/org.eclipse.ldt.support.lua52/src-ee/lua-5.2/lua-5.2.rockspec
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/Activator.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/Activator.java
index 229d8b6..7f6da5d 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua51/src/org/eclipse/koneki/ldt/support/lua51/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua51.internal;

+package org.eclipse.ldt.support.lua52.internal;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Plugin;

@@ -18,7 +18,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {

 

 	/** The plug-in ID */

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.support.lua51"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.support.lua51"; //$NON-NLS-1$

 

 	/** The shared instance */

 	private static Activator plugin;

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52DebugLauncher.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52DebugLauncher.java
index f628b8e..8ca01bb 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52DebugLauncher.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52DebugLauncher.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import com.naef.jnlua.LuaState;

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52DebugginEngineCommandLineRenderer.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52DebugginEngineCommandLineRenderer.java
index 46d151f..87c64d9 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52DebugginEngineCommandLineRenderer.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52DebugginEngineCommandLineRenderer.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

-import org.eclipse.koneki.ldt.support.lua52.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

+import org.eclipse.ldt.support.lua52.internal.Activator;

 import org.osgi.framework.Bundle;

 

 public class JNLua52DebugginEngineCommandLineRenderer extends JNLuaDebugginEngineCommandLineRenderer {

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52DebuggingEngineRunner.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52DebuggingEngineRunner.java
index 5980666..b6bdd2c 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52DebuggingEngineRunner.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52DebuggingEngineRunner.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstall;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebuggingEngineRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebugginEngineCommandLineRenderer;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaDebuggingEngineRunner;

 

 public class JNLua52DebuggingEngineRunner extends JNLuaDebuggingEngineRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterCommandLineRenderer.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterCommandLineRenderer.java
index fdbff71..58e5ee8 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterCommandLineRenderer.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterCommandLineRenderer.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

-import org.eclipse.koneki.ldt.support.lua52.internal.Activator;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

+import org.eclipse.ldt.support.lua52.internal.Activator;

 import org.osgi.framework.Bundle;

 

 public class JNLua52InterpreterCommandLineRenderer extends JNLuaInterpreterCommandLineRenderer {

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstall.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstall.java
index 16dffb8..a4a3e55 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstall.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstallType;

 import org.eclipse.dltk.launching.IInterpreterRunner;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterInstall;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterInstall;

 

 public class JNLua52InterpreterInstall extends JNLuaInterpreterInstall {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstallType.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstallType.java
index 9318661..eacf3a5 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterInstallType.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstall;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.AbstractJNLuaInterpreterInstallType;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.AbstractJNLuaInterpreterInstallType;

 

 public class JNLua52InterpreterInstallType extends AbstractJNLuaInterpreterInstallType {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterRunner.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterRunner.java
index 00ac4c3..65d623b 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52InterpreterRunner.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52InterpreterRunner.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstall;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

-import org.eclipse.koneki.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterRunner;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterCommandLineRenderer;

+import org.eclipse.ldt.debug.core.internal.interpreter.jnlua.JNLuaInterpreterRunner;

 

 public class JNLua52InterpreterRunner extends JNLuaInterpreterRunner {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52Launcher.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52Launcher.java
index e29104a..1e0514d 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/JNLua52Launcher.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/JNLua52Launcher.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstall.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstall.java
index fbaad93..24f8d44 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstall.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstall.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import org.eclipse.dltk.launching.IInterpreterInstallType;

-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstall;

 

 public class Lua52InterpreterInstall extends AbstractLuaInterpreterInstall {

 

diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstallType.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstallType.java
index 95a697d..5d04323 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstallType.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/Lua52InterpreterInstallType.java
@@ -1,10 +1,10 @@
-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;
+package org.eclipse.ldt.support.lua52.internal.interpreter;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.dltk.launching.IInterpreterInstall;
-import org.eclipse.koneki.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;
-import org.eclipse.koneki.ldt.debug.core.interpreter.ILuaInterpreterInstallType;
-import org.eclipse.koneki.ldt.support.lua52.internal.Activator;
+import org.eclipse.ldt.debug.core.interpreter.AbstractLuaInterpreterInstallType;
+import org.eclipse.ldt.debug.core.interpreter.ILuaInterpreterInstallType;
+import org.eclipse.ldt.support.lua52.internal.Activator;
 
 public class Lua52InterpreterInstallType extends AbstractLuaInterpreterInstallType implements ILuaInterpreterInstallType {
 
diff --git a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/TransportLayerModule.java b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/TransportLayerModule.java
index 8d3f404..a19295d 100644
--- a/plugins/org.eclipse.koneki.ldt.support.lua52/src/org/eclipse/koneki/ldt/support/lua52/internal/interpreter/TransportLayerModule.java
+++ b/plugins/org.eclipse.ldt.support.lua52/src/org/eclipse/ldt/support/lua52/internal/interpreter/TransportLayerModule.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.support.lua52.internal.interpreter;

+package org.eclipse.ldt.support.lua52.internal.interpreter;

 

 import java.io.IOException;

 import java.net.InetSocketAddress;

diff --git a/plugins/org.eclipse.ldt.ui/.checkstyle b/plugins/org.eclipse.ldt.ui/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/plugins/org.eclipse.ldt.ui/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.classpath b/plugins/org.eclipse.ldt.ui/.classpath
index 8a8f166..8a8f166 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/.classpath
+++ b/plugins/org.eclipse.ldt.ui/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.fbprefs b/plugins/org.eclipse.ldt.ui/.fbprefs
index 968afbf..968afbf 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/.fbprefs
+++ b/plugins/org.eclipse.ldt.ui/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt.branding/.project b/plugins/org.eclipse.ldt.ui/.project
index f4c63eb..4398378 100644
--- a/plugins/org.eclipse.koneki.ldt.branding/.project
+++ b/plugins/org.eclipse.ldt.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.branding</name>
+	<name>org.eclipse.ldt.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.jdt.core.prefs
index 910ca67..910ca67 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt.ui/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.ldt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dbfc8de
--- /dev/null
+++ b/plugins/org.eclipse.ldt.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,47 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.ldt.ui;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.ldt.ui.internal.Activator
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.core.expressions;bundle-version="3.4.0",
+ org.eclipse.ui;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.6.0",
+ org.eclipse.ui.editors,
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.debug.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.launching;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.formatter;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.ldt.metalua;bundle-version="0.9.0",
+ org.eclipse.ldt;bundle-version="0.1.0",
+ org.eclipse.compare;bundle-version="3.5.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.ldt.ui,
+ org.eclipse.ldt.ui.internal;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests,org.eclipse.ldt.remote.debug.ui",
+ org.eclipse.ldt.ui.internal.buildpath;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.compare;x-internal:=true,
+ org.eclipse.ldt.ui.internal.documentation;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.editor;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.editor.completion;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.editor.formatter;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.editor.navigation;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.editor.quickfix;x-internal:=true,
+ org.eclipse.ldt.ui.internal.editor.templates;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.editor.text;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.editor.text.folding;x-internal:=true,
+ org.eclipse.ldt.ui.internal.editor.text.rules;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.handlers;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.preferences;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.properties;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.propertytesters;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.search;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.internal.views;x-friends:="org.eclipse.ldt.debug.ui,org.eclipse.ldt.ui.tests",
+ org.eclipse.ldt.ui.wizards,
+ org.eclipse.ldt.ui.wizards.pages
+Import-Package: org.apache.commons.io;version="1.4.0"
diff --git a/plugins/org.eclipse.koneki.ldt.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt.ui/OSGI-INF/l10n/bundle.properties
index 9fa037f..828f069 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt.ui/OSGI-INF/l10n/bundle.properties
@@ -8,10 +8,10 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.ui
+#Properties file for org.eclipse.ldt.ui
 page.name = Interpreters
 Bundle-Name = Lua Development Tools UI
-Bundle-Vendor = Eclipse Koneki
+Bundle-Vendor = Eclipse LDT
 preference.page.name.lua = Lua
 preference.page.name.userlib = User Libraries
 preference.page.name.executionenvironment = Execution Environments
diff --git a/plugins/org.eclipse.koneki.ldt.ui/about.html b/plugins/org.eclipse.ldt.ui/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/about.html
+++ b/plugins/org.eclipse.ldt.ui/about.html
diff --git a/plugins/org.eclipse.koneki.ldt.ui/build.properties b/plugins/org.eclipse.ldt.ui/build.properties
index 6b2e6a8..6b2e6a8 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/build.properties
+++ b/plugins/org.eclipse.ldt.ui/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/css/e4-dark_ldt_syntaxhighlighing.css b/plugins/org.eclipse.ldt.ui/css/e4-dark_ldt_syntaxhighlighing.css
index 034e94a..82aafc8 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/css/e4-dark_ldt_syntaxhighlighing.css
+++ b/plugins/org.eclipse.ldt.ui/css/e4-dark_ldt_syntaxhighlighing.css
@@ -9,7 +9,7 @@
 *        Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-IEclipsePreferences#org-eclipse-koneki-ldt-ui {
+IEclipsePreferences#org-eclipse-ldt-ui {
 	preferences:
 		'sourceHoverBackgroundColor=255,255,225'
 		'DLTK_single_line_comment=98,98,98'
@@ -23,4 +23,4 @@ IEclipsePreferences#org-eclipse-koneki-ldt-ui {
 		'DLTK_comment_task_tag=154,140,124'
 		'luadoc.tags=154,140,124'
 		'DLTK_default=191,191,191'
-}
\ No newline at end of file
+}
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/eview/luadoc_view.gif b/plugins/org.eclipse.ldt.ui/icons/eview/luadoc_view.gif
index 1e09d97..1e09d97 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/eview/luadoc_view.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/eview/luadoc_view.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/doclua_file_plus.png b/plugins/org.eclipse.ldt.ui/icons/obj16/doclua_file_plus.png
index f966667..f966667 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/doclua_file_plus.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/doclua_file_plus.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua-logo.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/lua-logo.gif
index 224d927..224d927 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua-logo.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/lua-logo.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_file_plus.png b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_file_plus.png
index 7f55175..7f55175 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_file_plus.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_file_plus.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_newprj_wiz.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_newprj_wiz.gif
index ef6ed70..ef6ed70 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_newprj_wiz.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_newprj_wiz.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_pers.png b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_pers.png
index 2ab4c55..2ab4c55 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_pers.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_pers.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_pers.svg b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_pers.svg
index 75b1951..75b1951 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/lua_pers.svg
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/lua_pers.svg
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/module.gif
index 8eda659..8eda659 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/module.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_field.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/module_field.gif
index 6929d3d..6929d3d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_field.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/module_field.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_function.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/module_function.gif
index f4a1ea1..f4a1ea1 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_function.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/module_function.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_table.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/module_table.gif
index 6929d3d..6929d3d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_table.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/module_table.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_table.png b/plugins/org.eclipse.ldt.ui/icons/obj16/module_table.png
index ef456a8..ef456a8 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/module_table.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/module_table.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_field.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/private_field.gif
index 1fe064e..1fe064e 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_field.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/private_field.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_function.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/private_function.gif
index 2988716..2988716 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_function.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/private_function.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_table.png b/plugins/org.eclipse.ldt.ui/icons/obj16/private_table.png
index c7527fe..c7527fe 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_table.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/private_table.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_table2.png b/plugins/org.eclipse.ldt.ui/icons/obj16/private_table2.png
index 6287bc3..6287bc3 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/private_table2.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/private_table2.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_field.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/public_field.gif
index d4cb425..d4cb425 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_field.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/public_field.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_function.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/public_function.gif
index a9af5d5..a9af5d5 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_function.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/public_function.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_table.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/public_table.gif
index 550d5dc..550d5dc 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_table.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/public_table.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_table.png b/plugins/org.eclipse.ldt.ui/icons/obj16/public_table.png
index 6ad0275..6ad0275 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/public_table.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/public_table.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/template_luadoc.png b/plugins/org.eclipse.ldt.ui/icons/obj16/template_luadoc.png
index d244eaa..d244eaa 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/template_luadoc.png
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/template_luadoc.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/type.gif b/plugins/org.eclipse.ldt.ui/icons/obj16/type.gif
index 15511f0..15511f0 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/obj16/type.gif
+++ b/plugins/org.eclipse.ldt.ui/icons/obj16/type.gif
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/ovr16/doclua.png b/plugins/org.eclipse.ldt.ui/icons/ovr16/doclua.png
index b10b726..b10b726 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/ovr16/doclua.png
+++ b/plugins/org.eclipse.ldt.ui/icons/ovr16/doclua.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/ovr16/lua_nature.png b/plugins/org.eclipse.ldt.ui/icons/ovr16/lua_nature.png
index 99afa5d..99afa5d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/ovr16/lua_nature.png
+++ b/plugins/org.eclipse.ldt.ui/icons/ovr16/lua_nature.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/wizban/doclua_newfile_wiz.png b/plugins/org.eclipse.ldt.ui/icons/wizban/doclua_newfile_wiz.png
index c1f5f46..c1f5f46 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/wizban/doclua_newfile_wiz.png
+++ b/plugins/org.eclipse.ldt.ui/icons/wizban/doclua_newfile_wiz.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/wizban/lua_newfile_wiz.png b/plugins/org.eclipse.ldt.ui/icons/wizban/lua_newfile_wiz.png
index a49de4d..a49de4d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/wizban/lua_newfile_wiz.png
+++ b/plugins/org.eclipse.ldt.ui/icons/wizban/lua_newfile_wiz.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/icons/wizban/lua_newprj_wiz.png b/plugins/org.eclipse.ldt.ui/icons/wizban/lua_newprj_wiz.png
index 98fb5f7..98fb5f7 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/icons/wizban/lua_newprj_wiz.png
+++ b/plugins/org.eclipse.ldt.ui/icons/wizban/lua_newprj_wiz.png
diff --git a/plugins/org.eclipse.koneki.ldt.ui/plugin.xml b/plugins/org.eclipse.ldt.ui/plugin.xml
index e11c64c..1308a0a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/plugin.xml
+++ b/plugins/org.eclipse.ldt.ui/plugin.xml
@@ -14,81 +14,81 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.GlobalLuaPreferencePage"
-            id="org.eclipse.koneki.ldt.ui.globalpreferencepage"
+            class="org.eclipse.ldt.ui.internal.preferences.GlobalLuaPreferencePage"
+            id="org.eclipse.ldt.ui.globalpreferencepage"
             name="%preference.page.name.lua">
       </page>
       <page
-            category="org.eclipse.koneki.ldt.ui.globalpreferencepage"
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaUserLibraryPreferencePage"
+            category="org.eclipse.ldt.ui.globalpreferencepage"
+            class="org.eclipse.ldt.ui.internal.preferences.LuaUserLibraryPreferencePage"
             id="org.eclipse.dltk.lua.preferences.UserLibraryPreferencePage"
             name="%preference.page.name.userlib">
       </page>
       <page
-            category="org.eclipse.koneki.ldt.ui.globalpreferencepage"
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaExecutionEnvironmentPreferencePage"
-            id="org.eclipse.koneki.ldt.ui.executionenvironmentpreferencepage"
+            category="org.eclipse.ldt.ui.globalpreferencepage"
+            class="org.eclipse.ldt.ui.internal.preferences.LuaExecutionEnvironmentPreferencePage"
+            id="org.eclipse.ldt.ui.executionenvironmentpreferencepage"
             name="%preference.page.name.executionenvironment">
       </page>
       <page
-            category="org.eclipse.koneki.ldt.ui.globalpreferencepage"
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaTodoTaskPreferencePage"
-            id="org.eclipse.koneki.ldt.ui.todo"
+            category="org.eclipse.ldt.ui.globalpreferencepage"
+            class="org.eclipse.ldt.ui.internal.preferences.LuaTodoTaskPreferencePage"
+            id="org.eclipse.ldt.ui.todo"
             name="%preference.page.name.todotasks"/>
    </extension>
       <extension
          point="org.eclipse.ui.ide.projectNatureImages">
       <image
             icon="icons/ovr16/lua_nature.png"
-            id="org.eclipse.koneki.ldt.nature.ui.luanatureimage"
-            natureId="org.eclipse.koneki.ldt.nature">
+            id="org.eclipse.ldt.nature.ui.luanatureimage"
+            natureId="org.eclipse.ldt.nature">
       </image>
    </extension>
    <extension
          point="org.eclipse.dltk.ui.search">
       <occurrencesFinder
-            class="org.eclipse.koneki.ldt.ui.internal.search.LuaModelElementOccurrencesFinder"
-            nature="org.eclipse.koneki.ldt.nature">
+            class="org.eclipse.ldt.ui.internal.search.LuaModelElementOccurrencesFinder"
+            nature="org.eclipse.ldt.nature">
       </occurrencesFinder>
    </extension>
    <extension
          point="org.eclipse.ui.views">
       <category
-            id="org.eclipse.koneki.ldt.ui.luaviewcategory"
+            id="org.eclipse.ldt.ui.luaviewcategory"
             name="%view.category.name.lua">
       </category>
    </extension>
      <extension
        point="org.eclipse.ui.propertyPages">
     <page
-          category="org.eclipse.koneki.ldt.ui.lua.page"
-          class="org.eclipse.koneki.ldt.ui.internal.properties.LuaBuildPathPropertyPage"
-          id="org.eclipse.koneki.ldt.ui.BuildpathProperties"
+          category="org.eclipse.ldt.ui.lua.page"
+          class="org.eclipse.ldt.ui.internal.properties.LuaBuildPathPropertyPage"
+          id="org.eclipse.ldt.ui.BuildpathProperties"
           name="%properties.page.name.buildpath">
       <enabledWhen>
         <adapt type="org.eclipse.core.resources.IProject">
-          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.koneki.ldt.nature"/>
+          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.ldt.nature"/>
         </adapt>
       </enabledWhen>
     </page>
     <page
-          class="org.eclipse.koneki.ldt.ui.internal.properties.LuaPropertyPage"
-          id="org.eclipse.koneki.ldt.ui.lua.page"
+          class="org.eclipse.ldt.ui.internal.properties.LuaPropertyPage"
+          id="org.eclipse.ldt.ui.lua.page"
           name="%properties.page.name.lua">
       <enabledWhen>
         <adapt type="org.eclipse.core.resources.IProject">
-          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.koneki.ldt.nature"/>
+          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.ldt.nature"/>
         </adapt>
       </enabledWhen>
     </page>
     <page
-          category="org.eclipse.koneki.ldt.ui.lua.page"
-          class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaTodoTaskPreferencePage"
-          id="org.eclipse.koneki.ldt.ui.todo.propertyPage"
+          category="org.eclipse.ldt.ui.lua.page"
+          class="org.eclipse.ldt.ui.internal.preferences.LuaTodoTaskPreferencePage"
+          id="org.eclipse.ldt.ui.todo.propertyPage"
           name="%properties.page.name.todotask">
       <enabledWhen>
         <adapt type="org.eclipse.core.resources.IProject">
-          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.koneki.ldt.nature"/>
+          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.ldt.nature"/>
         </adapt>
       </enabledWhen>
     </page>
@@ -99,29 +99,29 @@
               class="org.eclipse.dltk.internal.ui.wizards.buildpath.UserLibraryWizardPage"
               id="org.eclipse.dltk.lua.preferences.UserLibraryPreferencePage"
               name="Lua User Libraries"
-              nature="org.eclipse.koneki.ldt.nature">
+              nature="org.eclipse.ldt.nature">
         </buildpathContainerPage>
         <buildpathContainerPage
-              class="org.eclipse.koneki.ldt.ui.internal.buildpath.LuaExecutionEnvironmentWizardPage"
-              id="org.eclipse.koneki.ldt.ui.luaexecutionenvironmentpage"
+              class="org.eclipse.ldt.ui.internal.buildpath.LuaExecutionEnvironmentWizardPage"
+              id="org.eclipse.ldt.ui.luaexecutionenvironmentpage"
               name="Lua Execution Environment"
-              nature="org.eclipse.koneki.ldt.nature">
+              nature="org.eclipse.ldt.nature">
         </buildpathContainerPage>
         </extension>
      <extension
            point="org.eclipse.dltk.ui.scriptDocumentationProviders">
         <provider
-              class="org.eclipse.koneki.ldt.ui.internal.documentation.LuaDocumentationProvider"
-              nature="org.eclipse.koneki.ldt.nature">
+              class="org.eclipse.ldt.ui.internal.documentation.LuaDocumentationProvider"
+              nature="org.eclipse.ldt.nature">
         </provider>
      </extension>
      <extension
            point="org.eclipse.ui.views">
         <view
-              category="org.eclipse.koneki.ldt.ui.luaviewcategory"
-              class="org.eclipse.koneki.ldt.ui.internal.views.LuaDocView"
+              category="org.eclipse.ldt.ui.luaviewcategory"
+              class="org.eclipse.ldt.ui.internal.views.LuaDocView"
               icon="icons/eview/luadoc_view.gif"
-              id="org.eclipse.koneki.ldt.ui.luadoc"
+              id="org.eclipse.ldt.ui.luadoc"
               name="%view.luadoc.name"
               restorable="true">
         </view>
@@ -129,9 +129,9 @@
        <extension
          point="org.eclipse.ui.perspectives">
       <perspective
-            class="org.eclipse.koneki.ldt.ui.internal.LuaPerspectiveFactory"
+            class="org.eclipse.ldt.ui.internal.LuaPerspectiveFactory"
             icon="icons/obj16/lua_pers.png"
-            id="org.eclipse.koneki.ldt.ui.luaperspective"
+            id="org.eclipse.ldt.ui.luaperspective"
             name="%perspective.name">
       </perspective>
      </extension>
@@ -139,18 +139,18 @@
              point="org.eclipse.ui.commands">
           <command
                 description="%handler.documentation.description"
-                id="org.eclipse.koneki.ldt.ui.buildpathcontainer.documentation"
+                id="org.eclipse.ldt.ui.buildpathcontainer.documentation"
                 name="%handler.documentation.label">
           </command>
        </extension>
        <extension
              point="org.eclipse.ui.handlers">
           <handler
-                class="org.eclipse.koneki.ldt.ui.internal.handlers.LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandler"
-                commandId="org.eclipse.koneki.ldt.ui.buildpathcontainer.documentation">
+                class="org.eclipse.ldt.ui.internal.handlers.LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandler"
+                commandId="org.eclipse.ldt.ui.buildpathcontainer.documentation">
           </handler>
           <handler
-                class="org.eclipse.koneki.ldt.ui.internal.handlers.RenameHandler"
+                class="org.eclipse.ldt.ui.internal.handlers.RenameHandler"
                 commandId="org.eclipse.dltk.ui.edit.text.script.rename.element">
              <activeWhen>
                 <and>
@@ -162,7 +162,7 @@
                    <with
                          variable="activeEditorId">
                       <equals
-                            value="org.eclipse.koneki.ldt.ui.editor">
+                            value="org.eclipse.ldt.ui.editor">
                       </equals>
                    </with>
                 </and>
@@ -174,7 +174,7 @@
           <menuContribution
                 locationURI="popup:org.eclipse.ui.popup.any?before=org.eclipse.dltk.ui.source.menu">
              <command
-                   commandId="org.eclipse.koneki.ldt.ui.buildpathcontainer.documentation"
+                   commandId="org.eclipse.ldt.ui.buildpathcontainer.documentation"
                    label="%handler.documentation.label"
                    style="push">
                 <visibleWhen>
@@ -185,7 +185,7 @@
                       </count>
                       <iterate>
                          <test
-                               property="org.eclipse.koneki.ldt.ui.namespace.containsLuaExecutionEnvironmentContainer"
+                               property="org.eclipse.ldt.ui.namespace.containsLuaExecutionEnvironmentContainer"
                                value="TRUE">
                          </test>
                       </iterate>
@@ -213,9 +213,9 @@
        <extension
              point="org.eclipse.core.expressions.propertyTesters">
           <propertyTester
-                class="org.eclipse.koneki.ldt.ui.internal.propertytesters.LuaExecutionEnvironmentContainerPropertyTester"
-                id="org.eclipse.koneki.ldt.ui.documentation.propertytestter"
-                namespace="org.eclipse.koneki.ldt.ui.namespace"
+                class="org.eclipse.ldt.ui.internal.propertytesters.LuaExecutionEnvironmentContainerPropertyTester"
+                id="org.eclipse.ldt.ui.documentation.propertytestter"
+                namespace="org.eclipse.ldt.ui.namespace"
                 properties="containsLuaExecutionEnvironmentContainer"
                 type="org.eclipse.dltk.internal.ui.scriptview.BuildPathContainer">
           </propertyTester>
@@ -223,87 +223,87 @@
           <extension
          point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.koneki.ldt.category"
+            id="org.eclipse.ldt.category"
             name="%category.name">
       </category>
       <wizard
-            category="org.eclipse.koneki.ldt.category"
-            class="org.eclipse.koneki.ldt.ui.wizards.LuaProjectWizard:org.eclipse.koneki.ldt.nature"
-            finalPerspective="org.eclipse.koneki.ldt.ui.luaperspective"
+            category="org.eclipse.ldt.category"
+            class="org.eclipse.ldt.ui.wizards.LuaProjectWizard:org.eclipse.ldt.nature"
+            finalPerspective="org.eclipse.ldt.ui.luaperspective"
             icon="icons/obj16/lua_newprj_wiz.gif"
-            id="org.eclipse.koneki.ldt.wizard"
+            id="org.eclipse.ldt.wizard"
             name="%wizard.name"
             project="true">
       </wizard>
       <wizard
-            category="org.eclipse.koneki.ldt.category"
-            class="org.eclipse.koneki.ldt.ui.wizards.LuaNewFileWizard"
-            finalPerspective="org.eclipse.koneki.ldt.ui.luaperspective"
+            category="org.eclipse.ldt.category"
+            class="org.eclipse.ldt.ui.wizards.LuaNewFileWizard"
+            finalPerspective="org.eclipse.ldt.ui.luaperspective"
             icon="icons/obj16/lua_file_plus.png"
-            id="org.eclipse.koneki.ldt.wizard.file"
+            id="org.eclipse.ldt.wizard.file"
             name="%wizard.file.new.name">
       </wizard>
       <wizard
-            category="org.eclipse.koneki.ldt.category"
-            class="org.eclipse.koneki.ldt.ui.wizards.DocLuaNewFileWizard"
-            finalPerspective="org.eclipse.koneki.ldt.ui.luaperspective"
+            category="org.eclipse.ldt.category"
+            class="org.eclipse.ldt.ui.wizards.DocLuaNewFileWizard"
+            finalPerspective="org.eclipse.ldt.ui.luaperspective"
             icon="icons/obj16/doclua_file_plus.png"
-            id="org.eclipse.koneki.ldt.wizard.docfile"
+            id="org.eclipse.ldt.wizard.docfile"
             name="%wizard.docfile.new.name">
       </wizard>
    </extension>
    <extension
          point="org.eclipse.ui.perspectiveExtensions">
       <perspectiveExtension
-            targetID="org.eclipse.koneki.ldt.ui.luaperspective">
+            targetID="org.eclipse.ldt.ui.luaperspective">
          <newWizardShortcut
-               id="org.eclipse.koneki.ldt.wizard">
+               id="org.eclipse.ldt.wizard">
          </newWizardShortcut>
          <newWizardShortcut
-               id="org.eclipse.koneki.ldt.wizard.file">
+               id="org.eclipse.ldt.wizard.file">
          </newWizardShortcut>
          <newWizardShortcut
-               id="org.eclipse.koneki.ldt.wizard.docfile">
+               id="org.eclipse.ldt.wizard.docfile">
          </newWizardShortcut>
       </perspectiveExtension>
    </extension>
     <extension
          point="org.eclipse.ui.editors">
       <editor
-            class="org.eclipse.koneki.ldt.ui.internal.editor.LuaEditor"
+            class="org.eclipse.ldt.ui.internal.editor.LuaEditor"
             contributorClass="org.eclipse.dltk.internal.ui.editor.SourceModuleEditorActionContributor"
             default="false"
             extensions="lua"
             icon="icons/obj16/lua-logo.gif"
-            id="org.eclipse.koneki.ldt.ui.editor"
+            id="org.eclipse.ldt.ui.editor"
             name="%editor.name">
          <contentTypeBinding
-               contentTypeId="org.eclipse.koneki.ldt.content-type">
+               contentTypeId="org.eclipse.ldt.content-type">
          </contentTypeBinding>
       </editor>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.eclipse.koneki.ldt.ui.internal.LuaPreferenceInitializer">
+            class="org.eclipse.ldt.ui.internal.LuaPreferenceInitializer">
       </initializer>
       <initializer
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaFormatterPreferenceInitializer">
+            class="org.eclipse.ldt.ui.internal.preferences.LuaFormatterPreferenceInitializer">
       </initializer>
    </extension>
    <extension
          point="org.eclipse.dltk.ui.modelLabelProvider">
       <modelLabelProvider
-            class="org.eclipse.koneki.ldt.ui.internal.editor.navigation.LuaLabelProvider"
-            id="org.eclipse.koneki.ldt.editor.modelLabelProvider"
-            language="org.eclipse.koneki.ldt.nature">
+            class="org.eclipse.ldt.ui.internal.editor.navigation.LuaLabelProvider"
+            id="org.eclipse.ldt.editor.modelLabelProvider"
+            language="org.eclipse.ldt.nature">
       </modelLabelProvider>
    </extension>
  <extension
          point="org.eclipse.dltk.core.completionEngine">
       <completionEngine
-            class="org.eclipse.koneki.ldt.ui.internal.editor.completion.LuaCompletionEngine"
-            nature="org.eclipse.koneki.ldt.nature"
+            class="org.eclipse.ldt.ui.internal.editor.completion.LuaCompletionEngine"
+            nature="org.eclipse.ldt.nature"
             priority="0">
       </completionEngine>
    </extension>
@@ -314,8 +314,8 @@
       <scriptCompletionProposalComputer
             activate="true"
             categoryId="org.eclipse.dltk.ui.scriptTypeProposalCategory"
-            class="org.eclipse.koneki.ldt.ui.internal.editor.completion.LuaCompletionProposalComputer"
-            toolkitId="org.eclipse.koneki.ldt.nature">
+            class="org.eclipse.ldt.ui.internal.editor.completion.LuaCompletionProposalComputer"
+            toolkitId="org.eclipse.ldt.nature">
          <partition
                type="__dftl_partition_content_type">
          </partition>
@@ -326,9 +326,9 @@
        name="%proposals.luaDocumentor.name"
        point="org.eclipse.dltk.ui.scriptCompletionProposalComputer">
     <scriptCompletionProposalComputer
-          categoryId="org.eclipse.koneki.ldt.ui.luaDocumentorProposalCategory"
-          class="org.eclipse.koneki.ldt.ui.internal.editor.completion.LuaDocumentorCompletionProposalComputer"
-          toolkitId="org.eclipse.koneki.ldt.nature">
+          categoryId="org.eclipse.ldt.ui.luaDocumentorProposalCategory"
+          class="org.eclipse.ldt.ui.internal.editor.completion.LuaDocumentorCompletionProposalComputer"
+          toolkitId="org.eclipse.ldt.nature">
        <partition
              type="__lua_doc">
        </partition>
@@ -343,7 +343,7 @@
    <extension
          point="org.eclipse.ui.editors.templates">
       <contextType
-            class="org.eclipse.koneki.ldt.ui.internal.editor.templates.LuaUniversalTemplateContextType"
+            class="org.eclipse.ldt.ui.internal.editor.templates.LuaUniversalTemplateContextType"
             id="LuaUniversalTemplateContextType"
             name="%templates.context.lua">
       </contextType>
@@ -352,7 +352,7 @@
           translations="templates/templates.properties">
        </include>
     <contextType
-          class="org.eclipse.koneki.ldt.ui.internal.editor.templates.LuaDocumentorTemplateContextType"
+          class="org.eclipse.ldt.ui.internal.editor.templates.LuaDocumentorTemplateContextType"
           id="LuaDocumentorTemplateContextType"
           name="%templates.context.luaDocumentor">
     </contextType>
@@ -364,67 +364,67 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            category="org.eclipse.koneki.ldt.editor.preferences"
-            class="org.eclipse.koneki.ldt.ui.internal.editor.templates.LuaTemplatePreferencePage"
-            id="org.eclipse.koneki.ldt.templates.Template"
+            category="org.eclipse.ldt.editor.preferences"
+            class="org.eclipse.ldt.ui.internal.editor.templates.LuaTemplatePreferencePage"
+            id="org.eclipse.ldt.templates.Template"
             name="%preference.templates.name">
       </page>
       <page
-            category="org.eclipse.koneki.ldt.ui.globalpreferencepage"
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaFormatterPreferencePage"
-            id="org.eclipse.koneki.ldt.formatter.preferences"
+            category="org.eclipse.ldt.ui.globalpreferencepage"
+            class="org.eclipse.ldt.ui.internal.preferences.LuaFormatterPreferencePage"
+            id="org.eclipse.ldt.formatter.preferences"
             name="%preference.formatter.name">
       </page>
       <page
-            category="org.eclipse.koneki.ldt.editor.preferences"
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaSmartTypingPreferencePage"
-            id="org.eclipse.koneki.ldt.typing.preferences"
+            category="org.eclipse.ldt.editor.preferences"
+            class="org.eclipse.ldt.ui.internal.preferences.LuaSmartTypingPreferencePage"
+            id="org.eclipse.ldt.typing.preferences"
             name="%preference.typing.name">
       </page>
 	  <page
-          category="org.eclipse.koneki.ldt.editor.preferences"
-          class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaFoldingPreferencePage"
-          id="org.eclipse.koneki.ldt.typing.folding"
+          category="org.eclipse.ldt.editor.preferences"
+          class="org.eclipse.ldt.ui.internal.preferences.LuaFoldingPreferencePage"
+          id="org.eclipse.ldt.typing.folding"
           name="%preference.folding.name"/>
 	      <page
-            category="org.eclipse.koneki.ldt.ui.globalpreferencepage"
-	        class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaEditorPreferencePage"
-            id="org.eclipse.koneki.ldt.editor.preferences"
+            category="org.eclipse.ldt.ui.globalpreferencepage"
+	        class="org.eclipse.ldt.ui.internal.preferences.LuaEditorPreferencePage"
+            id="org.eclipse.ldt.editor.preferences"
 	        name="%preference.editor.name"/>
 	  <page
-            category="org.eclipse.koneki.ldt.editor.preferences"
-	        class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaEditorSyntaxColoringPreferencePage"
-            id="org.eclipse.koneki.ldt.syntaxcoloring.preferences"
+            category="org.eclipse.ldt.editor.preferences"
+	        class="org.eclipse.ldt.ui.internal.preferences.LuaEditorSyntaxColoringPreferencePage"
+            id="org.eclipse.ldt.syntaxcoloring.preferences"
 	        name="%preference.syntaxcoloring.name"/>
 	  <page
-            category="org.eclipse.koneki.ldt.editor.preferences"
-	        class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaEditorAssistancePreferencePage"
-            id="org.eclipse.koneki.ldt.codeassistance.preferences"
+            category="org.eclipse.ldt.editor.preferences"
+	        class="org.eclipse.ldt.ui.internal.preferences.LuaEditorAssistancePreferencePage"
+            id="org.eclipse.ldt.codeassistance.preferences"
 	        name="%preference.codeassistance.name"/>
 
    </extension>
    <extension
          point="org.eclipse.dltk.ui.language">
       <language
-            class="org.eclipse.koneki.ldt.ui.internal.LuaUILanguageToolkit"
-            nature="org.eclipse.koneki.ldt.nature"
+            class="org.eclipse.ldt.ui.internal.LuaUILanguageToolkit"
+            nature="org.eclipse.ldt.nature"
             priority="0">
       </language>
    </extension>
    <extension
          point="org.eclipse.dltk.ui.completion">
       <proposalLabelProvider
-            class="org.eclipse.koneki.ldt.ui.internal.editor.completion.LuaCompletionProposalLabelProvide"
-            nature="org.eclipse.koneki.ldt.nature">
+            class="org.eclipse.ldt.ui.internal.editor.completion.LuaCompletionProposalLabelProvide"
+            nature="org.eclipse.ldt.nature">
       </proposalLabelProvider>
    </extension>
    <extension
          point="org.eclipse.dltk.ui.formatterFactory">
       <engineContribution
-            natureId="org.eclipse.koneki.ldt.nature">
+            natureId="org.eclipse.ldt.nature">
          <formatterFactory
-               class="org.eclipse.koneki.ldt.ui.internal.editor.formatter.LuaFormatterFactory"
-               id="org.eclipse.koneki.ldt.editor.LuaFormatterFactory"
+               class="org.eclipse.ldt.ui.internal.editor.formatter.LuaFormatterFactory"
+               id="org.eclipse.ldt.editor.LuaFormatterFactory"
                priority="10">
          </formatterFactory>
       </engineContribution>
@@ -432,13 +432,13 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            category="org.eclipse.koneki.ldt.ui.lua.page"
-            class="org.eclipse.koneki.ldt.ui.internal.preferences.LuaFormatterPreferencePage"
-            id="org.eclipse.koneki.ldt.editor.propertyPage.formatter"
+            category="org.eclipse.ldt.ui.lua.page"
+            class="org.eclipse.ldt.ui.internal.preferences.LuaFormatterPreferencePage"
+            id="org.eclipse.ldt.editor.propertyPage.formatter"
             name="%preference.formatter.name">
 		<enabledWhen>
 			<adapt type="org.eclipse.core.resources.IProject">
-				<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.koneki.ldt.nature"/>
+				<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.ldt.nature"/>
 			</adapt>
 		</enabledWhen>
       </page>
@@ -448,7 +448,7 @@
       <actionSetPartAssociation
             targetID="org.eclipse.ui.edit.text.actionSet.presentation">
          <part
-               id="org.eclipse.koneki.ldt.ui.editor">
+               id="org.eclipse.ldt.ui.editor">
          </part>
       </actionSetPartAssociation>
    </extension>
@@ -463,42 +463,42 @@
    </extension>
    <extension point="org.eclipse.dltk.ui.highlighting">
    <highlighter
-      class="org.eclipse.koneki.ldt.ui.internal.editor.text.LuaSemanticUpdateWorker"
-      nature="org.eclipse.koneki.ldt.nature">
+      class="org.eclipse.ldt.ui.internal.editor.text.LuaSemanticUpdateWorker"
+      nature="org.eclipse.ldt.nature">
    </highlighter>
   </extension>
 <extension point="org.eclipse.dltk.ui.folding">
   <structureProvider
-   	nature="org.eclipse.koneki.ldt.nature"
+   	nature="org.eclipse.ldt.nature"
    	class="org.eclipse.dltk.ui.text.folding.DelegatingFoldingStructureProvider">
   </structureProvider>
   <blockProvider
-    nature="org.eclipse.koneki.ldt.nature"
-    class="org.eclipse.koneki.ldt.ui.internal.editor.text.folding.LuaCommentFoldingBlockProvider">
+    nature="org.eclipse.ldt.nature"
+    class="org.eclipse.ldt.ui.internal.editor.text.folding.LuaCommentFoldingBlockProvider">
   </blockProvider>
   <blockProvider
-    nature="org.eclipse.koneki.ldt.nature"
-    class="org.eclipse.koneki.ldt.ui.internal.editor.text.folding.LuaCodeFoldingBlockProvider">
+    nature="org.eclipse.ldt.nature"
+    class="org.eclipse.ldt.ui.internal.editor.text.folding.LuaCodeFoldingBlockProvider">
   </blockProvider>
 </extension>
 <extension
       point="org.eclipse.ui.themes">
    <colorDefinition
-         categoryId="org.eclipse.koneki.ldt.ui.theme"
-         id="org.eclipse.koneki.ldt.ui.docforeground"
+         categoryId="org.eclipse.ldt.ui.theme"
+         id="org.eclipse.ldt.ui.docforeground"
          isEditable="true"
          label="%theme.docforeground"
          value="COLOR_INFO_FOREGROUND">
    </colorDefinition>
    <colorDefinition
-         categoryId="org.eclipse.koneki.ldt.ui.theme"
-         id="org.eclipse.koneki.ldt.ui.docbackground"
+         categoryId="org.eclipse.ldt.ui.theme"
+         id="org.eclipse.ldt.ui.docbackground"
          isEditable="true"
          label="%theme.docbackground"
          value="COLOR_INFO_BACKGROUND">
    </colorDefinition>
    <themeElementCategory
-         id="org.eclipse.koneki.ldt.ui.theme"
+         id="org.eclipse.ldt.ui.theme"
          label="%theme.ldtcategoryname">
    </themeElementCategory>
 </extension>
@@ -508,35 +508,35 @@
    <extension point="org.eclipse.compare.contentMergeViewers">
       <viewer
             extensions="lua"
-            class="org.eclipse.koneki.ldt.ui.internal.compare.LuaMergeViewerCreator"
-            id="org.eclipse.koneki.ldt.ui.internal.compare.LuaMergeViewer">
+            class="org.eclipse.ldt.ui.internal.compare.LuaMergeViewerCreator"
+            id="org.eclipse.ldt.ui.internal.compare.LuaMergeViewer">
       </viewer>
       <contentTypeBinding
-			contentTypeId="org.eclipse.koneki.ldt.content-type"
-            contentMergeViewerId="org.eclipse.koneki.ldt.ui.internal.compare.LuaMergeViewer">
+			contentTypeId="org.eclipse.ldt.content-type"
+            contentMergeViewerId="org.eclipse.ldt.ui.internal.compare.LuaMergeViewer">
 	  </contentTypeBinding>
    </extension>
    <extension
          point="org.eclipse.dltk.ui.correctionProcessor">
       <correctionProcessor
-            class="org.eclipse.koneki.ldt.ui.internal.editor.quickfix.LuaScriptCorrectionProcessor"
-            nature="org.eclipse.koneki.ldt.nature">
+            class="org.eclipse.ldt.ui.internal.editor.quickfix.LuaScriptCorrectionProcessor"
+            nature="org.eclipse.ldt.nature">
       </correctionProcessor>
    </extension>
    <extension
          point="org.eclipse.dltk.ui.editorTextHovers">
       <hover
             activate="true"
-            class="org.eclipse.koneki.ldt.ui.internal.editor.text.LuaDocumentationHover"
-            id="org.eclipse.koneki.ldt.ui.documentationhover"
-            nature="org.eclipse.koneki.ldt.nature">
+            class="org.eclipse.ldt.ui.internal.editor.text.LuaDocumentationHover"
+            id="org.eclipse.ldt.ui.documentationhover"
+            nature="org.eclipse.ldt.nature">
       </hover>
    </extension>
    <extension
          point="org.eclipse.ui.decorators">
       <decorator
-            class="org.eclipse.koneki.ldt.ui.internal.DocLuaDecorator"
-            id="org.eclipse.koneki.ldt.ui.docluadecorator"
+            class="org.eclipse.ldt.ui.internal.DocLuaDecorator"
+            id="org.eclipse.ldt.ui.docluadecorator"
             label="%decorator.label.doclua"
             lightweight="true"
             state="true">
diff --git a/plugins/org.eclipse.koneki.ldt.ui/pom.xml b/plugins/org.eclipse.ldt.ui/pom.xml
index 1a77001..543f173 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/pom.xml
+++ b/plugins/org.eclipse.ldt.ui/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.ui</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.ui</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.koneki.ldt.ui/resources/css/lua_documentation.css b/plugins/org.eclipse.ldt.ui/resources/css/lua_documentation.css
index f0dbb0e..f0dbb0e 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/resources/css/lua_documentation.css
+++ b/plugins/org.eclipse.ldt.ui/resources/css/lua_documentation.css
diff --git a/plugins/org.eclipse.koneki.ldt.ui/sample/formatter.lua b/plugins/org.eclipse.ldt.ui/sample/formatter.lua
index 9d7a415..9d7a415 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/sample/formatter.lua
+++ b/plugins/org.eclipse.ldt.ui/sample/formatter.lua
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/LuaDialogUtil.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/LuaDialogUtil.java
index feed5d7..d27c60c 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/LuaDialogUtil.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/LuaDialogUtil.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui;

+package org.eclipse.ldt.ui;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -18,7 +18,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.ResourcesPlugin;

 import org.eclipse.jface.window.Window;

-import org.eclipse.koneki.ldt.core.LuaUtils;

+import org.eclipse.ldt.core.LuaUtils;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ElementListSelectionDialog;

 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/LuaExecutionEnvironmentUIManager.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/LuaExecutionEnvironmentUIManager.java
index 0e90a33..43a2c0c 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/LuaExecutionEnvironmentUIManager.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/LuaExecutionEnvironmentUIManager.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui;
+package org.eclipse.ldt.ui;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentManager;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentManager;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.activities.IActivity;
 import org.eclipse.ui.activities.IActivityListener;
@@ -27,11 +27,11 @@ import org.eclipse.ui.activities.IActivityPatternBinding;
  * A class similar to LuaExecutionEnvironmentManager but take in account activities enable/disabled EEs
  * 
  * Only activities with following format of binding pattern are take in account:
- * <code><plugin id>/org.eclipse.koneki.ldt.executionEnvironment.<EE's id>-<EE's version></code>
+ * <code><plugin id>/org.eclipse.ldt.executionEnvironment.<EE's id>-<EE's version></code>
  */
 public final class LuaExecutionEnvironmentUIManager {
 
-	public static final String EE_EXTENTION_POINT_ID = "org.eclipse.koneki.ldt.executionEnvironment"; //$NON-NLS-1$
+	public static final String EE_EXTENTION_POINT_ID = "org.eclipse.ldt.executionEnvironment"; //$NON-NLS-1$
 
 	private LuaExecutionEnvironmentUIManager() {
 	}
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/Messages.java
index 1dc2e1a..7ae0a8f 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui;

+package org.eclipse.ldt.ui;

 

 import org.eclipse.osgi.util.NLS;

 

 // CHECKSTYLE NLS: OFF

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.messages"; //$NON-NLS-1$

 	public static String LuaDialogUtil_message;

 	public static String LuaDialogUtil_selectScript_message;

 	public static String LuaDialogUtil_selectScript_title;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/SWTUtil.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/SWTUtil.java
index 3bd14ea..a95167d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/SWTUtil.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/SWTUtil.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui;

+package org.eclipse.ldt.ui;

 

 import org.eclipse.jface.dialogs.IDialogConstants;

 import org.eclipse.jface.layout.PixelConverter;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/Activator.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/Activator.java
index 0716588..e6e15e0 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/Activator.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/Activator.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal;
+package org.eclipse.ldt.ui.internal;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaTextTools;
+import org.eclipse.ldt.ui.internal.editor.text.LuaTextTools;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -23,10 +23,10 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.ui"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.ldt.ui"; //$NON-NLS-1$
 
 	//
-	public static final String LUA_DOC_VIEWID = "org.eclipse.koneki.ldt.ui.luadoc"; //$NON-NLS-1$
+	public static final String LUA_DOC_VIEWID = "org.eclipse.ldt.ui.luadoc"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/DocLuaDecorator.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/DocLuaDecorator.java
index 165c217..8c5f2e6 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/DocLuaDecorator.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/DocLuaDecorator.java
@@ -1,4 +1,4 @@
-package org.eclipse.koneki.ldt.ui.internal;
+package org.eclipse.ldt.ui.internal;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.dltk.core.ISourceModule;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/ImageConstants.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/ImageConstants.java
index 7bd9b7c..9b70e3a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/ImageConstants.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/ImageConstants.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal;

+package org.eclipse.ldt.ui.internal;

 

 public interface ImageConstants {

 	String LUA_WIZARD_BAN = "icons/wizban/lua_newprj_wiz.png"; //$NON-NLS-1$

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaDocumentationHelper.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaDocumentationHelper.java
index e794e4e..57ddb37 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaDocumentationHelper.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaDocumentationHelper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal;
+package org.eclipse.ldt.ui.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,8 +30,8 @@ import org.osgi.framework.Bundle;
 
 public final class LuaDocumentationHelper {
 
-	public static final String BACKGROUND_COLOR_ID = "org.eclipse.koneki.ldt.ui.docbackground"; //$NON-NLS-1$
-	public static final String FOREGROUND_COLOR_ID = "org.eclipse.koneki.ldt.ui.docforeground"; //$NON-NLS-1$
+	public static final String BACKGROUND_COLOR_ID = "org.eclipse.ldt.ui.docbackground"; //$NON-NLS-1$
+	public static final String FOREGROUND_COLOR_ID = "org.eclipse.ldt.ui.docforeground"; //$NON-NLS-1$
 
 	private static final String CSS_FILE_PATH = "/resources/css/lua_documentation.css"; //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaPerspectiveFactory.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaPerspectiveFactory.java
index ef15a3d..4e9de1a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaPerspectiveFactory.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaPerspectiveFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal;

+package org.eclipse.ldt.ui.internal;

 

 import org.eclipse.ui.IFolderLayout;

 import org.eclipse.ui.IPageLayout;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaPreferenceInitializer.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaPreferenceInitializer.java
index 7adafc7..b170cd3 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaPreferenceInitializer.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaPreferenceInitializer.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal;
+package org.eclipse.ldt.ui.internal;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.dltk.compiler.task.TaskTagUtils;
@@ -18,7 +18,7 @@ import org.eclipse.dltk.ui.PreferenceConstants;
 import org.eclipse.dltk.ui.editor.highlighting.SemanticHighlightingUtils;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaColorConstants;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaColorConstants;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.ui.editors.text.EditorsUI;
 
@@ -67,7 +67,7 @@ public class LuaPreferenceInitializer extends AbstractPreferenceInitializer {
 		// Content-assist related preferences
 		store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS, ".:"); //$NON-NLS-1$
 
-		TaskTagUtils.initializeDefaultValues(org.eclipse.koneki.ldt.core.internal.Activator.getDefault().getPluginPreferences());
+		TaskTagUtils.initializeDefaultValues(org.eclipse.ldt.core.internal.Activator.getDefault().getPluginPreferences());
 
 		// Semantic highlighting preferences initialization
 		SemanticHighlightingUtils.initializeDefaultValues(store, Activator.getDefault().getTextTools().getSemanticHighlightings());
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaUILanguageToolkit.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaUILanguageToolkit.java
index acfccf0..bbe2762 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/LuaUILanguageToolkit.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/LuaUILanguageToolkit.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal;
+package org.eclipse.ldt.ui.internal;
 
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
 import org.eclipse.dltk.ui.AbstractDLTKUILanguageToolkit;
 import org.eclipse.dltk.ui.text.ScriptSourceViewerConfiguration;
 import org.eclipse.dltk.ui.text.ScriptTextTools;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
-import org.eclipse.koneki.ldt.ui.internal.editor.LuaEditor;
-import org.eclipse.koneki.ldt.ui.internal.editor.templates.SimpleLuaSourceViewerConfiguration;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.ui.internal.editor.LuaEditor;
+import org.eclipse.ldt.ui.internal.editor.templates.SimpleLuaSourceViewerConfiguration;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
 
 public class LuaUILanguageToolkit extends AbstractDLTKUILanguageToolkit {
 
@@ -54,6 +54,6 @@ public class LuaUILanguageToolkit extends AbstractDLTKUILanguageToolkit {
 
 	@Override
 	public String getInterpreterPreferencePage() {
-		return "org.eclipse.koneki.ldt.debug.ui.interpreters"; //$NON-NLS-1$
+		return "org.eclipse.ldt.debug.ui.interpreters"; //$NON-NLS-1$
 	}
 }
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/LuaExecutionEnvironmentContentProvider.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/LuaExecutionEnvironmentContentProvider.java
index b7f078a..bc37951 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/LuaExecutionEnvironmentContentProvider.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/LuaExecutionEnvironmentContentProvider.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.buildpath;

+package org.eclipse.ldt.ui.internal.buildpath;

 

 import java.util.Arrays;

 import java.util.List;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/LuaExecutionEnvironmentLabelProvider.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/LuaExecutionEnvironmentLabelProvider.java
index 2001416..a5387e4 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/LuaExecutionEnvironmentLabelProvider.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/LuaExecutionEnvironmentLabelProvider.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.buildpath;

+package org.eclipse.ldt.ui.internal.buildpath;

 

 import org.eclipse.dltk.ui.DLTKPluginImages;

 import org.eclipse.jface.resource.JFaceResources;

@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;

 import org.eclipse.jface.viewers.StyledString;

 import org.eclipse.jface.viewers.StyledString.Styler;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.StyleRange;

 import org.eclipse.swt.graphics.Font;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/LuaExecutionEnvironmentWizardPage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/LuaExecutionEnvironmentWizardPage.java
index dc7a8c5..a961fb7 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/LuaExecutionEnvironmentWizardPage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/LuaExecutionEnvironmentWizardPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.buildpath;
+package org.eclipse.ldt.ui.internal.buildpath;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,12 +32,12 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;
-import org.eclipse.koneki.ldt.ui.LuaExecutionEnvironmentUIManager;
-import org.eclipse.koneki.ldt.ui.SWTUtil;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;
+import org.eclipse.ldt.ui.LuaExecutionEnvironmentUIManager;
+import org.eclipse.ldt.ui.SWTUtil;
+import org.eclipse.ldt.ui.internal.Activator;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/Messages.java
index 44c395c..9cd28e7 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.buildpath;
+package org.eclipse.ldt.ui.internal.buildpath;
 
 import org.eclipse.osgi.util.NLS;
 
 public final class Messages extends NLS {
 	// CHECKSTYLE NLS: OFF
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.buildpath.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.buildpath.messages"; //$NON-NLS-1$
 	public static String LuaExecutionEnvironmentLabelProvider_embedded_string;
 	public static String LuaExecutionEnvironmentWizardPage_warning_several_ee;
 	public static String LuaExecutionEnvironmentWizardPageConfigureButtonLabel;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/messages.properties
index e57962c..e57962c 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/buildpath/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/buildpath/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/compare/LuaMergeViewer.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/compare/LuaMergeViewer.java
index 273ade9..1a04c3d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/compare/LuaMergeViewer.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/compare/LuaMergeViewer.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.compare;
+package org.eclipse.ldt.ui.internal.compare;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.dltk.ui.compare.ScriptMergeViewer;
-import org.eclipse.koneki.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaNature;
 import org.eclipse.swt.widgets.Composite;
 
 public class LuaMergeViewer extends ScriptMergeViewer {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/compare/LuaMergeViewerCreator.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/compare/LuaMergeViewerCreator.java
index 12a6780..f83f3a9 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/compare/LuaMergeViewerCreator.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/compare/LuaMergeViewerCreator.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.compare;

+package org.eclipse.ldt.ui.internal.compare;

 

 import org.eclipse.compare.CompareConfiguration;

 import org.eclipse.compare.IViewerCreator;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/documentation/LuaDocumentationProvider.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/documentation/LuaDocumentationProvider.java
index 8803083..0b9c35b 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/documentation/LuaDocumentationProvider.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/documentation/LuaDocumentationProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.documentation;
+package org.eclipse.ldt.ui.internal.documentation;
 
 import java.io.Reader;
 import java.io.StringReader;
@@ -25,11 +25,11 @@ import org.eclipse.dltk.ui.documentation.IScriptDocumentationProvider;
 import org.eclipse.dltk.ui.documentation.IScriptDocumentationProviderExtension;
 import org.eclipse.dltk.ui.documentation.IScriptDocumentationProviderExtension2;
 import org.eclipse.dltk.ui.documentation.TextDocumentationResponse;
-import org.eclipse.koneki.ldt.core.internal.Activator;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTModelUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaDLTKModelUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.IDocumentationHolder;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTModelUtils;
+import org.eclipse.ldt.core.internal.ast.models.LuaDLTKModelUtils;
+import org.eclipse.ldt.core.internal.ast.models.common.IDocumentationHolder;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
 
 /**
  * In charge to find the documentation for a given "lua element" Use to feed Luadoc view and tooltip in LuaEditor
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/LuaDocumentorTags.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/LuaDocumentorTags.java
index 261a82a..920190a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/LuaDocumentorTags.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/LuaDocumentorTags.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor;
+package org.eclipse.ldt.ui.internal.editor;
 
 public final class LuaDocumentorTags {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/LuaEditor.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/LuaEditor.java
index 26e744e..9e4adf3 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/LuaEditor.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/LuaEditor.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.editor;
+package org.eclipse.ldt.ui.internal.editor;
 
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
 import org.eclipse.dltk.core.IModelElement;
@@ -28,13 +28,13 @@ import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
 import org.eclipse.jface.text.source.ICharacterPairMatcher;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.koneki.ldt.core.LuaUtils;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.navigation.LuaOutlinePage;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaBracketInserter;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaTextTools;
+import org.eclipse.ldt.core.LuaUtils;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.navigation.LuaOutlinePage;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.editor.text.LuaBracketInserter;
+import org.eclipse.ldt.ui.internal.editor.text.LuaTextTools;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.texteditor.ChainedPreferenceStore;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/DelegateLuaCompletionProposalMethods.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/DelegateLuaCompletionProposalMethods.java
index eb6a46a..ddb3cab 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/DelegateLuaCompletionProposalMethods.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/DelegateLuaCompletionProposalMethods.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.dltk.ui.text.completion.AbstractScriptCompletionProposal;
-import org.eclipse.koneki.ldt.ui.internal.LuaDocumentationHelper;
+import org.eclipse.ldt.ui.internal.LuaDocumentationHelper;
 
 public final class DelegateLuaCompletionProposalMethods {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionEngine.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionEngine.java
index a9ae66c..47a9bd5 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionEngine.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionEngine.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *     Kevin KIN-FOO <kkinfoo@sierrawireless.com>
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,25 +30,25 @@ import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.core.ModelException;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
-import org.eclipse.koneki.ldt.core.internal.PreferenceInitializer;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTModelUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils.Definition;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils.TypeResolution;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.FunctionTypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Parameter;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.RecordTypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Index;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Invoke;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaHeuristicScanner;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaSymbols;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.core.internal.PreferenceInitializer;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTModelUtils;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils.Definition;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils.TypeResolution;
+import org.eclipse.ldt.core.internal.ast.models.api.FunctionTypeDef;
+import org.eclipse.ldt.core.internal.ast.models.api.Item;
+import org.eclipse.ldt.core.internal.ast.models.api.Parameter;
+import org.eclipse.ldt.core.internal.ast.models.api.RecordTypeDef;
+import org.eclipse.ldt.core.internal.ast.models.api.TypeRef;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;
+import org.eclipse.ldt.core.internal.ast.models.file.Index;
+import org.eclipse.ldt.core.internal.ast.models.file.Invoke;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.text.LuaHeuristicScanner;
+import org.eclipse.ldt.ui.internal.editor.text.LuaSymbols;
 
 public class LuaCompletionEngine extends ScriptCompletionEngine {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProcessor.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProcessor.java
index 717300f..a5b8cce 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProcessor.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProcessor.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProcessor;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.koneki.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaNature;
 import org.eclipse.ui.IEditorPart;
 
 public class LuaCompletionProcessor extends ScriptCompletionProcessor {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposal.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposal.java
index b8e558e..f960563 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposal.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposal.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.dltk.ui.PreferenceConstants;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposal;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 import org.eclipse.swt.graphics.Image;
 
 public class LuaCompletionProposal extends ScriptCompletionProposal {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposalCollector.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposalCollector.java
index 9e66d54..0028afe 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposalCollector.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposalCollector.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.dltk.core.CompletionProposal;
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.ui.text.completion.IScriptCompletionProposal;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposal;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalCollector;
-import org.eclipse.koneki.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaNature;
 import org.eclipse.swt.graphics.Image;
 
 public class LuaCompletionProposalCollector extends ScriptCompletionProposalCollector {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposalComputer.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposalComputer.java
index df819e8..56165d7 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposalComputer.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposalComputer.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalCollector;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalComputer;
 import org.eclipse.dltk.ui.text.completion.ScriptContentAssistInvocationContext;
 import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
-import org.eclipse.koneki.ldt.ui.internal.editor.templates.LuaTemplateCompletionProcessor;
+import org.eclipse.ldt.ui.internal.editor.templates.LuaTemplateCompletionProcessor;
 
 public class LuaCompletionProposalComputer extends ScriptCompletionProposalComputer {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposalLabelProvide.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposalLabelProvide.java
index 690f49f..cf9fdb8 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaCompletionProposalLabelProvide.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaCompletionProposalLabelProvide.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.dltk.core.CompletionProposal;
 import org.eclipse.dltk.core.IField;
@@ -20,10 +20,10 @@ import org.eclipse.dltk.core.IType;
 import org.eclipse.dltk.core.ModelException;
 import org.eclipse.dltk.ui.text.completion.CompletionProposalLabelProvider;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaDLTKModelUtils;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.ImageConstants;
-import org.eclipse.koneki.ldt.ui.internal.editor.navigation.Messages;
+import org.eclipse.ldt.core.internal.ast.models.LuaDLTKModelUtils;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.ImageConstants;
+import org.eclipse.ldt.ui.internal.editor.navigation.Messages;
 
 //TODO factorize some code with LuaLabelProvider
 public class LuaCompletionProposalLabelProvide extends CompletionProposalLabelProvider {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaContentAssistPreference.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaContentAssistPreference.java
index 1758338..a421d19 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaContentAssistPreference.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaContentAssistPreference.java
@@ -9,11 +9,11 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.dltk.ui.text.ScriptTextTools;
 import org.eclipse.dltk.ui.text.completion.ContentAssistPreference;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 
 public class LuaContentAssistPreference extends ContentAssistPreference {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaDocumentorCompletionProposalComputer.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaDocumentorCompletionProposalComputer.java
index 1573cec..458c93d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaDocumentorCompletionProposalComputer.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaDocumentorCompletionProposalComputer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,10 +32,10 @@ import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.jface.text.TextUtilities;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.LuaDocumentorTags;
-import org.eclipse.koneki.ldt.ui.internal.editor.templates.LuaDocumentorTemplateCompletionProcessor;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.LuaDocumentorTags;
+import org.eclipse.ldt.ui.internal.editor.templates.LuaDocumentorTemplateCompletionProcessor;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
 
 public class LuaDocumentorCompletionProposalComputer implements IScriptCompletionProposalComputer {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaScriptMethodCompletionProposal.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaScriptMethodCompletionProposal.java
index 0bfdbe8..60b47e2 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/LuaScriptMethodCompletionProposal.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/LuaScriptMethodCompletionProposal.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.dltk.core.CompletionProposal;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/Messages.java
index 90858ac..c69fed3 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.completion;
+package org.eclipse.ldt.ui.internal.editor.completion;
 
 import org.eclipse.osgi.util.NLS;
 
 //CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.editor.completion.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.editor.completion.messages"; //$NON-NLS-1$
 	public static String LuaCompletionEngineProblemProcessingGlobals;
 	static {
 		// initialize resource bundle
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/messages.properties
index 4247740..4247740 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/completion/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/completion/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/LuaFormatter.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/LuaFormatter.java
index aafeaa6..e5fea00 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/LuaFormatter.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/LuaFormatter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.formatter;
+package org.eclipse.ldt.ui.internal.editor.formatter;
 
 import java.util.Map;
 
@@ -20,15 +20,15 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
-import org.eclipse.koneki.ldt.core.internal.formatter.LuaFormatterException;
-import org.eclipse.koneki.ldt.core.internal.formatter.LuaFormatterModule;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.core.internal.formatter.LuaFormatterException;
+import org.eclipse.ldt.core.internal.formatter.LuaFormatterModule;
+import org.eclipse.ldt.ui.internal.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.text.edits.TextEdit;
 
 public class LuaFormatter extends AbstractScriptFormatter {
-	static final String ID = "org.eclipse.koneki.ldt.formatter"; //$NON-NLS-1$
+	static final String ID = "org.eclipse.ldt.formatter"; //$NON-NLS-1$
 	private final TabStyle tabPolicy;
 	private final int tabSize;
 	private final int indentationSize;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/LuaFormatterFactory.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/LuaFormatterFactory.java
index b340349..9d8ccf4 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/LuaFormatterFactory.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/LuaFormatterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.formatter;
+package org.eclipse.ldt.ui.internal.editor.formatter;
 
 import java.io.IOException;
 import java.net.URL;
@@ -21,8 +21,8 @@ import org.eclipse.dltk.ui.formatter.IFormatterModifyDialog;
 import org.eclipse.dltk.ui.formatter.IFormatterModifyDialogOwner;
 import org.eclipse.dltk.ui.formatter.IScriptFormatter;
 import org.eclipse.dltk.ui.preferences.PreferenceKey;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.preferences.LuaFormatterModifyDialog;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.preferences.LuaFormatterModifyDialog;
 
 public class LuaFormatterFactory extends AbstractScriptFormatterFactory {
 	private static final String SAMPLE_FILE_PATH = "/sample/formatter.lua"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/LuaFormatterPreferenceConstants.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/LuaFormatterPreferenceConstants.java
index 07a303b..9d26d65 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/LuaFormatterPreferenceConstants.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/LuaFormatterPreferenceConstants.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.formatter;
+package org.eclipse.ldt.ui.internal.editor.formatter;
 
 import org.eclipse.dltk.ui.CodeFormatterConstants;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/Messages.java
index 57016fb..a5a204b 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.formatter;
+package org.eclipse.ldt.ui.internal.editor.formatter;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.editor.formatter.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.editor.formatter.messages"; //$NON-NLS-1$
 	public static String LuaFormatterErrorWhileFormattingTitle;
 	public static String LuaFormatterFactoryPreviewNotFound;
 	public static String LuaFormatterUnableToFormatSelection;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/messages.properties
index 2dfef6d..2dfef6d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/formatter/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/formatter/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/LuaLabelProvider.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/LuaLabelProvider.java
index 87526f9..3f1ca01 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/LuaLabelProvider.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/LuaLabelProvider.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.navigation;
+package org.eclipse.ldt.ui.internal.editor.navigation;
 
 import org.eclipse.dltk.core.IMember;
 import org.eclipse.dltk.core.IType;
 import org.eclipse.dltk.core.ModelException;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaDLTKModelUtils;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.ImageConstants;
+import org.eclipse.ldt.core.internal.ast.models.LuaDLTKModelUtils;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.ImageConstants;
 import org.eclipse.swt.graphics.Image;
 
 public class LuaLabelProvider extends LabelProvider {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/LuaOutlinePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/LuaOutlinePage.java
index 81eae56..806d524 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/LuaOutlinePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/LuaOutlinePage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Marc-Andre Laperle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.navigation;
+package org.eclipse.ldt.ui.internal.editor.navigation;
 
 import java.util.ArrayList;
 
@@ -25,7 +25,7 @@ import org.eclipse.dltk.ui.viewsupport.MemberFilterAction;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 import org.eclipse.ui.IActionBars;
 
 public class LuaOutlinePage extends ScriptOutlinePage {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/Messages.java
index fd04522..3144455 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.navigation;
+package org.eclipse.ldt.ui.internal.editor.navigation;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.editor.navigation.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.editor.navigation.messages"; //$NON-NLS-1$
 	public static String LuaCompletionProvidersFlags;
 	public static String MemberFilterActionGroup_hide_local_functions_label;
 	public static String MemberFilterActionGroup_hide_local_functions_tooltip;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/messages.properties
index b9e1bda..b9e1bda 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/navigation/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/navigation/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/quickfix/LuaScriptCorrectionProcessor.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/quickfix/LuaScriptCorrectionProcessor.java
index 7b952d0..3d55e5b 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/quickfix/LuaScriptCorrectionProcessor.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/quickfix/LuaScriptCorrectionProcessor.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.editor.quickfix;

+package org.eclipse.ldt.ui.internal.editor.quickfix;

 

 import org.eclipse.core.resources.IMarker;

 import org.eclipse.dltk.ui.editor.IScriptAnnotation;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorScriptTemplateContext.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorScriptTemplateContext.java
index 3f1caa8..eaf9156 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorScriptTemplateContext.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorScriptTemplateContext.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.ui.templates.ScriptTemplateContext;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorTemplateCompletionProcessor.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorTemplateCompletionProcessor.java
index 38fc89b..14dce97 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorTemplateCompletionProcessor.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorTemplateCompletionProcessor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.core.DLTKLanguageManager;
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
@@ -26,8 +26,8 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateContext;
 import org.eclipse.jface.window.Window;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.ImageConstants;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.ImageConstants;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.part.IWorkbenchPartOrientation;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorTemplateContextType.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorTemplateContextType.java
index e3c970f..ad0cd82 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorTemplateContextType.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorTemplateContextType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.ui.templates.ScriptTemplateContext;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorTemplateProposal.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorTemplateProposal.java
index b572b37..d3bd553 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaDocumentorTemplateProposal.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaDocumentorTemplateProposal.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.ui.templates.ScriptTemplateProposal;
 import org.eclipse.jface.text.IRegion;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaScriptTemplateVariables.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaScriptTemplateVariables.java
index 7397d26..c9cad94 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaScriptTemplateVariables.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaScriptTemplateVariables.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.ui.templates.IScriptTemplateContext;
 import org.eclipse.jface.text.templates.TemplateContext;
 import org.eclipse.jface.text.templates.TemplateVariableResolver;
-import org.eclipse.koneki.ldt.core.LuaUtils;
+import org.eclipse.ldt.core.LuaUtils;
 
 /**
  * Specific template variables for LUA
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateAccess.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateAccess.java
index 6dccfbc..fec1401 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateAccess.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateAccess.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.ui.templates.ScriptTemplateAccess;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.ui.internal.Activator;
 import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
 
 /**
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateCompletionProcessor.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateCompletionProcessor.java
index 065e47a..86c4b2f 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateCompletionProcessor.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateCompletionProcessor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.core.DLTKLanguageManager;
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateContext.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateContext.java
index a38bde7..5ef6ea2 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateContext.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateContext.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.ui.templates.ScriptTemplateContext;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateInformationControlCreator.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateInformationControlCreator.java
index 12fc6a5..4cc6ce6 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplateInformationControlCreator.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplateInformationControlCreator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
@@ -16,7 +16,7 @@ import org.eclipse.dltk.internal.ui.text.hover.SourceViewerInformationControl;
 import org.eclipse.jface.text.IInformationControl;
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.IInformationControlCreatorExtension;
-import org.eclipse.koneki.ldt.ui.internal.LuaDocumentationHelper;
+import org.eclipse.ldt.ui.internal.LuaDocumentationHelper;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplatePreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplatePreferencePage.java
index 12bf8e4..2aeb5c3 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaTemplatePreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaTemplatePreferencePage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.ui.templates.ScriptTemplateAccess;
 import org.eclipse.dltk.ui.templates.ScriptTemplatePreferencePage;
@@ -16,9 +16,9 @@ import org.eclipse.dltk.ui.text.ScriptSourceViewerConfiguration;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jface.text.templates.Template;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaTextTools;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.editor.text.LuaTextTools;
 
 public class LuaTemplatePreferencePage extends ScriptTemplatePreferencePage {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaUniversalTemplateContextType.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaUniversalTemplateContextType.java
index 24f2914..12d771a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/LuaUniversalTemplateContextType.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/LuaUniversalTemplateContextType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.ui.templates.ScriptTemplateContext;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/Messages.java
index 4b438f5..39ac130 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE:OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.editor.templates.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.editor.templates.messages"; //$NON-NLS-1$
 	public static String LuaScriptTemplateVariables_FullSourceModuleDescription;
 	public static String LuaScriptTemplateVariables_SourceModuleDescription;
 	static {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/SimpleLuaSourceViewerConfiguration.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/SimpleLuaSourceViewerConfiguration.java
index 52d6cdc..1c7b8be 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/SimpleLuaSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/SimpleLuaSourceViewerConfiguration.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.templates;
+package org.eclipse.ldt.ui.internal.editor.templates;
 
 import org.eclipse.dltk.ui.text.IColorManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.formatter.IContentFormatter;
 import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaSourceViewerConfiguration;
+import org.eclipse.ldt.ui.internal.editor.text.LuaSourceViewerConfiguration;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 public class SimpleLuaSourceViewerConfiguration extends LuaSourceViewerConfiguration {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/messages.properties
index cf47c69..cf47c69 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/templates/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/templates/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/ILuaColorConstants.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/ILuaColorConstants.java
index 56e0343..478aa2d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/ILuaColorConstants.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/ILuaColorConstants.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.dltk.ui.text.DLTKColorConstants;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/ILuaPartitions.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/ILuaPartitions.java
index f63d562..28cfabb 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/ILuaPartitions.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/ILuaPartitions.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.jface.text.IDocument;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaBracketInserter.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaBracketInserter.java
index 9f7c3b8..fc98c54 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaBracketInserter.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaBracketInserter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import java.text.MessageFormat;
 
@@ -21,7 +21,7 @@ import org.eclipse.jface.text.BadPositionCategoryException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.koneki.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.internal.Activator;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.graphics.Point;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaCodeScanner.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaCodeScanner.java
index 7e4f2c3..f8daa55 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaCodeScanner.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaCodeScanner.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDocumentationHover.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDocumentationHover.java
index cfc5090..2bff0c1 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDocumentationHover.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDocumentationHover.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import java.io.IOException;
 
@@ -24,7 +24,7 @@ import org.eclipse.dltk.ui.documentation.IScriptDocumentationTitleAdapter;
 import org.eclipse.dltk.ui.documentation.ScriptDocumentationAccess;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.koneki.ldt.ui.internal.LuaDocumentationHelper;
+import org.eclipse.ldt.ui.internal.LuaDocumentationHelper;
 
 @SuppressWarnings("restriction")
 public class LuaDocumentationHover extends DocumentationHover {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDocumentorCommentAutoEditStrategy.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDocumentorCommentAutoEditStrategy.java
index 53d2051..d293bf2 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDocumentorCommentAutoEditStrategy.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDocumentorCommentAutoEditStrategy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -19,7 +19,7 @@ import org.eclipse.jface.text.DocumentCommand;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 
 public class LuaDocumentorCommentAutoEditStrategy extends DefaultIndentLineAutoEditStrategy {
 	private Pattern linePortionToDuplicatePattern = Pattern.compile("(\\s*).*--(\\s*)"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDocumentorScanner.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDocumentorScanner.java
index bb06302..78c3f50 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDocumentorScanner.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDocumentorScanner.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -24,7 +24,7 @@ import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.IWhitespaceDetector;
 import org.eclipse.jface.text.rules.IWordDetector;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.LuaDocumentorTags;
+import org.eclipse.ldt.ui.internal.editor.LuaDocumentorTags;
 
 public class LuaDocumentorScanner extends ScriptCommentScanner {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDoubleClickSelector.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDoubleClickSelector.java
index ffb24d7..db31e11 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaDoubleClickSelector.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaDoubleClickSelector.java
@@ -11,7 +11,7 @@
  *     Anton Leherbauer (Wind River Systems)
  *     Marc-Andre Laperle - Adapted to LDT
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaHeuristicScanner.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaHeuristicScanner.java
index b83a9b2..9a8bff2 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaHeuristicScanner.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaHeuristicScanner.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.editor.text;

+package org.eclipse.ldt.ui.internal.editor.text;

 

 import java.util.Arrays;

 

@@ -19,13 +19,13 @@ import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITypedRegion;

 import org.eclipse.jface.text.TextUtilities;

 import org.eclipse.jface.text.TypedRegion;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.UnknownItem;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Call;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Index;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Invoke;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;

+import org.eclipse.ldt.core.internal.ast.models.api.Item;

+import org.eclipse.ldt.core.internal.ast.models.api.UnknownItem;

+import org.eclipse.ldt.core.internal.ast.models.file.Call;

+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;

+import org.eclipse.ldt.core.internal.ast.models.file.Index;

+import org.eclipse.ldt.core.internal.ast.models.file.Invoke;

+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;

 

 /**

  * Utility methods for heuristic based Lua manipulations in an incomplete Lua source file.

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaHoverControlCreator.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaHoverControlCreator.java
index 503b9f0..e773133 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaHoverControlCreator.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaHoverControlCreator.java
@@ -5,7 +5,7 @@
  * Contributors: Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.dltk.ui.DLTKUIPlugin;
 import org.eclipse.dltk.ui.PreferenceConstants;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaPartitionScanner.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaPartitionScanner.java
index 29ed9e8..920a824 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaPartitionScanner.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaPartitionScanner.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,11 +20,11 @@ import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
 import org.eclipse.jface.text.rules.SingleLineRule;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaDocMultLineCommentRule;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaDocSingleCommentSeriesRule;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaMultLineCommentRule;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaMultLineStringRule;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaDocMultLineCommentRule;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaDocSingleCommentSeriesRule;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaMultLineCommentRule;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaMultLineStringRule;
 
 /**
  * Defines rules to follow in order to highlight source code in editor
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSemanticHighlighting.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSemanticHighlighting.java
index d953b00..d4341cc 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSemanticHighlighting.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSemanticHighlighting.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.dltk.ui.editor.highlighting.SemanticHighlighting;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSemanticUpdateWorker.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSemanticUpdateWorker.java
index 2c5bf55..2f526b1 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSemanticUpdateWorker.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSemanticUpdateWorker.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import java.text.MessageFormat;
 import java.util.HashSet;
@@ -27,13 +27,13 @@ import org.eclipse.dltk.ui.editor.highlighting.ISemanticHighlighter;
 import org.eclipse.dltk.ui.editor.highlighting.ISemanticHighlighterExtension;
 import org.eclipse.dltk.ui.editor.highlighting.ISemanticHighlightingRequestor;
 import org.eclipse.dltk.ui.editor.highlighting.SemanticHighlighting;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils;
+import org.eclipse.ldt.core.internal.ast.models.api.Item;
+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;
+import org.eclipse.ldt.ui.internal.Activator;
 
 public class LuaSemanticUpdateWorker extends ASTVisitor implements ISemanticHighlighter, ISemanticHighlighterExtension {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSourceViewerConfiguration.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSourceViewerConfiguration.java
index d0eb2e2..8d86114 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSourceViewerConfiguration.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *     Marc-André Laperle - bug 369557, 363501
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.dltk.compiler.task.ITodoTaskPreferences;
 import org.eclipse.dltk.ui.text.AbstractScriptScanner;
@@ -32,9 +32,9 @@ import org.eclipse.jface.text.presentation.PresentationReconciler;
 import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.ui.internal.editor.completion.LuaCompletionProcessor;
-import org.eclipse.koneki.ldt.ui.internal.editor.completion.LuaContentAssistPreference;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.ui.internal.editor.completion.LuaCompletionProcessor;
+import org.eclipse.ldt.ui.internal.editor.completion.LuaContentAssistPreference;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 public class LuaSourceViewerConfiguration extends ScriptSourceViewerConfiguration {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSymbols.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSymbols.java
index 44c923b..12f53ff 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaSymbols.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaSymbols.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.editor.text;

+package org.eclipse.ldt.ui.internal.editor.text;

 

 /**

  * Symbols for the heuristic Lua scanner.

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaTextTools.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaTextTools.java
index f799fcb..defab95 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaTextTools.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaTextTools.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.dltk.ui.editor.highlighting.SemanticHighlighting;
 import org.eclipse.dltk.ui.text.ScriptSourceViewerConfiguration;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaWordFinder.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaWordFinder.java
index 37837bf..49c4528 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/LuaWordFinder.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/LuaWordFinder.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Marc-Andre Laperle - Adapted to LDT from DLTK's ScriptWordFinder
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text;
+package org.eclipse.ldt.ui.internal.editor.text;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/folding/LuaCodeFoldingBlockProvider.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/folding/LuaCodeFoldingBlockProvider.java
index 6487c8c..f58f453 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/folding/LuaCodeFoldingBlockProvider.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/folding/LuaCodeFoldingBlockProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text.folding;
+package org.eclipse.ldt.ui.internal.editor.text.folding;
 
 import org.eclipse.dltk.ast.ASTVisitor;
 import org.eclipse.dltk.ast.parser.IModuleDeclaration;
@@ -19,9 +19,9 @@ import org.eclipse.dltk.ui.text.folding.IFoldingBlockProvider;
 import org.eclipse.dltk.ui.text.folding.IFoldingBlockRequestor;
 import org.eclipse.dltk.ui.text.folding.IFoldingContent;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Block;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.Block;
 
 public class LuaCodeFoldingBlockProvider extends ASTVisitor implements IFoldingBlockProvider {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/folding/LuaCommentFoldingBlockProvider.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/folding/LuaCommentFoldingBlockProvider.java
index 46ca2f9..e4316df 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/folding/LuaCommentFoldingBlockProvider.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/folding/LuaCommentFoldingBlockProvider.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text.folding;
+package org.eclipse.ldt.ui.internal.editor.text.folding;
 
 import org.eclipse.dltk.ui.text.folding.IFoldingContent;
 import org.eclipse.dltk.ui.text.folding.PartitioningFoldingBlockProvider;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
 
 public class LuaCommentFoldingBlockProvider extends PartitioningFoldingBlockProvider {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/folding/LuaFoldingBlockKind.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/folding/LuaFoldingBlockKind.java
index 665dae4..dd4f66e 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/folding/LuaFoldingBlockKind.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/folding/LuaFoldingBlockKind.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text.folding;
+package org.eclipse.ldt.ui.internal.editor.text.folding;
 
 import org.eclipse.dltk.ui.text.folding.IFoldingBlockKind;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/messages.properties
index a9588ab..a9588ab 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaDocMultLineCommentRule.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaDocMultLineCommentRule.java
index 171c8bb..6e497d4 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaDocMultLineCommentRule.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaDocMultLineCommentRule.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.editor.text.rules;

+package org.eclipse.ldt.ui.internal.editor.text.rules;

 

 import org.eclipse.jface.text.rules.ICharacterScanner;

 import org.eclipse.jface.text.rules.IToken;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaDocSingleCommentSeriesRule.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaDocSingleCommentSeriesRule.java
index 6af87e8..32cc7a2 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaDocSingleCommentSeriesRule.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaDocSingleCommentSeriesRule.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.editor.text.rules;
+package org.eclipse.ldt.ui.internal.editor.text.rules;
 
 import org.eclipse.jface.text.rules.EndOfLineRule;
 import org.eclipse.jface.text.rules.ICharacterScanner;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaMultLineCommentRule.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaMultLineCommentRule.java
index 53a9a14..ff97952 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaMultLineCommentRule.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaMultLineCommentRule.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.editor.text.rules;

+package org.eclipse.ldt.ui.internal.editor.text.rules;

 

 import org.eclipse.jface.text.rules.ICharacterScanner;

 import org.eclipse.jface.text.rules.IToken;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaMultLineStringRule.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaMultLineStringRule.java
index 6f5b71d..4473c58 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/editor/text/rules/LuaMultLineStringRule.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/editor/text/rules/LuaMultLineStringRule.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.editor.text.rules;

+package org.eclipse.ldt.ui.internal.editor.text.rules;

 

 import org.eclipse.jface.text.rules.ICharacterScanner;

 import org.eclipse.jface.text.rules.IPredicateRule;

 import org.eclipse.jface.text.rules.IToken;

 import org.eclipse.jface.text.rules.Token;

-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaPartitionScanner;

+import org.eclipse.ldt.ui.internal.editor.text.LuaPartitionScanner;

 

 public class LuaMultLineStringRule implements IPredicateRule {

 	// CHECKSTYLE:OFF

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandler.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandler.java
index 7fb60d6..ade2101 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandler.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.handlers;
+package org.eclipse.ldt.ui.internal.handlers;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -22,9 +22,9 @@ import org.eclipse.dltk.core.IBuildpathEntry;
 import org.eclipse.dltk.internal.ui.scriptview.BuildPathContainer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/Messages.java
index 0fbec37..e5d037b 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.handlers;
+package org.eclipse.ldt.ui.internal.handlers;
 
 import org.eclipse.osgi.util.NLS;
 
 public final class Messages extends NLS {
 	// CHECKSTYLE NLS: OFF
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.handlers.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.handlers.messages"; //$NON-NLS-1$
 	public static String LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandlerUnableToDisplay;
 	public static String LuaExecutionEnvironmentBuildpathContainerDocumentationCommandHandlerUnableToFindExecutionEnvironment;
 	static {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/RenameHandler.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/RenameHandler.java
index ba98e66..6f0fdd2 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/RenameHandler.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/RenameHandler.java
@@ -1,4 +1,4 @@
-package org.eclipse.koneki.ldt.ui.internal.handlers;
+package org.eclipse.ldt.ui.internal.handlers;
 
 import java.util.List;
 
@@ -15,14 +15,14 @@ import org.eclipse.jface.text.link.LinkedModeUI;
 import org.eclipse.jface.text.link.LinkedPosition;
 import org.eclipse.jface.text.link.LinkedPositionGroup;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTModelUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.LuaEditor;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTModelUtils;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils;
+import org.eclipse.ldt.core.internal.ast.models.api.Item;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.LuaEditor;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/messages.properties
index ee5c7ca..ee5c7ca 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/handlers/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/handlers/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/GlobalLuaPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/GlobalLuaPreferencePage.java
index 65070f5..ec91659 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/GlobalLuaPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/GlobalLuaPreferencePage.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  ******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
-import org.eclipse.koneki.ldt.core.internal.PreferenceInitializer;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.core.internal.PreferenceInitializer;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaCodeAssistConfigurationBlock.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaCodeAssistConfigurationBlock.java
index ea81251..0e5fb62 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaCodeAssistConfigurationBlock.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaCodeAssistConfigurationBlock.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import java.util.ArrayList;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaCodeFoldingPreferenceBlock.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaCodeFoldingPreferenceBlock.java
index 9163d7c..a7759da 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaCodeFoldingPreferenceBlock.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaCodeFoldingPreferenceBlock.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
 import org.eclipse.dltk.ui.text.folding.SourceCodeFoldingPreferenceBlock;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaCommentFoldingPreferenceBlock.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaCommentFoldingPreferenceBlock.java
index 0e61dbb..8195b0a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaCommentFoldingPreferenceBlock.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaCommentFoldingPreferenceBlock.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.PreferenceConstants;
 import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorAssistancePreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorAssistancePreferencePage.java
index d84e8d2..82b7246 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorAssistancePreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorAssistancePreferencePage.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPreferencePage;
 import org.eclipse.dltk.ui.preferences.IPreferenceConfigurationBlock;
 import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 
 public class LuaEditorAssistancePreferencePage extends AbstractConfigurationBlockPreferencePage {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorColoringConfigurationBlock.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorColoringConfigurationBlock.java
index ba82506..4d40350 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorColoringConfigurationBlock.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorColoringConfigurationBlock.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -30,12 +30,12 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.source.IOverviewRuler;
 import org.eclipse.jface.text.source.IVerticalRuler;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.templates.SimpleLuaSourceViewerConfiguration;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaColorConstants;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaTextTools;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.templates.SimpleLuaSourceViewerConfiguration;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaColorConstants;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.editor.text.LuaTextTools;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.osgi.framework.Version;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorPreferencePage.java
index 600e2e3..4d07b1c 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorPreferencePage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.PreferenceConstants;
 import org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPreferencePage;
@@ -16,7 +16,7 @@ import org.eclipse.dltk.ui.preferences.EditorConfigurationBlock;
 import org.eclipse.dltk.ui.preferences.IPreferenceConfigurationBlock;
 import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
 import org.eclipse.dltk.ui.preferences.PreferencesMessages;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 import org.eclipse.swt.SWT;
 
 public class LuaEditorPreferencePage extends AbstractConfigurationBlockPreferencePage {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorSyntaxColoringPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorSyntaxColoringPreferencePage.java
index f2acf0e..d8b1c4b 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaEditorSyntaxColoringPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaEditorSyntaxColoringPreferencePage.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPreferencePage;
 import org.eclipse.dltk.ui.preferences.IPreferenceConfigurationBlock;
 import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 
 public class LuaEditorSyntaxColoringPreferencePage extends AbstractConfigurationBlockPreferencePage {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaExecutionEnvironmentPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaExecutionEnvironmentPreferencePage.java
index c571d06..3fdc42f 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaExecutionEnvironmentPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaExecutionEnvironmentPreferencePage.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.preferences;

+package org.eclipse.ldt.ui.internal.preferences;

 

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -33,16 +33,16 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;

-import org.eclipse.koneki.ldt.core.internal.PreferenceInitializer;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentManager;

-import org.eclipse.koneki.ldt.ui.LuaExecutionEnvironmentUIManager;

-import org.eclipse.koneki.ldt.ui.SWTUtil;

-import org.eclipse.koneki.ldt.ui.internal.Activator;

-import org.eclipse.koneki.ldt.ui.internal.buildpath.LuaExecutionEnvironmentContentProvider;

-import org.eclipse.koneki.ldt.ui.internal.buildpath.LuaExecutionEnvironmentLabelProvider;

+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;

+import org.eclipse.ldt.core.internal.PreferenceInitializer;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentManager;

+import org.eclipse.ldt.ui.LuaExecutionEnvironmentUIManager;

+import org.eclipse.ldt.ui.SWTUtil;

+import org.eclipse.ldt.ui.internal.Activator;

+import org.eclipse.ldt.ui.internal.buildpath.LuaExecutionEnvironmentContentProvider;

+import org.eclipse.ldt.ui.internal.buildpath.LuaExecutionEnvironmentLabelProvider;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionAdapter;

@@ -64,7 +64,7 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore;
 

 public class LuaExecutionEnvironmentPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {

 

-	private static final String AVAILABLE_EXECUTION_ENVIRONEMENT_URL = "http://wiki.eclipse.org/Koneki/LDT/User_Area/Available_Execution_Environments"; //$NON-NLS-1$

+	private static final String AVAILABLE_EXECUTION_ENVIRONEMENT_URL = "http://wiki.eclipse.org/LDT/User_Area/Available_Execution_Environments"; //$NON-NLS-1$

 

 	private CheckboxTreeViewer eeTreeViewer;

 	private Button removeButton;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFoldingPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFoldingPreferencePage.java
index b3b968c..d39dac5 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFoldingPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFoldingPreferencePage.java
@@ -8,7 +8,7 @@
 
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPreferencePage;
 import org.eclipse.dltk.ui.preferences.IPreferenceConfigurationBlock;
@@ -16,7 +16,7 @@ import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
 import org.eclipse.dltk.ui.text.folding.DefaultFoldingPreferenceConfigurationBlock;
 import org.eclipse.dltk.ui.text.folding.IFoldingPreferenceBlock;
 import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 
 /**
  * Lua editor folding options.
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterIndentationTabPage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterIndentationTabPage.java
index c551826..802bb65 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterIndentationTabPage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterIndentationTabPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import java.net.URL;
 
@@ -17,8 +17,8 @@ import org.eclipse.dltk.ui.formatter.FormatterModifyTabPage;
 import org.eclipse.dltk.ui.formatter.IFormatterControlManager;
 import org.eclipse.dltk.ui.formatter.IFormatterModifyDialog;
 import org.eclipse.dltk.ui.util.SWTFactory;
-import org.eclipse.koneki.ldt.ui.internal.editor.formatter.LuaFormatterFactory;
-import org.eclipse.koneki.ldt.ui.internal.editor.formatter.LuaFormatterPreferenceConstants;
+import org.eclipse.ldt.ui.internal.editor.formatter.LuaFormatterFactory;
+import org.eclipse.ldt.ui.internal.editor.formatter.LuaFormatterPreferenceConstants;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterModifyDialog.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterModifyDialog.java
index 39c6cc0..ef3ed80 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterModifyDialog.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterModifyDialog.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.formatter.FormatterModifyDialog;
 import org.eclipse.dltk.ui.formatter.IFormatterModifyDialogOwner;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterPreferenceInitializer.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterPreferenceInitializer.java
index 54daeab..0706715 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterPreferenceInitializer.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterPreferenceInitializer.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.dltk.compiler.util.Util;
 import org.eclipse.dltk.ui.CodeFormatterConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.formatter.LuaFormatterPreferenceConstants;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.formatter.LuaFormatterPreferenceConstants;
 
 public class LuaFormatterPreferenceInitializer extends AbstractPreferenceInitializer {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterPreferencePage.java
index 3b8b003..30fba15 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaFormatterPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaFormatterPreferencePage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.formatter.AbstractFormatterPreferencePage;
 import org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPreferencePage;
@@ -17,16 +17,16 @@ import org.eclipse.dltk.ui.text.IColorManager;
 import org.eclipse.dltk.ui.text.ScriptSourceViewerConfiguration;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.formatter.LuaFormatterPreferenceConstants;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaSourceViewerConfiguration;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.formatter.LuaFormatterPreferenceConstants;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.editor.text.LuaSourceViewerConfiguration;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 public class LuaFormatterPreferencePage extends AbstractFormatterPreferencePage {
 
-	static final String ID = "org.eclipse.koneki.ldt.formatter.preferences"; //$NON-NLS-1$ 
+	static final String ID = "org.eclipse.ldt.formatter.preferences"; //$NON-NLS-1$ 
 
 	/**
 	 * @see AbstractFormatterPreferencePage#getNatureId()
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaSmartTypingConfigurationBlock.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaSmartTypingConfigurationBlock.java
index c8b8ba5..5fdfdd5 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaSmartTypingConfigurationBlock.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaSmartTypingConfigurationBlock.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import java.util.ArrayList;
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaSmartTypingPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaSmartTypingPreferencePage.java
index 99f699f..0fc5ff2 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaSmartTypingPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaSmartTypingPreferencePage.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPreferencePage;
 import org.eclipse.dltk.ui.preferences.IPreferenceConfigurationBlock;
 import org.eclipse.dltk.ui.preferences.OverlayPreferenceStore;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.Activator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaTodoTaskPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaTodoTaskPreferencePage.java
index 404cf86..024a60a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaTodoTaskPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaTodoTaskPreferencePage.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -17,8 +17,8 @@ import org.eclipse.dltk.ui.preferences.AbstractConfigurationBlockPropertyAndPref
 import org.eclipse.dltk.ui.preferences.AbstractOptionsBlock;
 import org.eclipse.dltk.ui.preferences.TodoTaskOptionsBlock;
 import org.eclipse.dltk.ui.util.IStatusChangeListener;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.core.internal.Activator;
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 
@@ -50,11 +50,11 @@ public class LuaTodoTaskPreferencePage extends AbstractConfigurationBlockPropert
 	}
 
 	protected String getPreferencePageId() {
-		return "org.eclipse.koneki.ldt.ui.todo"; //$NON-NLS-1$
+		return "org.eclipse.ldt.ui.todo"; //$NON-NLS-1$
 	}
 
 	protected String getPropertyPageId() {
-		return "org.eclipse.koneki.ldt.ui.todo.propertyPage"; //$NON-NLS-1$
+		return "org.eclipse.ldt.ui.todo.propertyPage"; //$NON-NLS-1$
 	}
 
 }
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaUserLibraryPreferencePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaUserLibraryPreferencePage.java
index 022515d..7b04d79 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/LuaUserLibraryPreferencePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/LuaUserLibraryPreferencePage.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  ******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
 import org.eclipse.dltk.ui.preferences.UserLibraryPreferencePage;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
 
 public class LuaUserLibraryPreferencePage extends UserLibraryPreferencePage {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/Messages.java
index 705f63e..426489d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.preferences;
+package org.eclipse.ldt.ui.internal.preferences;
 
 import org.eclipse.osgi.util.NLS;
 
 // CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.preferences.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.preferences.messages"; //$NON-NLS-1$
 	public static String GlobalLuaPreferencePage_description;
 	public static String GlobalLuaPreferencePage_use_global_vars;
 	public static String LuaExecutionEnvironmentPreferencePage_addEESupportTitle;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/messages.properties
index 79a4eed..79a4eed 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/preferences/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/preferences/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/properties/LuaBuildPathPropertyPage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/properties/LuaBuildPathPropertyPage.java
index e28acfb..21469d0 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/properties/LuaBuildPathPropertyPage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/properties/LuaBuildPathPropertyPage.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  ******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.properties;
+package org.eclipse.ldt.ui.internal.properties;
 
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
 import org.eclipse.dltk.ui.preferences.BuildPathsPropertyPage;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
 import org.eclipse.ui.IWorkbenchPropertyPage;
 
 public class LuaBuildPathPropertyPage extends BuildPathsPropertyPage implements IWorkbenchPropertyPage {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/properties/LuaPropertyPage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/properties/LuaPropertyPage.java
index 5835d5f..47e211a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/properties/LuaPropertyPage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/properties/LuaPropertyPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  ******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.properties;
+package org.eclipse.ldt.ui.internal.properties;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/propertytesters/LuaExecutionEnvironmentContainerPropertyTester.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/propertytesters/LuaExecutionEnvironmentContainerPropertyTester.java
index 6867972..cb7bd30 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/propertytesters/LuaExecutionEnvironmentContainerPropertyTester.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/propertytesters/LuaExecutionEnvironmentContainerPropertyTester.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  ******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.propertytesters;
+package org.eclipse.ldt.ui.internal.propertytesters;
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.dltk.internal.ui.scriptview.BuildPathContainer;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
 
 @SuppressWarnings("restriction")
 public class LuaExecutionEnvironmentContainerPropertyTester extends PropertyTester {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/search/LuaModelElementOccurrencesFinder.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/search/LuaModelElementOccurrencesFinder.java
index fafaeeb..8f889ef 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/search/LuaModelElementOccurrencesFinder.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/search/LuaModelElementOccurrencesFinder.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  ******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.search;
+package org.eclipse.ldt.ui.internal.search;
 
 import java.util.ArrayList;
 
@@ -16,11 +16,11 @@ import org.eclipse.dltk.ast.declarations.Declaration;
 import org.eclipse.dltk.ast.parser.IModuleDeclaration;
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.ui.search.ModelElementOccurrencesFinder;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils;
+import org.eclipse.ldt.core.internal.ast.models.api.Item;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;
 
 public class LuaModelElementOccurrencesFinder extends ModelElementOccurrencesFinder {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/views/LuaDocView.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/views/LuaDocView.java
index c57006b..03af639 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/views/LuaDocView.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/views/LuaDocView.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.internal.views;
+package org.eclipse.ldt.ui.internal.views;
 
 import java.io.Reader;
 
@@ -19,9 +19,9 @@ import org.eclipse.dltk.internal.ui.text.HTMLPrinter;
 import org.eclipse.dltk.ui.documentation.ScriptDocumentationAccess;
 import org.eclipse.dltk.ui.infoviews.AbstractDocumentationView;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.LuaDocumentationHelper;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.LuaDocumentationHelper;
 import org.eclipse.swt.graphics.Color;
 
 /**
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/views/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/views/Messages.java
index bd6b860..b15d224 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/views/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/views/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.internal.views;

+package org.eclipse.ldt.ui.internal.views;

 

 import org.eclipse.osgi.util.NLS;

 

 // CHECKSTYLE:OFF

 public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.internal.views.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.internal.views.messages"; //$NON-NLS-1$

 	public static String LuaDocView_NoDocumentationFound;

 	static {

 		// initialize resource bundle

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/views/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/views/messages.properties
index f47b222..f47b222 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/internal/views/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/internal/views/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/messages.properties
index 5f5d988..5f5d988 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/DocLuaNewFileWizard.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/DocLuaNewFileWizard.java
index de5f946..99776e8 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/DocLuaNewFileWizard.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/DocLuaNewFileWizard.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards;
+package org.eclipse.ldt.ui.wizards;
 
 import org.eclipse.dltk.ui.wizards.NewSourceModulePage;
 import org.eclipse.dltk.ui.wizards.NewSourceModuleWizard;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.ImageConstants;
-import org.eclipse.koneki.ldt.ui.wizards.pages.DocLuaFilePage;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.ImageConstants;
+import org.eclipse.ldt.ui.wizards.pages.DocLuaFilePage;
 
 /** @since 1.2 */
 public class DocLuaNewFileWizard extends NewSourceModuleWizard {
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/LuaNewFileWizard.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaNewFileWizard.java
index 9fd69cf..b2c7297 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/LuaNewFileWizard.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaNewFileWizard.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards;
+package org.eclipse.ldt.ui.wizards;
 
 import org.eclipse.dltk.ui.wizards.NewSourceModulePage;
 import org.eclipse.dltk.ui.wizards.NewSourceModuleWizard;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.ImageConstants;
-import org.eclipse.koneki.ldt.ui.wizards.pages.LuaFilePage;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.ImageConstants;
+import org.eclipse.ldt.ui.wizards.pages.LuaFilePage;
 
 public class LuaNewFileWizard extends NewSourceModuleWizard {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/LuaProjectCreator.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaProjectCreator.java
index 75338a1..4d8fca1 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/LuaProjectCreator.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaProjectCreator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards;
+package org.eclipse.ldt.ui.wizards;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -33,11 +33,11 @@ import org.eclipse.dltk.ui.wizards.ILocationGroup;
 import org.eclipse.dltk.ui.wizards.IProjectWizard;
 import org.eclipse.dltk.ui.wizards.ProjectCreator;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.wizards.pages.LuaProjectSettingsPage;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.wizards.pages.LuaProjectSettingsPage;
 
 public class LuaProjectCreator extends ProjectCreator {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/LuaProjectWizard.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaProjectWizard.java
index 5440605..6798fbc 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/LuaProjectWizard.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaProjectWizard.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards;
+package org.eclipse.ldt.ui.wizards;
 
 import java.text.MessageFormat;
 
@@ -22,12 +22,12 @@ import org.eclipse.dltk.ui.wizards.ProjectCreator;
 import org.eclipse.dltk.ui.wizards.ProjectWizardSecondPage;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.core.LuaNature;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.ImageConstants;
-import org.eclipse.koneki.ldt.ui.wizards.pages.LuaProjectSettingsPage;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.core.LuaNature;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.ImageConstants;
+import org.eclipse.ldt.ui.wizards.pages.LuaProjectSettingsPage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/Messages.java
index fc40d85..9e499f4 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards;
+package org.eclipse.ldt.ui.wizards;
 
 import org.eclipse.osgi.util.NLS;
 
 //CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.wizards.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.wizards.messages"; //$NON-NLS-1$
 
 	/** @since 1.2 */
 	public static String DocLuaNewFileWizard_title;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/messages.properties
index 90efe61..90efe61 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/DocLuaFilePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/DocLuaFilePage.java
index 9d55736..3ae394d 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/DocLuaFilePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/DocLuaFilePage.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards.pages;
+package org.eclipse.ldt.ui.wizards.pages;
 
 import org.eclipse.dltk.ui.wizards.NewSourceModulePage;
-import org.eclipse.koneki.ldt.core.LuaConstants;
-import org.eclipse.koneki.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaConstants;
+import org.eclipse.ldt.core.LuaNature;
 
 /**
  * @since 1.2
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/LuaExecutionEnvironmentGroup.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/LuaExecutionEnvironmentGroup.java
index 69091e8..3d5e6e0 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/LuaExecutionEnvironmentGroup.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/LuaExecutionEnvironmentGroup.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.wizards.pages;

+package org.eclipse.ldt.ui.wizards.pages;

 

 import java.text.MessageFormat;

 import java.util.List;

@@ -21,12 +21,12 @@ import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;

-import org.eclipse.koneki.ldt.core.internal.PreferenceInitializer;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;

-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;

-import org.eclipse.koneki.ldt.ui.LuaExecutionEnvironmentUIManager;

-import org.eclipse.koneki.ldt.ui.internal.buildpath.LuaExecutionEnvironmentContentProvider;

+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;

+import org.eclipse.ldt.core.internal.PreferenceInitializer;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;

+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentConstants;

+import org.eclipse.ldt.ui.LuaExecutionEnvironmentUIManager;

+import org.eclipse.ldt.ui.internal.buildpath.LuaExecutionEnvironmentContentProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/LuaFilePage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/LuaFilePage.java
index ba80377..4d59909 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/LuaFilePage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/LuaFilePage.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards.pages;
+package org.eclipse.ldt.ui.wizards.pages;
 
 import org.eclipse.dltk.ui.wizards.NewSourceModulePage;
-import org.eclipse.koneki.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaNature;
 
 public class LuaFilePage extends NewSourceModulePage {
 
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/LuaProjectSettingsPage.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/LuaProjectSettingsPage.java
index 2735622..093655a 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/LuaProjectSettingsPage.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/LuaProjectSettingsPage.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards.pages;
+package org.eclipse.ldt.ui.wizards.pages;
 
 import java.util.Observable;
 import java.util.Observer;
 
 import org.eclipse.dltk.ui.wizards.ProjectWizardFirstPage;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironment;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironment;
 import org.eclipse.swt.widgets.Composite;
 
 /**
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/Messages.java b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/Messages.java
index ea03db1..bcdb882 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/Messages.java
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/Messages.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.wizards.pages;
+package org.eclipse.ldt.ui.wizards.pages;
 
 import org.eclipse.osgi.util.NLS;
 
 //CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.ui.wizards.pages.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.ui.wizards.pages.messages"; //$NON-NLS-1$
 
 	/** @since 1.2 */
 	public static String DocLuaFilePage_description;
diff --git a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/messages.properties b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/messages.properties
index f36059b..f36059b 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/src/org/eclipse/koneki/ldt/ui/wizards/pages/messages.properties
+++ b/plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/pages/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/templates/luadocumentor-templates.properties b/plugins/org.eclipse.ldt.ui/templates/luadocumentor-templates.properties
index bf43afd..bf43afd 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/templates/luadocumentor-templates.properties
+++ b/plugins/org.eclipse.ldt.ui/templates/luadocumentor-templates.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/templates/luadocumentor-templates.xml b/plugins/org.eclipse.ldt.ui/templates/luadocumentor-templates.xml
index 66f1cca..3215667 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/templates/luadocumentor-templates.xml
+++ b/plugins/org.eclipse.ldt.ui/templates/luadocumentor-templates.xml
@@ -3,75 +3,75 @@
 <template
 	context="LuaDocumentorTemplateContextType"
 	description="%module.description"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.module"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.module"
 	name="@module">@module ${module_name}</template>
 
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.function"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.function"
 	name="@function"
 	description="%function.description"
 	autoinsert="true">@function [parent=#${module_name}] ${name}</template>
 
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.param"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.param"
 	name="@param"
 	description="%param.description"
 	autoinsert="true">@param #${type} ${name} ${description}</template>
 
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.field"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.field"
 	name="@field"
 	description="%field.description"
 	autoinsert="true">@field [parent=#${module_name}] #${type} ${name} ${description}</template>
 
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.fieldinparent"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.fieldinparent"
 	name="@fieldinparent"
 	description="%fieldinparent.description"
 	autoinsert="true">@field #${type} ${name} ${description}</template>
 
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.type"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.type"
 	name="@type"
 	description="%type.description"
 	autoinsert="true">@type ${name}</template>
 
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.return"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.return"
 	name="@return"
 	description="%return.description"
 	autoinsert="true">@return #${type} ${description}</template>
 	
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.extends"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.extends"
 	name="@extends"
 	description="%extends.description"
 	autoinsert="true">@extends ${module}#${type} </template>
 	
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.list"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.list"
 	name="@list"
 	description="%list.description"
 	autoinsert="true">@list &lt;#${type}&gt; ${description}</template>
 	
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.map"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.map"
 	name="@map"
 	description="%map.description"
 	autoinsert="true">@map &lt;#${keytype},#${valuetype}&gt; ${description}</template>
 	
 <template
 	context="LuaDocumentorTemplateContextType"
-	id="org.eclipse.koneki.ldt.ui.templates.luadocumentor.callof"
+	id="org.eclipse.ldt.ui.templates.luadocumentor.callof"
 	name="@callof"
 	description="%callof.description"
 	autoinsert="true">@callof #${type}</template>
diff --git a/plugins/org.eclipse.koneki.ldt.ui/templates/templates.properties b/plugins/org.eclipse.ldt.ui/templates/templates.properties
index 99f984e..99f984e 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/templates/templates.properties
+++ b/plugins/org.eclipse.ldt.ui/templates/templates.properties
diff --git a/plugins/org.eclipse.koneki.ldt.ui/templates/templates.xml b/plugins/org.eclipse.ldt.ui/templates/templates.xml
index bffd73e..e509701 100644
--- a/plugins/org.eclipse.koneki.ldt.ui/templates/templates.xml
+++ b/plugins/org.eclipse.ldt.ui/templates/templates.xml
@@ -8,14 +8,14 @@
 -->
 <templates>
 <template
-	id="org.eclipse.koneki.templates.for"
+	id="org.eclipse.templates.for"
 	context="LuaUniversalTemplateContextType"
 	description="%template.forlist"
 	name="for">for ${var} in ${list} do
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.fordots"
+	id="org.eclipse.templates.fordots"
 	context="LuaUniversalTemplateContextType"
 	description="%template.fordots"
 	name="ford">for ${index}=1,select("#", ...) do
@@ -23,49 +23,49 @@ end</template>
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.foripairs"
+	id="org.eclipse.templates.foripairs"
 	context="LuaUniversalTemplateContextType"
 	description="%template.ipairs"
 	name="fori">for ${key}, ${var} in ipairs(${table}) do
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.forpairs"
+	id="org.eclipse.templates.forpairs"
 	context="LuaUniversalTemplateContextType"
 	description="%template.pairs"
 	name="forp">for ${key}, ${var} in pairs(${table}) do
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.fornumeric"
+	id="org.eclipse.templates.fornumeric"
 	context="LuaUniversalTemplateContextType"
 	description="%template.fornumeric"
 	name="forn">for ${var}=${init}, ${limit} do
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.forrange"
+	id="org.eclipse.templates.forrange"
 	context="LuaUniversalTemplateContextType"
 	description="%template.fornumeric.range"
 	name="forr">for ${var}=${init}, ${limit}, ${range} do
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.if"
+	id="org.eclipse.templates.if"
 	context="LuaUniversalTemplateContextType"
 	description="%template.if"
 	name="if">if ${exp} then
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.function"
+	id="org.eclipse.templates.function"
 	context="LuaUniversalTemplateContextType"
 	description="%template.function"
 	name="function">function ${name}(${parameters})
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.repeat"
+	id="org.eclipse.templates.repeat"
 	context="LuaUniversalTemplateContextType"
 	description="%template.repeat"
 	name="repeat">repeat
@@ -73,25 +73,25 @@ end</template>
 until ${exp}
 </template>
 <template
-	id="org.eclipse.koneki.templates.while"
+	id="org.eclipse.templates.while"
 	context="LuaUniversalTemplateContextType"
 	description="%template.while"
 	name="while">while ${exp} do
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.local"
+	id="org.eclipse.templates.local"
 	context="LuaUniversalTemplateContextType"
 	description="%template.local"
 	name="local">local ${variable}
 ${cursor}</template>
 <template
-	id="org.eclipse.koneki.templates.localAssignment"
+	id="org.eclipse.templates.localAssignment"
 	context="LuaUniversalTemplateContextType"
 	description="%template.localAssignment"
 	name="loci">local ${variable} = ${cursor}</template>
 <template
-	id="org.eclipse.koneki.templates.pcall"
+	id="org.eclipse.templates.pcall"
 	context="LuaUniversalTemplateContextType"
 	description="%template.pcall"
 	name="pcall">local ${status}, ${result} = pcall(${functionNameOrBody}, ${param})
@@ -99,7 +99,7 @@ if not ${status} then
 	${cursor}
 end</template>
 <template
-	id="org.eclipse.koneki.templates.print"
+	id="org.eclipse.templates.print"
 	context="LuaUniversalTemplateContextType"
 	description="%template.print"
 	name="print">print("${string}")
diff --git a/plugins/org.eclipse.ldt/.checkstyle b/plugins/org.eclipse.ldt/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/plugins/org.eclipse.ldt/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.koneki.ldt/.classpath b/plugins/org.eclipse.ldt/.classpath
index ad32c83..ad32c83 100644
--- a/plugins/org.eclipse.koneki.ldt/.classpath
+++ b/plugins/org.eclipse.ldt/.classpath
diff --git a/plugins/org.eclipse.koneki.ldt/.externalToolBuilders/Import Lua Files.launch b/plugins/org.eclipse.ldt/.externalToolBuilders/Import Lua Files.launch
index e082b02..f892a1e 100644
--- a/plugins/org.eclipse.koneki.ldt/.externalToolBuilders/Import Lua Files.launch
+++ b/plugins/org.eclipse.ldt/.externalToolBuilders/Import Lua Files.launch
@@ -2,9 +2,9 @@
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">

 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>

 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>

-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt/script&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ldt/script&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.koneki.ldt"/>

+<listEntry value="/org.eclipse.ldt"/>

 </listAttribute>

 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

 <listEntry value="4"/>

@@ -12,9 +12,9 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>

 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>

 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.koneki.ldt"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/doctemplates&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/luaformatter&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/markdown&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/modelsbuilder&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/penlight&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/koneki.ldt/libraries/templateengine&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.koneki.ldt/build.xml}"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ldt"/>

+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/doctemplates&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/luaformatter&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/markdown&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/modelsbuilder&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/penlight&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/templateengine&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ldt/build.xml}"/>

 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>

 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>

 </launchConfiguration>

diff --git a/plugins/org.eclipse.koneki.ldt/.fbprefs b/plugins/org.eclipse.ldt/.fbprefs
index 968afbf..968afbf 100644
--- a/plugins/org.eclipse.koneki.ldt/.fbprefs
+++ b/plugins/org.eclipse.ldt/.fbprefs
diff --git a/plugins/org.eclipse.koneki.ldt/.project b/plugins/org.eclipse.ldt/.project
index aaf3041..7331e16 100644
--- a/plugins/org.eclipse.koneki.ldt/.project
+++ b/plugins/org.eclipse.ldt/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt</name>

+	<name>org.eclipse.ldt</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ldt/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.ldt/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ldt/.settings/org.eclipse.jdt.core.prefs
index 910ca67..910ca67 100644
--- a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.ldt/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.ldt/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ldt/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/plugins/org.eclipse.ldt/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.ldt/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.pde.core.prefs
+++ b/plugins/org.eclipse.ldt/.settings/org.eclipse.pde.core.prefs
diff --git a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.ldt/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/plugins/org.eclipse.koneki.ldt/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.ldt/.settings/org.eclipse.pde.prefs
diff --git a/plugins/org.eclipse.ldt/META-INF/MANIFEST.MF b/plugins/org.eclipse.ldt/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6ebbb18
--- /dev/null
+++ b/plugins/org.eclipse.ldt/META-INF/MANIFEST.MF
@@ -0,0 +1,74 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.ldt;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.ldt.core.internal.Activator
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.core.runtime,
+ org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.ldt.metalua;bundle-version="0.9.0",
+ com.naef.jnlua;bundle-version="[0.9.1,1.0.0)",
+ com.cforcoding.jmd;bundle-version="0.8.1",
+ org.eclipse.text
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.ldt.core,
+ org.eclipse.ldt.core.internal;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.ast;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.ast.models;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.ast.models.api;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.ast.models.common;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.ast.models.dltk;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.ast.models.file;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.ast.parser;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.buildpath;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.formatter;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui",
+ org.eclipse.ldt.core.internal.todo;
+  x-friends:="org.eclipse.ldt.core.tests,
+   org.eclipse.ldt.debug.core,
+   org.eclipse.ldt.debug.ui,
+   org.eclipse.ldt.ui"
+Import-Package: org.apache.commons.io;version="1.4.0"
diff --git a/plugins/org.eclipse.koneki.ldt/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.ldt/OSGI-INF/l10n/bundle.properties
index b9138cd..98ec9e0 100644
--- a/plugins/org.eclipse.koneki.ldt/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.ldt/OSGI-INF/l10n/bundle.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt
+#Properties file for org.eclipse.ldt
 extension.name = Lua nature
 content-type.name = Lua Source File
 Bundle-Name = Lua Development Tools Core
-Bundle-Vendor = Eclipse Koneki
+Bundle-Vendor = Eclipse LDT
 extension-point.executionenvironement.name = Execution Environment
diff --git a/plugins/org.eclipse.koneki.ldt/about.html b/plugins/org.eclipse.ldt/about.html
index c258ef5..c258ef5 100644
--- a/plugins/org.eclipse.koneki.ldt/about.html
+++ b/plugins/org.eclipse.ldt/about.html
diff --git a/plugins/org.eclipse.koneki.ldt/build.properties b/plugins/org.eclipse.ldt/build.properties
index 1c3392b..1c3392b 100644
--- a/plugins/org.eclipse.koneki.ldt/build.properties
+++ b/plugins/org.eclipse.ldt/build.properties
diff --git a/plugins/org.eclipse.koneki.ldt/build.xml b/plugins/org.eclipse.ldt/build.xml
index 35d3224..35d3224 100644
--- a/plugins/org.eclipse.koneki.ldt/build.xml
+++ b/plugins/org.eclipse.ldt/build.xml
diff --git a/plugins/org.eclipse.koneki.ldt/plugin.xml b/plugins/org.eclipse.ldt/plugin.xml
index a968fe9..504e7c9 100644
--- a/plugins/org.eclipse.koneki.ldt/plugin.xml
+++ b/plugins/org.eclipse.ldt/plugin.xml
@@ -18,7 +18,7 @@
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
-               class="org.eclipse.koneki.ldt.core.LuaNature">
+               class="org.eclipse.ldt.core.LuaNature">
          </run>
       </runtime>
    </extension>
@@ -26,9 +26,9 @@
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
             base-type="org.eclipse.core.runtime.text"
-            describer="org.eclipse.koneki.ldt.core.internal.LuaContentDescriber"
+            describer="org.eclipse.ldt.core.internal.LuaContentDescriber"
             file-extensions="lua,doclua,rockspec"
-            id="org.eclipse.koneki.ldt.content-type"
+            id="org.eclipse.ldt.content-type"
             name="%content-type.name"
             priority="high">
       </content-type>
@@ -36,52 +36,52 @@
    <extension
          point="org.eclipse.dltk.core.language">
       <language
-            class="org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit"
-            nature="org.eclipse.koneki.ldt.nature"
+            class="org.eclipse.ldt.core.internal.LuaLanguageToolkit"
+            nature="org.eclipse.ldt.nature"
             priority="0">
       </language>
    </extension>
    <extension
          point="org.eclipse.dltk.core.buildpathContainerInitializer">
       <buildpathContainerInitializer
-            class="org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathContainerInitializer"
-            id="org.eclipse.koneki.ldt.ExecutionEnvironmentContainer">
+            class="org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathContainerInitializer"
+            id="org.eclipse.ldt.ExecutionEnvironmentContainer">
       </buildpathContainerInitializer>
    </extension>
  <extension
          point="org.eclipse.dltk.core.buildParticipant">
       <buildParticipant
             class="org.eclipse.dltk.core.builder.ParserBuildParticipantFactory"
-            id="org.eclipse.koneki.ldt.parser"
+            id="org.eclipse.ldt.parser"
             name="Lua parser"
-            nature="org.eclipse.koneki.ldt.nature">
+            nature="org.eclipse.ldt.nature">
       </buildParticipant>
       <buildParticipant
-            class="org.eclipse.koneki.ldt.core.internal.todo.LuaTodoParserType"
-            id="org.eclipse.koneki.ldt.todo"
+            class="org.eclipse.ldt.core.internal.todo.LuaTodoParserType"
+            id="org.eclipse.ldt.todo"
             name="Lua tasks parser"
-            nature="org.eclipse.koneki.ldt.nature">
+            nature="org.eclipse.ldt.nature">
             <requires
-            	id="org.eclipse.koneki.ldt.parser">
+            	id="org.eclipse.ldt.parser">
             </requires>
       </buildParticipant>
      </extension>
    <extension
          point="org.eclipse.dltk.core.sourceElementParsers">
       <parser
-            class="org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceElementParser"
-            nature="org.eclipse.koneki.ldt.nature"
+            class="org.eclipse.ldt.core.internal.ast.parser.LuaSourceElementParser"
+            nature="org.eclipse.ldt.nature"
             priority="1">
       </parser>
    </extension>
    <extension
          point="org.eclipse.dltk.core.sourceParsers">
       <parserContribution
-            natureId="org.eclipse.koneki.ldt.nature">
+            natureId="org.eclipse.ldt.nature">
          <parser
-               class="org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory"
+               class="org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory"
                description="Metalua based Lua source parser"
-               id="org.eclipse.koneki.ldt.parser.sourceParser"
+               id="org.eclipse.ldt.parser.sourceParser"
                name="sourceParser.name"
                priority="0">
          </parser>
@@ -90,15 +90,15 @@
    <extension
          point="org.eclipse.dltk.core.selectionEngine">
       <selectionEngine
-            class="org.eclipse.koneki.ldt.core.internal.ast.LuaSelectionEngine"
-            nature="org.eclipse.koneki.ldt.nature"
+            class="org.eclipse.ldt.core.internal.ast.LuaSelectionEngine"
+            nature="org.eclipse.ldt.nature"
             priority="0">
       </selectionEngine>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.eclipse.koneki.ldt.core.internal.PreferenceInitializer">
+            class="org.eclipse.ldt.core.internal.PreferenceInitializer">
       </initializer>
    </extension>
    <!--
@@ -106,7 +106,7 @@
          point="org.eclipse.dltk.core.search">
       <matchLocator
             class="org.eclipse.dltk.core.search.matching.MatchLocator"
-            nature="org.eclipse.koneki.ldt.nature">
+            nature="org.eclipse.ldt.nature">
       </matchLocator>
    </extension>
    -->
diff --git a/plugins/org.eclipse.koneki.ldt/pom.xml b/plugins/org.eclipse.ldt/pom.xml
index 3436baa..9d36a4b 100644
--- a/plugins/org.eclipse.koneki.ldt/pom.xml
+++ b/plugins/org.eclipse.ldt/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>plugins</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
diff --git a/plugins/org.eclipse.koneki.ldt/schema/executionEnvironment.exsd b/plugins/org.eclipse.ldt/schema/executionEnvironment.exsd
index 61eb48e..86d480f 100644
--- a/plugins/org.eclipse.koneki.ldt/schema/executionEnvironment.exsd
+++ b/plugins/org.eclipse.ldt/schema/executionEnvironment.exsd
@@ -1,121 +1,121 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.koneki.ldt" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.koneki.ldt" id="executionEnvironment" name="Execution Environment"/>

-      </appinfo>

-      <documentation>

-         Allow to register an execution environment which is embedded in a Plug-in.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="0" maxOccurs="unbounded">

-            <element ref="executionEnvironment"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="executionEnvironment">

-      <annotation>

-         <documentation>

-            The execution environment which must be registered.

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="version" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="resourcedirectory" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="resource"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.ldt" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.ldt" id="executionEnvironment" name="Execution Environment"/>
+      </appinfo>
+      <documentation>
+         Allow to register an execution environment which is embedded in a Plug-in.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="executionEnvironment"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="executionEnvironment">
+      <annotation>
+         <documentation>
+            The execution environment which must be registered.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="version" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="resourcedirectory" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="resource"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/org.eclipse.koneki.ldt/script/external/.gitignore b/plugins/org.eclipse.ldt/script/external/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/plugins/org.eclipse.koneki.ldt/script/external/.gitignore
+++ b/plugins/org.eclipse.ldt/script/external/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt/script/local/.gitignore b/plugins/org.eclipse.ldt/script/local/.gitignore
index 31b688b..31b688b 100644
--- a/plugins/org.eclipse.koneki.ldt/script/local/.gitignore
+++ b/plugins/org.eclipse.ldt/script/local/.gitignore
diff --git a/plugins/org.eclipse.koneki.ldt/script/local/javaapimodelbuilder.lua b/plugins/org.eclipse.ldt/script/local/javaapimodelbuilder.lua
index 53102c0..53102c0 100644
--- a/plugins/org.eclipse.koneki.ldt/script/local/javaapimodelbuilder.lua
+++ b/plugins/org.eclipse.ldt/script/local/javaapimodelbuilder.lua
diff --git a/plugins/org.eclipse.koneki.ldt/script/local/javaexpressionbuilder.lua b/plugins/org.eclipse.ldt/script/local/javaexpressionbuilder.lua
index 4f791b1..4f791b1 100644
--- a/plugins/org.eclipse.koneki.ldt/script/local/javaexpressionbuilder.lua
+++ b/plugins/org.eclipse.ldt/script/local/javaexpressionbuilder.lua
diff --git a/plugins/org.eclipse.koneki.ldt/script/local/javainternalmodelbuilder.lua b/plugins/org.eclipse.ldt/script/local/javainternalmodelbuilder.lua
index d707443..d707443 100644
--- a/plugins/org.eclipse.koneki.ldt/script/local/javainternalmodelbuilder.lua
+++ b/plugins/org.eclipse.ldt/script/local/javainternalmodelbuilder.lua
diff --git a/plugins/org.eclipse.koneki.ldt/script/local/javamodelsbuilder.lua b/plugins/org.eclipse.ldt/script/local/javamodelsbuilder.lua
index 050c5b4..050c5b4 100644
--- a/plugins/org.eclipse.koneki.ldt/script/local/javamodelsbuilder.lua
+++ b/plugins/org.eclipse.ldt/script/local/javamodelsbuilder.lua
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceRootFolderVisitor.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceRootFolderVisitor.java
index 85ee00c..4cfb191 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceRootFolderVisitor.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceRootFolderVisitor.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core;
+package org.eclipse.ldt.core;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 /**
- * @deprecated Use org.eclipse.koneki.ldt.core.IProjectSourceRootFolderVisitor2 instead.
+ * @deprecated Use org.eclipse.ldt.core.IProjectSourceRootFolderVisitor2 instead.
  */
 public interface IProjectSourceRootFolderVisitor {
 	public abstract void processSourceRootFolder(final IPath absolutePath, final IProgressMonitor monitor) throws CoreException;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceRootFolderVisitor2.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceRootFolderVisitor2.java
index cd8788e..7853f2c 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceRootFolderVisitor2.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceRootFolderVisitor2.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core;
+package org.eclipse.ldt.core;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceVisitor.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceVisitor.java
index 811670f..3a257e7 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceVisitor.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core;
+package org.eclipse.ldt.core;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 
 /**
  * 
- * @deprecated Use {@link org.eclipse.koneki.ldt.core.IProjectSourceVisitor2} instead.
+ * @deprecated Use {@link org.eclipse.ldt.core.IProjectSourceVisitor2} instead.
  */
 public interface IProjectSourceVisitor {
 
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceVisitor2.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceVisitor2.java
index 848d80f..a6335d7 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/IProjectSourceVisitor2.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/IProjectSourceVisitor2.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core;
+package org.eclipse.ldt.core;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/LuaConstants.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/LuaConstants.java
index 62b93b3..a4c0ddf 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/LuaConstants.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/LuaConstants.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core;
+package org.eclipse.ldt.core;
 
 public final class LuaConstants {
 	public static final String DEFAULT_MAIN_FILE = "main.lua"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/LuaNature.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/LuaNature.java
index fbf7eea..0a73c7b 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/LuaNature.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/LuaNature.java
@@ -9,10 +9,10 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.core;
+package org.eclipse.ldt.core;
 
 import org.eclipse.dltk.core.ScriptNature;
-import org.eclipse.koneki.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.internal.Activator;
 
 /**
  * The Class LuaNature gives a common denomination used by several components of the IDE.
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/LuaUtils.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/LuaUtils.java
index 44dce4d..bb81b12 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/LuaUtils.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/LuaUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core;
+package org.eclipse.ldt.core;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -42,8 +42,8 @@ import org.eclipse.dltk.core.IScriptProject;
 import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.core.ModelException;
 import org.eclipse.dltk.core.environment.EnvironmentPathUtils;
-import org.eclipse.koneki.ldt.core.internal.Activator;
-import org.eclipse.koneki.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
+import org.eclipse.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.internal.buildpath.LuaExecutionEnvironmentBuildpathUtil;
 
 /**
  * Utility class for Lua
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/Activator.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/Activator.java
index 14cd2da..50884bb 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/Activator.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal;
+package org.eclipse.ldt.core.internal;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {
 
 	/** The plug-in ID */
-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.ldt"; //$NON-NLS-1$
 
 	/** The shared instance */
 	private static Activator plugin;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/LuaContentDescriber.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/LuaContentDescriber.java
index bd4cef8..bc76e35 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/LuaContentDescriber.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/LuaContentDescriber.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.core.internal;
+package org.eclipse.ldt.core.internal;
 
 import java.util.regex.Pattern;
 
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/LuaLanguageToolkit.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/LuaLanguageToolkit.java
index d7da5fc..7907106 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/LuaLanguageToolkit.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/LuaLanguageToolkit.java
@@ -9,13 +9,13 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.core.internal;
+package org.eclipse.ldt.core.internal;
 
 import java.awt.Toolkit;
 
 import org.eclipse.dltk.core.AbstractLanguageToolkit;
 import org.eclipse.dltk.core.IDLTKLanguageToolkit;
-import org.eclipse.koneki.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaNature;
 
 public class LuaLanguageToolkit extends AbstractLanguageToolkit {
 
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/PreferenceInitializer.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/PreferenceInitializer.java
index e2f818e..93dc228 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/PreferenceInitializer.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/PreferenceInitializer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal;
+package org.eclipse.ldt.core.internal;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/LuaSelectionEngine.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/LuaSelectionEngine.java
index 0551638..9d43740 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/LuaSelectionEngine.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/LuaSelectionEngine.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  ******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast;
+package org.eclipse.ldt.core.internal.ast;
 
 import org.eclipse.dltk.codeassist.ScriptSelectionEngine;
 import org.eclipse.dltk.compiler.env.IModuleSource;
 import org.eclipse.dltk.core.IModelElement;
 import org.eclipse.dltk.core.ISourceModule;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTModelUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils.Definition;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTModelUtils;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils.Definition;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;
 
 public class LuaSelectionEngine extends ScriptSelectionEngine {
 
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/APIModelFactory.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/APIModelFactory.java
index 1cc643f..4767173 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/APIModelFactory.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/APIModelFactory.java
@@ -8,27 +8,27 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models;

+package org.eclipse.ldt.core.internal.ast.models;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ExprTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ExternalTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.FunctionTypeDef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.InlineTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.InternalTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ModuleTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Parameter;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.PrimitiveTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.RecordTypeDef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Return;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeDef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;

+import org.eclipse.ldt.core.internal.ast.models.api.ExprTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.ExternalTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.FunctionTypeDef;

+import org.eclipse.ldt.core.internal.ast.models.api.InlineTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.InternalTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.Item;

+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;

+import org.eclipse.ldt.core.internal.ast.models.api.ModuleTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.Parameter;

+import org.eclipse.ldt.core.internal.ast.models.api.PrimitiveTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.RecordTypeDef;

+import org.eclipse.ldt.core.internal.ast.models.api.Return;

+import org.eclipse.ldt.core.internal.ast.models.api.TypeDef;

+import org.eclipse.ldt.core.internal.ast.models.api.TypeRef;

+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;

+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;

 

 import com.cforcoding.jmd.MarkDown;

 import com.naef.jnlua.LuaState;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/InternalModelFactory.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/InternalModelFactory.java
index 6ab2287..d8e939d 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/InternalModelFactory.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/InternalModelFactory.java
@@ -8,21 +8,21 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models;

+package org.eclipse.ldt.core.internal.ast.models;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Block;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Call;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Index;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Invoke;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LocalVar;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaInternalContent;

+import org.eclipse.ldt.core.internal.ast.models.api.Item;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.file.Block;

+import org.eclipse.ldt.core.internal.ast.models.file.Call;

+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;

+import org.eclipse.ldt.core.internal.ast.models.file.Index;

+import org.eclipse.ldt.core.internal.ast.models.file.Invoke;

+import org.eclipse.ldt.core.internal.ast.models.file.LocalVar;

+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;

+import org.eclipse.ldt.core.internal.ast.models.file.LuaInternalContent;

 

 import com.naef.jnlua.LuaState;

 import com.naef.jnlua.NamedJavaFunction;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/LuaASTModelUtils.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/LuaASTModelUtils.java
index b9ec7c2..5d9beac 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/LuaASTModelUtils.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/LuaASTModelUtils.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models;

+package org.eclipse.ldt.core.internal.ast.models;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,22 +25,22 @@ import org.eclipse.dltk.core.ISourceModule;
 import org.eclipse.dltk.core.IType;

 import org.eclipse.dltk.core.ModelException;

 import org.eclipse.dltk.core.SourceParserUtil;

-import org.eclipse.koneki.ldt.core.internal.Activator;

-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils.TypeResolution;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ExternalTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.FunctionTypeDef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.InternalTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.PrimitiveTypeRef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.RecordTypeDef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeDef;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;

-import org.eclipse.koneki.ldt.core.internal.ast.models.dltk.FakeField;

-import org.eclipse.koneki.ldt.core.internal.ast.models.dltk.FakeMethod;

-import org.eclipse.koneki.ldt.core.internal.ast.models.dltk.IFakeElement;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LocalVar;

+import org.eclipse.ldt.core.internal.Activator;

+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils.TypeResolution;

+import org.eclipse.ldt.core.internal.ast.models.api.ExternalTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.FunctionTypeDef;

+import org.eclipse.ldt.core.internal.ast.models.api.InternalTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.Item;

+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;

+import org.eclipse.ldt.core.internal.ast.models.api.PrimitiveTypeRef;

+import org.eclipse.ldt.core.internal.ast.models.api.RecordTypeDef;

+import org.eclipse.ldt.core.internal.ast.models.api.TypeDef;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;

+import org.eclipse.ldt.core.internal.ast.models.dltk.FakeField;

+import org.eclipse.ldt.core.internal.ast.models.dltk.FakeMethod;

+import org.eclipse.ldt.core.internal.ast.models.dltk.IFakeElement;

+import org.eclipse.ldt.core.internal.ast.models.file.LocalVar;

 

 public final class LuaASTModelUtils {

 	private LuaASTModelUtils() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/LuaASTUtils.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/LuaASTUtils.java
index 857ecfc..a47331f 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/LuaASTUtils.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/LuaASTUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.models;
+package org.eclipse.ldt.core.internal.ast.models;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,36 +28,36 @@ import org.eclipse.dltk.ast.ASTNode;
 import org.eclipse.dltk.ast.ASTVisitor;
 import org.eclipse.dltk.core.IScriptFolder;
 import org.eclipse.dltk.core.ISourceModule;
-import org.eclipse.koneki.ldt.core.IProjectSourceVisitor2;
-import org.eclipse.koneki.ldt.core.LuaUtils;
-import org.eclipse.koneki.ldt.core.LuaUtils.ProjectFragmentFilter;
-import org.eclipse.koneki.ldt.core.internal.Activator;
-import org.eclipse.koneki.ldt.core.internal.LuaLanguageToolkit;
-import org.eclipse.koneki.ldt.core.internal.PreferenceInitializer;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ExprTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ExternalTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.FunctionTypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.InlineTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.InternalTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ModuleTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.PrimitiveTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.RecordTypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Return;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.UnknownItem;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Block;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Call;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Index;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Invoke;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LocalVar;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaInternalContent;
+import org.eclipse.ldt.core.IProjectSourceVisitor2;
+import org.eclipse.ldt.core.LuaUtils;
+import org.eclipse.ldt.core.LuaUtils.ProjectFragmentFilter;
+import org.eclipse.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.internal.LuaLanguageToolkit;
+import org.eclipse.ldt.core.internal.PreferenceInitializer;
+import org.eclipse.ldt.core.internal.ast.models.api.ExprTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.ExternalTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.FunctionTypeDef;
+import org.eclipse.ldt.core.internal.ast.models.api.InlineTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.InternalTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.Item;
+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;
+import org.eclipse.ldt.core.internal.ast.models.api.ModuleTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.PrimitiveTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.RecordTypeDef;
+import org.eclipse.ldt.core.internal.ast.models.api.Return;
+import org.eclipse.ldt.core.internal.ast.models.api.TypeDef;
+import org.eclipse.ldt.core.internal.ast.models.api.TypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.UnknownItem;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.Block;
+import org.eclipse.ldt.core.internal.ast.models.file.Call;
+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;
+import org.eclipse.ldt.core.internal.ast.models.file.Index;
+import org.eclipse.ldt.core.internal.ast.models.file.Invoke;
+import org.eclipse.ldt.core.internal.ast.models.file.LocalVar;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaInternalContent;
 
 public final class LuaASTUtils {
 	private LuaASTUtils() {
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/LuaDLTKModelUtils.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/LuaDLTKModelUtils.java
index 026e413..5fb49ba 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/LuaDLTKModelUtils.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/LuaDLTKModelUtils.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models;

+package org.eclipse.ldt.core.internal.ast.models;

 

 import org.eclipse.dltk.core.Flags;

 import org.eclipse.dltk.core.IField;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/MatchNodeVisitor.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/MatchNodeVisitor.java
index d3e2fe0..0a85125 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/MatchNodeVisitor.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/MatchNodeVisitor.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *     Kevin KIN-FOO <kkinfoo@sierrawireless.com>
  ******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.models;
+package org.eclipse.ldt.core.internal.ast.models;
 
 import org.eclipse.dltk.ast.ASTNode;
 import org.eclipse.dltk.ast.ASTVisitor;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/ModelFactory.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/ModelFactory.java
index a0cab26..4361e07 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/ModelFactory.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/ModelFactory.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models;

+package org.eclipse.ldt.core.internal.ast.models;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaInternalContent;

+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;

+import org.eclipse.ldt.core.internal.ast.models.file.LuaInternalContent;

 

 import com.naef.jnlua.LuaState;

 import com.naef.jnlua.NamedJavaFunction;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/ExprTypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/ExprTypeRef.java
index 48a2333..24e94b0 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/ExprTypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/ExprTypeRef.java
@@ -8,9 +8,9 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaExpression;

+import org.eclipse.ldt.core.internal.ast.models.file.LuaExpression;

 

 public class ExprTypeRef extends LazyTypeRef {

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/ExternalTypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/ExternalTypeRef.java
index 7022a21..e27aef9 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/ExternalTypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/ExternalTypeRef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 /**

  * Reference a type which is defined in another module

@@ -31,7 +31,7 @@ public class ExternalTypeRef extends TypeRef {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

+	 * @see org.eclipse.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

 	 */

 	@Override

 	public String toReadableString() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/FunctionTypeDef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/FunctionTypeDef.java
index 54b356f..46eedd9 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/FunctionTypeDef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/FunctionTypeDef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/InlineTypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/InlineTypeRef.java
index aaf9a31..0145d3e 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/InlineTypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/InlineTypeRef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 public class InlineTypeRef extends TypeRef {

 

@@ -28,7 +28,7 @@ public class InlineTypeRef extends TypeRef {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

+	 * @see org.eclipse.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

 	 */

 	@Override

 	public String toReadableString() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/InternalTypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/InternalTypeRef.java
index e7f2455..944a63d 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/InternalTypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/InternalTypeRef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 /**

  * Reference of a type defines in this module

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/Item.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/Item.java
index a33ba53..2afa13d 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/Item.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/Item.java
@@ -8,15 +8,15 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.dltk.ast.ASTVisitor;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.IDocumentationHolder;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Identifier;

+import org.eclipse.ldt.core.internal.ast.models.common.IDocumentationHolder;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.file.Identifier;

 

 /**

  * An item is an element which references a type.<br/>

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/LazyTypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/LazyTypeRef.java
index 3679d36..6ef3188 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/LazyTypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/LazyTypeRef.java
@@ -8,12 +8,12 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 public class LazyTypeRef extends TypeRef {

 

 	/**

-	 * @see org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

+	 * @see org.eclipse.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

 	 */

 	@Override

 	public String toReadableString() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/LuaFileAPI.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/LuaFileAPI.java
index 9a5c8b5..411c26a 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/LuaFileAPI.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/LuaFileAPI.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 import java.util.ArrayList;

 import java.util.HashMap;

 

 import org.eclipse.dltk.ast.ASTVisitor;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 /**

  * This class defines the API of a Lua file.

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/ModuleTypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/ModuleTypeRef.java
index 3dbff59..3f4c739 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/ModuleTypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/ModuleTypeRef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 public class ModuleTypeRef extends LazyTypeRef {

 	private String moduleName;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/Parameter.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/Parameter.java
index 250ed40..61606e7 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/Parameter.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/Parameter.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 import org.eclipse.dltk.ast.ASTVisitor;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 /**

  * A paramater of a function type

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/PrimitiveTypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/PrimitiveTypeRef.java
index b5c7bc8..f7b82f9 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/PrimitiveTypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/PrimitiveTypeRef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 /**

  * Reference of a type defines in this module

@@ -28,7 +28,7 @@ public class PrimitiveTypeRef extends TypeRef {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

+	 * @see org.eclipse.ldt.core.internal.ast.models.api.TypeRef#toReadableString()

 	 */

 	@Override

 	public String toReadableString() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/RecordTypeDef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/RecordTypeDef.java
index 7e5fa13..66eb421 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/RecordTypeDef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/RecordTypeDef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 import java.util.HashMap;

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/Return.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/Return.java
index 4b6818d..bc67331 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/Return.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/Return.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/TypeDef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/TypeDef.java
index e7f642d..c4d86cf 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/TypeDef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/TypeDef.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.IDocumentationHolder;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.IDocumentationHolder;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 /**

  * a TypeDef is the definition of a kind of type.<br/>

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/TypeRef.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/TypeRef.java
index 29dd9f8..1d86835 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/TypeRef.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/TypeRef.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 /**

  * this is a reference to a type

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/UnknownItem.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/UnknownItem.java
index 1075cbf..e406d56 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/api/UnknownItem.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/api/UnknownItem.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.api;

+package org.eclipse.ldt.core.internal.ast.models.api;

 

 public class UnknownItem extends Item {

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/common/IDocumentationHolder.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/common/IDocumentationHolder.java
index 5a7b999..c90492e 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/common/IDocumentationHolder.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/common/IDocumentationHolder.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.models.common;
+package org.eclipse.ldt.core.internal.ast.models.common;
 
 public interface IDocumentationHolder {
 	public String getDocumentation();
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/common/LuaASTNode.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/common/LuaASTNode.java
index b076343..86119af 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/common/LuaASTNode.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/common/LuaASTNode.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.common;

+package org.eclipse.ldt.core.internal.ast.models.common;

 

 import org.eclipse.dltk.ast.ASTNode;

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/common/LuaSourceRoot.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/common/LuaSourceRoot.java
index f4d2bd0..516ae1b 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/common/LuaSourceRoot.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/common/LuaSourceRoot.java
@@ -15,7 +15,7 @@
  * $Author: kkinfoo $
  * $Id: LuaSourceRoot.java 2190 2009-07-29 15:56:04Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.internal.ast.models.common;
+package org.eclipse.ldt.core.internal.ast.models.common;
 
 import org.eclipse.dltk.ast.ASTVisitor;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
@@ -23,8 +23,8 @@ import org.eclipse.dltk.compiler.problem.DefaultProblem;
 import org.eclipse.dltk.compiler.problem.DefaultProblemIdentifier;
 import org.eclipse.dltk.compiler.problem.IProblemIdentifier;
 import org.eclipse.dltk.compiler.problem.ProblemSeverity;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaInternalContent;
+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaInternalContent;
 
 /**
  * The Root AST Node of a lua source file.
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/FakeField.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/FakeField.java
index f4dd45e..1f1a85a 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/FakeField.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/FakeField.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.dltk;

+package org.eclipse.ldt.core.internal.ast.models.dltk;

 

 import org.eclipse.dltk.core.ISourceModule;

 import org.eclipse.dltk.core.ISourceRange;

 import org.eclipse.dltk.core.ModelException;

 import org.eclipse.dltk.internal.core.ModelElement;

 import org.eclipse.dltk.internal.core.SourceField;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 @SuppressWarnings("restriction")

 public class FakeField extends SourceField implements ISourceRange, IFakeElement {

@@ -94,7 +94,7 @@ public class FakeField extends SourceField implements ISourceRange, IFakeElement
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.core.internal.ast.models.dltk.IFakeElement#getLuaASTNode()

+	 * @see org.eclipse.ldt.core.internal.ast.models.dltk.IFakeElement#getLuaASTNode()

 	 */

 	@Override

 	public LuaASTNode getLuaASTNode() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/FakeMethod.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/FakeMethod.java
index a28e403..bae99fd 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/FakeMethod.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/FakeMethod.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.dltk;

+package org.eclipse.ldt.core.internal.ast.models.dltk;

 

 import org.eclipse.dltk.core.IParameter;

 import org.eclipse.dltk.core.ISourceModule;

@@ -16,7 +16,7 @@ import org.eclipse.dltk.core.ISourceRange;
 import org.eclipse.dltk.core.ModelException;

 import org.eclipse.dltk.internal.core.ModelElement;

 import org.eclipse.dltk.internal.core.SourceMethod;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 @SuppressWarnings("restriction")

 public class FakeMethod extends SourceMethod implements ISourceRange, IFakeElement {

@@ -107,7 +107,7 @@ public class FakeMethod extends SourceMethod implements ISourceRange, IFakeEleme
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.core.internal.ast.models.dltk.IFakeElement#getLuaASTNode()

+	 * @see org.eclipse.ldt.core.internal.ast.models.dltk.IFakeElement#getLuaASTNode()

 	 */

 	@Override

 	public LuaASTNode getLuaASTNode() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/FakeParameter.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/FakeParameter.java
index 90d559d..9651af0 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/FakeParameter.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/FakeParameter.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.dltk;

+package org.eclipse.ldt.core.internal.ast.models.dltk;

 

 import org.eclipse.dltk.core.IParameter;

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/IFakeElement.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/IFakeElement.java
index 1886327..606a2b7 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/dltk/IFakeElement.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/dltk/IFakeElement.java
@@ -8,9 +8,9 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.dltk;

+package org.eclipse.ldt.core.internal.ast.models.dltk;

 

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 public interface IFakeElement {

 	LuaASTNode getLuaASTNode();

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Block.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Block.java
index 9b616fb..968e45b 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Block.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Block.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.dltk.ast.ASTVisitor;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 public class Block extends LuaASTNode {

 	private List<LocalVar> localVars = new ArrayList<LocalVar>();;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Call.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Call.java
index 9817de7..6b6883d 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Call.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Call.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

 import org.eclipse.dltk.ast.ASTVisitor;

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Identifier.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Identifier.java
index 9d59a6c..da787a0 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Identifier.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Identifier.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

 import org.eclipse.dltk.ast.ASTVisitor;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;

+import org.eclipse.ldt.core.internal.ast.models.api.Item;

 

 public class Identifier extends LuaExpression {

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Index.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Index.java
index ac75eba..9373fa9 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Index.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Index.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

 import org.eclipse.dltk.ast.ASTVisitor;

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Invoke.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Invoke.java
index 5e53510..a607809 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/Invoke.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/Invoke.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

 import org.eclipse.dltk.ast.ASTVisitor;

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/LocalVar.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/LocalVar.java
index 1549fae..a22c29b 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/LocalVar.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/LocalVar.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

 import org.eclipse.dltk.ast.ASTVisitor;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.api.Item;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 public class LocalVar extends LuaASTNode {

 	private final Item var;

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/LuaExpression.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/LuaExpression.java
index 43df372..f199b8f 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/LuaExpression.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/LuaExpression.java
@@ -8,9 +8,9 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 public abstract class LuaExpression extends LuaASTNode {

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/LuaInternalContent.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/LuaInternalContent.java
index 84623b8..3049e3b 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/models/file/LuaInternalContent.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/models/file/LuaInternalContent.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.models.file;

+package org.eclipse.ldt.core.internal.ast.models.file;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.dltk.ast.ASTVisitor;

-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;

+import org.eclipse.ldt.core.internal.ast.models.api.Item;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;

 

 public class LuaInternalContent extends LuaASTNode {

 	private List<Item> unknownglovalvars = new ArrayList<Item>();

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/EncodingVisitor.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/EncodingVisitor.java
index fa40d1f..12624e9 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/EncodingVisitor.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/EncodingVisitor.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.parser;
+package org.eclipse.ldt.core.internal.ast.parser;
 
 import org.eclipse.dltk.ast.ASTNode;
 import org.eclipse.dltk.ast.ASTVisitor;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaASTNode;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LocalVar;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaASTNode;
+import org.eclipse.ldt.core.internal.ast.models.file.LocalVar;
 
 /**
  * Here, we do the matching between Lua byte based offsets and Java character based offsets.
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceElementParser.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceElementParser.java
index 39cfecb..4315934 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceElementParser.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceElementParser.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.parser;
+package org.eclipse.ldt.core.internal.ast.parser;
 
 import org.eclipse.dltk.compiler.SourceElementRequestVisitor;
 import org.eclipse.dltk.core.AbstractSourceElementParser;
-import org.eclipse.koneki.ldt.core.LuaNature;
+import org.eclipse.ldt.core.LuaNature;
 
 public class LuaSourceElementParser extends AbstractSourceElementParser {
 
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceElementRequestorVisitor.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceElementRequestorVisitor.java
index d19f65c..08a2d0a 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceElementRequestorVisitor.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceElementRequestorVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless  initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.parser;
+package org.eclipse.ldt.core.internal.ast.parser;
 
 import java.util.List;
 
@@ -20,18 +20,18 @@ import org.eclipse.dltk.compiler.IElementRequestor.MethodInfo;
 import org.eclipse.dltk.compiler.IElementRequestor.TypeInfo;
 import org.eclipse.dltk.compiler.ISourceElementRequestor;
 import org.eclipse.dltk.compiler.SourceElementRequestVisitor;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaASTUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.ExternalTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.FunctionTypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.InlineTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.InternalTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Item;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.Parameter;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.PrimitiveTypeRef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.RecordTypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.TypeDef;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.Block;
+import org.eclipse.ldt.core.internal.ast.models.LuaASTUtils;
+import org.eclipse.ldt.core.internal.ast.models.api.ExternalTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.FunctionTypeDef;
+import org.eclipse.ldt.core.internal.ast.models.api.InlineTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.InternalTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.Item;
+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;
+import org.eclipse.ldt.core.internal.ast.models.api.Parameter;
+import org.eclipse.ldt.core.internal.ast.models.api.PrimitiveTypeRef;
+import org.eclipse.ldt.core.internal.ast.models.api.RecordTypeDef;
+import org.eclipse.ldt.core.internal.ast.models.api.TypeDef;
+import org.eclipse.ldt.core.internal.ast.models.file.Block;
 
 /**
  * traverse the Lua AST of a file to extract the DLTK model.
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceParser.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceParser.java
index 4243f1d..d7e71b0 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceParser.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceParser.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.parser;
+package org.eclipse.ldt.core.internal.ast.parser;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -27,12 +27,12 @@ import org.eclipse.dltk.core.IModelElement;
 import org.eclipse.dltk.core.IModelElementDelta;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
-import org.eclipse.koneki.ldt.core.LuaUtils;
-import org.eclipse.koneki.ldt.core.internal.Activator;
-import org.eclipse.koneki.ldt.core.internal.ast.models.LuaDLTKModelUtils;
-import org.eclipse.koneki.ldt.core.internal.ast.models.api.LuaFileAPI;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.models.file.LuaInternalContent;
+import org.eclipse.ldt.core.LuaUtils;
+import org.eclipse.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.internal.ast.models.LuaDLTKModelUtils;
+import org.eclipse.ldt.core.internal.ast.models.api.LuaFileAPI;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.models.file.LuaInternalContent;
 import org.eclipse.osgi.util.NLS;
 
 /**
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceParserFactory.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceParserFactory.java
index 0896471..30b974c 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/LuaSourceParserFactory.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/LuaSourceParserFactory.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.core.internal.ast.parser;
+package org.eclipse.ldt.core.internal.ast.parser;
 
 import org.eclipse.dltk.ast.parser.ISourceParser;
 import org.eclipse.dltk.ast.parser.ISourceParserFactory;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/ModelsBuilderLuaModule.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/ModelsBuilderLuaModule.java
index e0d6bcf..74dae28 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/ModelsBuilderLuaModule.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/ModelsBuilderLuaModule.java
@@ -8,17 +8,17 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.ast.parser;

+package org.eclipse.ldt.core.internal.ast.parser;

 

 import java.util.ArrayList;

 import java.util.List;

 

-import org.eclipse.koneki.ldt.core.internal.Activator;

-import org.eclipse.koneki.ldt.core.internal.ast.models.APIModelFactory;

-import org.eclipse.koneki.ldt.core.internal.ast.models.InternalModelFactory;

-import org.eclipse.koneki.ldt.core.internal.ast.models.ModelFactory;

-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;

-import org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule;

+import org.eclipse.ldt.core.internal.Activator;

+import org.eclipse.ldt.core.internal.ast.models.APIModelFactory;

+import org.eclipse.ldt.core.internal.ast.models.InternalModelFactory;

+import org.eclipse.ldt.core.internal.ast.models.ModelFactory;

+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;

+import org.eclipse.ldt.metalua.AbstractMetaLuaModule;

 

 import com.naef.jnlua.LuaState;

 

@@ -52,7 +52,7 @@ public class ModelsBuilderLuaModule extends AbstractMetaLuaModule {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule#createLuaState()

+	 * @see org.eclipse.ldt.metalua.AbstractMetaLuaModule#createLuaState()

 	 */

 	@Override

 	protected LuaState createLuaState() {

@@ -64,7 +64,7 @@ public class ModelsBuilderLuaModule extends AbstractMetaLuaModule {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule#getMetaLuaSourcePath()

+	 * @see org.eclipse.ldt.metalua.AbstractMetaLuaModule#getMetaLuaSourcePath()

 	 */

 	@Override

 	protected List<String> getMetaLuaSourcePaths() {

@@ -82,7 +82,7 @@ public class ModelsBuilderLuaModule extends AbstractMetaLuaModule {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule#getPluginID()

+	 * @see org.eclipse.ldt.metalua.AbstractMetaLuaModule#getPluginID()

 	 */

 	@Override

 	protected String getPluginID() {

@@ -90,7 +90,7 @@ public class ModelsBuilderLuaModule extends AbstractMetaLuaModule {
 	}

 

 	/**

-	 * @see org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule#getModuleName()

+	 * @see org.eclipse.ldt.metalua.AbstractMetaLuaModule#getModuleName()

 	 */

 	@Override

 	protected String getModuleName() {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/OffsetFixer.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/OffsetFixer.java
index 1844985..22c3c88 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/ast/parser/OffsetFixer.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/ast/parser/OffsetFixer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.ast.parser;
+package org.eclipse.ldt.core.internal.ast.parser;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironment.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironment.java
index 76cce87..3d3b9f3 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironment.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironment.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.buildpath;

+package org.eclipse.ldt.core.internal.buildpath;

 

 import java.util.Map;

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainer.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainer.java
index 6824a30..974b939 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainer.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.buildpath;

+package org.eclipse.ldt.core.internal.buildpath;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -21,7 +21,7 @@ import org.eclipse.dltk.core.IBuildpathAttribute;
 import org.eclipse.dltk.core.IBuildpathContainer;

 import org.eclipse.dltk.core.IBuildpathEntry;

 import org.eclipse.dltk.internal.core.BuildpathEntry;

-import org.eclipse.koneki.ldt.core.internal.Activator;

+import org.eclipse.ldt.core.internal.Activator;

 

 @SuppressWarnings("restriction")

 public class LuaExecutionEnvironmentBuildpathContainer implements IBuildpathContainer {

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainerInitializer.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainerInitializer.java
index 928760b..2cbcbc9 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainerInitializer.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathContainerInitializer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.buildpath;
+package org.eclipse.ldt.core.internal.buildpath;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathUtil.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathUtil.java
index af255e7..532cc66 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathUtil.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentBuildpathUtil.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.buildpath;

+package org.eclipse.ldt.core.internal.buildpath;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.dltk.core.environment.EnvironmentManager;

 import org.eclipse.dltk.core.environment.EnvironmentPathUtils;

 import org.eclipse.dltk.core.environment.IEnvironment;

-import org.eclipse.koneki.ldt.core.internal.Activator;

+import org.eclipse.ldt.core.internal.Activator;

 

 public final class LuaExecutionEnvironmentBuildpathUtil {

 

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentConstants.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentConstants.java
index 8fba0f1..7e4c97c 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentConstants.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentConstants.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.buildpath;
+package org.eclipse.ldt.core.internal.buildpath;
 
 public interface LuaExecutionEnvironmentConstants {
 	public String PREF_EXECUTION_ENVIRONMENTS_LIST = "executionEnvironments"; //$NON-NLS-1$
 	public String EXECUTION_ENVIRONMENTS_LIST_SEPARATOR = ";"; //$NON-NLS-1$
-	public String PREFERENCE_PAGE_ID = "org.eclipse.koneki.ldt.ui.executionenvironmentpreferencepage"; //$NON-NLS-1$
+	public String PREFERENCE_PAGE_ID = "org.eclipse.ldt.ui.executionenvironmentpreferencepage"; //$NON-NLS-1$
 	public String FILE_EXTENSION = "*.zip"; //$NON-NLS-1$
 	public String MANIFEST_EXTENSION = ".rockspec"; //$NON-NLS-1$
-	public String CONTAINER_PATH_START = "org.eclipse.koneki.ldt.ExecutionEnvironmentContainer"; //$NON-NLS-1$
+	public String CONTAINER_PATH_START = "org.eclipse.ldt.ExecutionEnvironmentContainer"; //$NON-NLS-1$
 	public String EE_FILE_API_ARCHIVE = "api.zip"; //$NON-NLS-1$
 	public String EE_FILE_DOCS_FOLDER = "docs/"; //$NON-NLS-1$
 	public String EE_FILE_DOCS_INDEX = "index.html"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentManager.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentManager.java
index be95d3b..08c8d56 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/LuaExecutionEnvironmentManager.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/LuaExecutionEnvironmentManager.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.internal.buildpath;

+package org.eclipse.ldt.core.internal.buildpath;

 

 import java.io.BufferedInputStream;

 import java.io.File;

@@ -45,7 +45,7 @@ import org.eclipse.dltk.core.IBuildpathContainer;
 import org.eclipse.dltk.core.IBuildpathEntry;

 import org.eclipse.dltk.core.IScriptProject;

 import org.eclipse.dltk.core.ModelException;

-import org.eclipse.koneki.ldt.core.internal.Activator;

+import org.eclipse.ldt.core.internal.Activator;

 import org.eclipse.osgi.util.NLS;

 import org.osgi.framework.Bundle;

 

@@ -54,7 +54,7 @@ import com.naef.jnlua.LuaState;
 

 public final class LuaExecutionEnvironmentManager {

 

-	private static final String EXTENSION_POINT_ID = "org.eclipse.koneki.ldt.executionEnvironment"; //$NON-NLS-1$

+	private static final String EXTENSION_POINT_ID = "org.eclipse.ldt.executionEnvironment"; //$NON-NLS-1$

 	private static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$

 	private static final String ATTRIBUTE_VERSION = "version"; //$NON-NLS-1$

 	private static final String ATTRIBUTE_RESOURCEDIRECTORY = "resourcedirectory"; //$NON-NLS-1$

diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/Messages.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/Messages.java
index 00199d2..27761f5 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/Messages.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.buildpath;
+package org.eclipse.ldt.core.internal.buildpath;
 
 import org.eclipse.osgi.util.NLS;
 
 public final class Messages extends NLS {
 	// CHECKSTYLE NLS: OFF
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.core.internal.buildpath.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.core.internal.buildpath.messages"; //$NON-NLS-1$
 
 	public static String LuaExecutionEnvironmentBuildpathContainerEENotFound;
 
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/messages.properties b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/messages.properties
index e84198a..e84198a 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/buildpath/messages.properties
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/buildpath/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/LuaFormatterException.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/LuaFormatterException.java
index 1b6f3b0..ddae584 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/LuaFormatterException.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/LuaFormatterException.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.formatter;
+package org.eclipse.ldt.core.internal.formatter;
 
 public class LuaFormatterException extends Exception {
 	private static final long serialVersionUID = -6874143023474176808L;
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/LuaFormatterModule.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/LuaFormatterModule.java
index dbc44aa..7c8a135 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/LuaFormatterModule.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/LuaFormatterModule.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.formatter;
+package org.eclipse.ldt.core.internal.formatter;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.koneki.ldt.core.internal.Activator;
-import org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule;
+import org.eclipse.ldt.core.internal.Activator;
+import org.eclipse.ldt.metalua.AbstractMetaLuaModule;
 
 import com.naef.jnlua.LuaRuntimeException;
 import com.naef.jnlua.LuaState;
@@ -149,7 +149,7 @@ public final class LuaFormatterModule extends AbstractMetaLuaModule {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule#getMetaLuaSourcePaths()
+	 * @see org.eclipse.ldt.metalua.AbstractMetaLuaModule#getMetaLuaSourcePaths()
 	 */
 	@Override
 	protected List<String> getMetaLuaSourcePaths() {
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/Messages.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/Messages.java
index de591a7..5e74553 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/Messages.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.internal.formatter;
+package org.eclipse.ldt.core.internal.formatter;
 
 import org.eclipse.osgi.util.NLS;
 
 //CHECKSTYLE NLS: OFF
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.koneki.ldt.core.internal.formatter.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.ldt.core.internal.formatter.messages"; //$NON-NLS-1$
 	public static String LuaSourceFormatDepthError;
 	public static String LuaSourceFormatIndentationError;
 	static {
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/messages.properties b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/messages.properties
index 199cf66..199cf66 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/formatter/messages.properties
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/formatter/messages.properties
diff --git a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/todo/LuaTodoParserType.java b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/todo/LuaTodoParserType.java
index 139f873..2e45c85 100644
--- a/plugins/org.eclipse.koneki.ldt/src/org/eclipse/koneki/ldt/core/internal/todo/LuaTodoParserType.java
+++ b/plugins/org.eclipse.ldt/src/org/eclipse/ldt/core/internal/todo/LuaTodoParserType.java
@@ -9,14 +9,14 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.core.internal.todo;
+package org.eclipse.ldt.core.internal.todo;
 
 import org.eclipse.dltk.compiler.task.ITodoTaskPreferences;
 import org.eclipse.dltk.compiler.task.TodoTaskPreferencesOnPreferenceLookupDelegate;
 import org.eclipse.dltk.core.IScriptProject;
 import org.eclipse.dltk.core.builder.AbstractTodoTaskBuildParticipantType;
 import org.eclipse.dltk.core.builder.IBuildParticipant;
-import org.eclipse.koneki.ldt.core.internal.Activator;
+import org.eclipse.ldt.core.internal.Activator;
 
 public class LuaTodoParserType extends AbstractTodoTaskBuildParticipantType {
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 7f2aa22..8667df7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -4,10 +4,10 @@
   <modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>aggregator</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
+  <groupId>org.eclipse.ldt</groupId>
   <artifactId>plugins</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -25,18 +25,18 @@
     <module>com.naef.jnlua.windows-lua52</module>
     <module>com.naef.jnlua.windows64-lua51</module>
     <module>com.naef.jnlua.windows64-lua52</module>
-    <module>org.eclipse.koneki.ldt</module>
-    <module>org.eclipse.koneki.ldt.branding</module>
-    <module>org.eclipse.koneki.ldt.doc.user</module>
-    <module>org.eclipse.koneki.ldt.metalua</module>
-    <module>org.eclipse.koneki.ldt.ui</module>
-    <module>org.eclipse.koneki.ldt.debug.core</module>
-    <module>org.eclipse.koneki.ldt.debug.ui</module>
-    <module>org.eclipse.koneki.ldt.support.lua51</module>
-    <module>org.eclipse.koneki.ldt.support.lua52</module>
-    <module>org.eclipse.koneki.ldt.remote.core</module>
-    <module>org.eclipse.koneki.ldt.remote.ui</module>
-    <module>org.eclipse.koneki.ldt.remote.debug.core</module>
-    <module>org.eclipse.koneki.ldt.remote.debug.ui</module>
+    <module>org.eclipse.ldt</module>
+    <module>org.eclipse.ldt.branding</module>
+    <module>org.eclipse.ldt.doc.user</module>
+    <module>org.eclipse.ldt.metalua</module>
+    <module>org.eclipse.ldt.ui</module>
+    <module>org.eclipse.ldt.debug.core</module>
+    <module>org.eclipse.ldt.debug.ui</module>
+    <module>org.eclipse.ldt.support.lua51</module>
+    <module>org.eclipse.ldt.support.lua52</module>
+    <module>org.eclipse.ldt.remote.core</module>
+    <module>org.eclipse.ldt.remote.ui</module>
+    <module>org.eclipse.ldt.remote.debug.core</module>
+    <module>org.eclipse.ldt.remote.debug.ui</module>
   </modules>
 </project>
diff --git a/pom.xml b/pom.xml
index 614df9e..2c486e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>aggregator</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
@@ -223,7 +223,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<resolver>p2</resolver>
-					<!-- <target> <artifact> <groupId>org.eclipse.koneki.ldt</groupId> <artifactId>target-platform</artifactId> 
+					<!-- <target> <artifact> <groupId>org.eclipse.ldt</groupId> <artifactId>target-platform</artifactId> 
 						<version>0.0.1-SNAPSHOT</version> <classifier>ldt</classifier> </artifact> 
 						</target> -->
 					<ignoreTychoRepositories>true</ignoreTychoRepositories>
@@ -262,7 +262,7 @@
 				<artifactId>maven-checkstyle-plugin</artifactId>
 				<version>2.8</version>
 				<configuration>
-					<configLocation>http://download.eclipse.org/koneki/releng/checkstyle.xml</configLocation>
+					<configLocation>http://download.eclipse.org/ldt/releng/checkstyle.xml</configLocation>
 					<sourceDirectory>src</sourceDirectory>
 					<excludes>**/com/naef/jnlua/**/*</excludes>
 				</configuration>
diff --git a/product/.project b/product/.project
index 1287b84..13d51f0 100644
--- a/product/.project
+++ b/product/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.product</name>
+	<name>org.eclipse.ldt.product</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/product/category.xml b/product/category.xml
index 4ee0f5c..edc5156 100644
--- a/product/category.xml
+++ b/product/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <site>

-   <feature url="features/org.eclipse.koneki.ldt_1.3.0.qualifier.jar" id="org.eclipse.koneki.ldt" version="1.3.0.qualifier">

+   <feature url="features/org.eclipse.ldt_1.3.0.qualifier.jar" id="org.eclipse.ldt" version="1.3.0.qualifier">

       <category name="ldt"/>

    </feature>

-   <feature url="features/org.eclipse.koneki.ldt.remote_1.3.0.qualifier.jar" id="org.eclipse.koneki.ldt.remote" version="1.3.0.qualifier">

+   <feature url="features/org.eclipse.ldt.remote_1.3.0.qualifier.jar" id="org.eclipse.ldt.remote" version="1.3.0.qualifier">

       <category name="ldt"/>

    </feature>

    <category-def name="ldt" label="Lua Development Tools"/>

diff --git a/product/notbuiltproduct/org.eclipse.koneki.ldt.remote.product b/product/notbuiltproduct/org.eclipse.ldt.remote.product
index 51e5f03..b7fa305 100644
--- a/product/notbuiltproduct/org.eclipse.koneki.ldt.remote.product
+++ b/product/notbuiltproduct/org.eclipse.ldt.remote.product
@@ -1,78 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?pde version="3.5"?>

-

-<product name="Lua Development Tools Product Remote" uid="org.eclipse.koneki.ldt.remote-product" id="org.eclipse.koneki.ldt.branding.product" application="org.eclipse.ui.ide.workbench" version="0.9.0.qualifier" useFeatures="true" includeLaunchers="true">

-

-   <aboutInfo>

-      <image path="/org.eclipse.koneki.ldt.branding/ldt_about.png"/>

-      <text>

+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Lua Development Tools Product Remote" uid="org.eclipse.ldt.remote-product" id="org.eclipse.ldt.branding.product" application="org.eclipse.ui.ide.workbench" version="0.9.0.qualifier" useFeatures="true" includeLaunchers="true">
+
+   <aboutInfo>
+      <image path="/org.eclipse.ldt.branding/ldt_about.png"/>
+      <text>
          Lua Development Tools
 
 © Copyright Eclipse contributors and others 2000, 2012.  All rights reserved.
 
 This product includes software developed by the Apache Software Foundation http://www.apache.org/
 
-Visit http://www.eclipse.org/koneki/ldt for more information.

-      </text>

-   </aboutInfo>

-

-   <configIni use="default">

-   </configIni>

-

-   <launcherArgs>

+Visit http://www.eclipse.org/ldt for more information.
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
       <programArgs>-name
 &quot;Lua Development Tools&quot;
 --launcher.XXMaxPermSize
 256m
 --launcher.defaultAction
-openFile</programArgs>

+openFile</programArgs>
       <programArgsLin>-startup
-plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsLin>

+plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsLin>
       <programArgsMac>-startup
-../../../plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsMac>

+../../../plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsMac>
       <programArgsWin>-startup
-plugins\org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsWin>

-      <vmArgs>-XX:PermSize=512M -XX:MaxPermSize=512M -Xms40m -Xmx512m</vmArgs>

-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>

-   </launcherArgs>

-

-   <windowImages i16="/org.eclipse.koneki.ldt.branding/icons/LDT_16.png" i32="/org.eclipse.koneki.ldt.branding/icons/LDT_32.png" i64="/org.eclipse.koneki.ldt.branding/icons/LDT_64.png" i128="/org.eclipse.koneki.ldt.branding/icons/LDT_128.png"/>

-

-   <splash

-      location="org.eclipse.koneki.ldt.branding"

-      startupProgressRect="3,281,493,14"

-      startupMessageRect="7,260,350,20"

-      startupForegroundColor="D4BAA9" />

-   <launcher name="LuaDevelopmentTools">

-      <linux icon="../../../../plugins/org.eclipse.koneki.ldt.branding/icons/ldt.xpm"/>

-      <macosx icon="../../../../plugins/org.eclipse.koneki.ldt.branding/icons/ldt.icns"/>

-      <solaris/>

-      <win useIco="true">

-         <ico path="../../../../plugins/org.eclipse.koneki.ldt.branding/icons/ldt.ico"/>

-         <bmp/>

-      </win>

-   </launcher>

-

-   <vm>

-   </vm>

-

-   <plugins>

-   </plugins>

-

-   <features>

-      <feature id="org.eclipse.koneki.ldt.product"/>

-      <feature id="org.eclipse.koneki.ldt.remote"/>

-      <feature id="org.eclipse.rse"/>

-   </features>

-

-   <configurations>

-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />

-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />

-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />

-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />

-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />

-      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4" />

-      <property name="org.eclipse.update.reconcile" value="false" />

-   </configurations>

-

-</product>

+plugins\org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsWin>
+      <vmArgs>-XX:PermSize=512M -XX:MaxPermSize=512M -Xms40m -Xmx512m</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="/org.eclipse.ldt.branding/icons/LDT_16.png" i32="/org.eclipse.ldt.branding/icons/LDT_32.png" i64="/org.eclipse.ldt.branding/icons/LDT_64.png" i128="/org.eclipse.ldt.branding/icons/LDT_128.png"/>
+
+   <splash
+      location="org.eclipse.ldt.branding"
+      startupProgressRect="3,281,493,14"
+      startupMessageRect="7,260,350,20"
+      startupForegroundColor="D4BAA9" />
+   <launcher name="LuaDevelopmentTools">
+      <linux icon="../../../../plugins/org.eclipse.ldt.branding/icons/ldt.xpm"/>
+      <macosx icon="../../../../plugins/org.eclipse.ldt.branding/icons/ldt.icns"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="../../../../plugins/org.eclipse.ldt.branding/icons/ldt.ico"/>
+         <bmp/>
+      </win>
+   </launcher>
+
+
+   <vm>
+   </vm>
+
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.eclipse.ldt.product"/>
+      <feature id="org.eclipse.ldt.remote"/>
+      <feature id="org.eclipse.rse"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+   </configurations>
+
+</product>
diff --git a/product/org.eclipse.koneki.ldt.product b/product/org.eclipse.ldt.product
index 852b5ed..4e6d17b 100644
--- a/product/org.eclipse.koneki.ldt.product
+++ b/product/org.eclipse.ldt.product
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Lua Development Tools Product" uid="org.eclipse.koneki.ldt.product-product" id="org.eclipse.koneki.ldt.branding.product" application="org.eclipse.ui.ide.workbench" version="1.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Lua Development Tools Product" uid="org.eclipse.ldt.product-product" id="org.eclipse.ldt.branding.product" application="org.eclipse.ui.ide.workbench" version="1.3.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
-      <image path="/org.eclipse.koneki.ldt.branding/ldt_about.png"/>
+      <image path="/org.eclipse.ldt.branding/ldt_about.png"/>
       <text>
          Lua Development Tools
 
@@ -36,19 +36,19 @@ plugins\org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsW
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
-   <windowImages i16="/org.eclipse.koneki.ldt.branding/icons/LDT_16.png" i32="/org.eclipse.koneki.ldt.branding/icons/LDT_32.png" i48="/org.eclipse.koneki.ldt.branding/icons/LDT_48.png" i64="/org.eclipse.koneki.ldt.branding/icons/LDT_64.png" i128="/org.eclipse.koneki.ldt.branding/icons/LDT_128.png"/>
+   <windowImages i16="/org.eclipse.ldt.branding/icons/LDT_16.png" i32="/org.eclipse.ldt.branding/icons/LDT_32.png" i48="/org.eclipse.ldt.branding/icons/LDT_48.png" i64="/org.eclipse.ldt.branding/icons/LDT_64.png" i128="/org.eclipse.ldt.branding/icons/LDT_128.png"/>
 
    <splash
-      location="org.eclipse.koneki.ldt.branding"
+      location="org.eclipse.ldt.branding"
       startupProgressRect="2,290,448,10"
       startupMessageRect="7,265,320,20"
       startupForegroundColor="9C9696" />
    <launcher name="LuaDevelopmentTools">
-      <linux icon="../../../../plugins/org.eclipse.koneki.ldt.branding/icons/ldt.xpm"/>
-      <macosx icon="../../../../plugins/org.eclipse.koneki.ldt.branding/icons/ldt.icns"/>
+      <linux icon="../../../../plugins/org.eclipse.ldt.branding/icons/ldt.xpm"/>
+      <macosx icon="../../../../plugins/org.eclipse.ldt.branding/icons/ldt.icns"/>
       <solaris/>
       <win useIco="true">
-         <ico path="../../../../plugins/org.eclipse.koneki.ldt.branding/icons/ldt.ico"/>
+         <ico path="../../../../plugins/org.eclipse.ldt.branding/icons/ldt.ico"/>
          <bmp/>
       </win>
    </launcher>
@@ -61,7 +61,7 @@ plugins\org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar</programArgsW
    </plugins>
 
    <features>
-      <feature id="org.eclipse.koneki.ldt.product" version="1.3.0.qualifier"/>
+      <feature id="org.eclipse.ldt.product" version="1.3.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/product/pom.xml b/product/pom.xml
index 5826987..6209b03 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>aggregator</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
-	<artifactId>org.eclipse.koneki.ldt.product-product</artifactId>
+	<groupId>org.eclipse.ldt</groupId>
+	<artifactId>org.eclipse.ldt.product-product</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
@@ -34,8 +34,8 @@
 					</formats>
 					<products>
 						<product>
-							<id>org.eclipse.koneki.ldt.product-product</id>			
-							<archiveFileName>org.eclipse.koneki.ldt.product</archiveFileName>
+							<id>org.eclipse.ldt.product-product</id>			
+							<archiveFileName>org.eclipse.ldt.product</archiveFileName>
 						</product>
 					</products>
 				</configuration>
diff --git a/repository/category.xml b/repository/category.xml
index 9c094e9..32a4b6b 100644
--- a/repository/category.xml
+++ b/repository/category.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<feature url="features/org.eclipse.koneki.ldt_0.9.0.qualifier.jar" id="org.eclipse.koneki.ldt" version="0.9.0.qualifier">
-		<category name="ldt"/>
-	</feature>
-	<feature url="features/org.eclipse.koneki.ldt.source_0.9.0.qualifier.jar" id="org.eclipse.koneki.ldt.source" version="0.9.0.qualifier">
-		<category name="ldt"/>
-	</feature>
-	<category-def name="ldt" label="Lua Development Tools - Koneki"/>
+   <feature url="features/org.eclipse.ldt_0.9.0.qualifier.jar" id="org.eclipse.ldt" version="0.9.0.qualifier">
+      <category name="ldt"/>
+   </feature>
+   <feature url="features/org.eclipse.ldt.source_0.9.0.qualifier.jar" id="org.eclipse.ldt.source" version="0.9.0.qualifier">
+      <category name="ldt"/>
+   </feature>
+   <category-def name="ldt" label="Lua Development Tools"/>
 </site>
diff --git a/repository/pom.xml b/repository/pom.xml
index 530d65c..ef928fe 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>aggregator</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>repository</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
@@ -22,84 +22,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>deploy-nightly-update-site</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.dash.maven</groupId>
-						<artifactId>eclipse-signing-maven-plugin</artifactId>
-						<version>1.0.5</version>
-						<executions>
-							<execution>
-								<id>pack</id>
-								<configuration>
-									<inputFile>${project.build.directory}/repository-0.0.1-SNAPSHOT.zip</inputFile>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>sign</id>
-								<configuration>
-									<inputFile>${project.build.directory}/repository-0.0.1-SNAPSHOT.zip</inputFile>
-									<signerInputDirectory>/home/data/httpd/download-staging.priv/technology/koneki</signerInputDirectory>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>repack</id>
-								<configuration>
-									<inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>fixCheckSums</id>
-								<phase>package</phase>
-								<goals>
-									<goal>fixCheckSums</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>deploy</id>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<delete includeemptydirs="false">
-											<fileset dir="${download-publish-path}">
-												<include name="**"/>
-											</fileset>
-										</delete>
-										<copy includeemptydirs="false" todir="${download-publish-path}">
-											<fileset dir="target/checksumFix">
-												<include name="**"/>
-											</fileset>
-										</copy>
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/target-platform/pom.xml b/target-platform/pom.xml
index b348b5f..3338143 100644
--- a/target-platform/pom.xml
+++ b/target-platform/pom.xml
@@ -5,10 +5,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>aggregator</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>target-platform</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.checkstyle b/tests/org.eclipse.koneki.ldt.core.tests/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/tests/org.eclipse.koneki.ldt.core.tests/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.koneki.ldt.core.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index f6df4db..0000000
--- a/tests/org.eclipse.koneki.ldt.core.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.koneki.ldt.core.parser.tests
-Bundle-Name = LDT Core Tests
-Bundle-Vendor = Eclipse Koneki
\ No newline at end of file
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.checkstyle b/tests/org.eclipse.koneki.ldt.jnlua.tests/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.project b/tests/org.eclipse.koneki.ldt.jnlua.tests/.project
deleted file mode 100644
index b233634..0000000
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.koneki.ldt.jnlua.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

-	</natures>

-</projectDescription>

diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.koneki.ldt.jnlua.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 719469e..0000000
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.koneki.ldt.lua.tests
-Bundle-Name = Jnlua integration Tests
-Bundle-Vendor = Eclipse Koneki
\ No newline at end of file
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.checkstyle b/tests/org.eclipse.koneki.ldt.lua.tests/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.koneki.ldt.lua.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 938d69e..0000000
--- a/tests/org.eclipse.koneki.ldt.lua.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.lua.tests;singleton:=true
-Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.koneki.ldt.lua.tests.internal.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.text;bundle-version="3.5.0",
- org.junit;bundle-version="4.5.0",
- org.eclipse.koneki.ldt.metalua;bundle-version="0.9.0",
- org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.formatter;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt;bundle-version="0.9.0",
- com.cforcoding.jmd;bundle-version="0.8.1",
- com.naef.jnlua;bundle-version="[0.9.1,1.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: diff.match.patch;x-internal:=true,
- org.eclipse.koneki.ldt.lua.tests,
- org.eclipse.koneki.ldt.lua.tests.internal;x-internal:=true,
- org.eclipse.koneki.ldt.lua.tests.internal.ast.models.api;x-internal:=true,
- org.eclipse.koneki.ldt.lua.tests.internal.ast.models.internal;x-internal:=true,
- org.eclipse.koneki.ldt.lua.tests.internal.formatter;x-internal:=true,
- org.eclipse.koneki.ldt.lua.tests.internal.template.engine;x-internal:=true,
- org.eclipse.koneki.ldt.lua.tests.internal.utils;x-internal:=true
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ClassPath: libjava/dmp.jar,
- .
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.koneki.ldt.lua.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 797d371..0000000
--- a/tests/org.eclipse.koneki.ldt.lua.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.koneki.ldt.parser.apimodel.tests
-Bundle-Name = Lua Tests
-Bundle-Vendor = Eclipse Koneki
\ No newline at end of file
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/link.lua b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/link.lua
deleted file mode 100644
index 473064e..0000000
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/link.lua
+++ /dev/null
@@ -1,8 +0,0 @@
----
--- Module to process.
---
--- This is an [example link](http://eclipse.org/koneki/ldt).
---
--- @module link
-
-return nil
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/link2.lua b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/link2.lua
deleted file mode 100644
index e9c9147..0000000
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/link2.lua
+++ /dev/null
@@ -1,8 +0,0 @@
----
--- Module to process.
---
--- This is an [example link](http://eclipse.org/koneki/ldt "link title").
---
--- @module link2
-
-return nil
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.checkstyle b/tests/org.eclipse.koneki.ldt.metalua.tests/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.tests/.checkstyle b/tests/org.eclipse.koneki.ldt.tests/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/tests/org.eclipse.koneki.ldt.tests/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.checkstyle b/tests/org.eclipse.koneki.ldt.ui.tests/.checkstyle
deleted file mode 100644
index 3bf8bc7..0000000
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Koneki Coding Conventions" location="http://download.eclipse.org/koneki/releng/checkstyle.xml" type="remote" description="">
-    <additional-data name="cache-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Koneki Coding Conventions" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8edc1b6..0000000
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Koneki
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.koneki.ldt.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 9653124..0000000
--- a/tests/org.eclipse.koneki.ldt.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.ui.tests;singleton:=true
-Bundle-Version: 0.1.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.junit;bundle-version="4.5.0",
- org.eclipse.jface.text;bundle-version="3.6.0",
- org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt;bundle-version="0.9.0",
- org.eclipse.koneki.ldt.ui;bundle-version="0.9.0",
- org.apache.commons.io;bundle-version="1.4.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.ui.tests,
- org.eclipse.koneki.ldt.ui.tests.internal;x-internal:=true,
- org.eclipse.koneki.ldt.ui.tests.internal.autoedit;x-internal:=true,
- org.eclipse.koneki.ldt.ui.tests.internal.scanners;x-internal:=true,
- org.eclipse.koneki.ldt.ui.tests.internal.rules;x-internal:=true
-Bundle-Activator: org.eclipse.koneki.ldt.ui.tests.internal.Activator
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.koneki.ldt.ui.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 123c507..0000000
--- a/tests/org.eclipse.koneki.ldt.ui.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.koneki.ldt.ui.tests
-Bundle-Name = LDT UI Tests
-Bundle-Vendor = Eclipse Koneki
\ No newline at end of file
diff --git a/tests/org.eclipse.ldt.core.tests/.checkstyle b/tests/org.eclipse.ldt.core.tests/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/tests/org.eclipse.ldt.core.tests/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.classpath b/tests/org.eclipse.ldt.core.tests/.classpath
index ad32c83..ad32c83 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/.classpath
+++ b/tests/org.eclipse.ldt.core.tests/.classpath
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.fbprefs b/tests/org.eclipse.ldt.core.tests/.fbprefs
index 968afbf..968afbf 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/.fbprefs
+++ b/tests/org.eclipse.ldt.core.tests/.fbprefs
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.project b/tests/org.eclipse.ldt.core.tests/.project
index 974679f..2b31bf6 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.project
+++ b/tests/org.eclipse.ldt.core.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt.ui.tests</name>

+	<name>org.eclipse.ldt.core.tests</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.jdt.core.prefs
index 910ca67..910ca67 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.pde.core.prefs
+++ b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/.settings/org.eclipse.pde.prefs
+++ b/tests/org.eclipse.ldt.core.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ldt.core.tests/META-INF/MANIFEST.MF
index 8d720c6..3abe6e3 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ldt.core.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.core.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.core.tests;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
@@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.ui,
  org.junit;bundle-version="4.5.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.koneki.ldt;bundle-version="0.9.0"
+ org.eclipse.ldt;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.core.tests,
- org.eclipse.koneki.ldt.core.tests.internal.ast;x-internal:=true,
- org.eclipse.koneki.ldt.core.tests.internal.ast.utils;x-internal:=true
+Export-Package: org.eclipse.ldt.core.tests,
+ org.eclipse.ldt.core.tests.internal.ast;x-internal:=true,
+ org.eclipse.ldt.core.tests.internal.ast.utils;x-internal:=true
diff --git a/tests/org.eclipse.ldt.core.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.ldt.core.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..3c088f6
--- /dev/null
+++ b/tests/org.eclipse.ldt.core.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.ldt.core.parser.tests
+Bundle-Name = LDT Core Tests
+Bundle-Vendor = Eclipse LDT
\ No newline at end of file
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/build.properties b/tests/org.eclipse.ldt.core.tests/build.properties
index 36f3f4c..36f3f4c 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/build.properties
+++ b/tests/org.eclipse.ldt.core.tests/build.properties
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/pom.xml b/tests/org.eclipse.ldt.core.tests/pom.xml
index 71dad39..7c8d9e0 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/pom.xml
+++ b/tests/org.eclipse.ldt.core.tests/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.core.tests</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.core.tests</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <build>
@@ -34,7 +34,7 @@
 			<dependencies>
 					<dependency>
 						<type>p2-installable-unit</type>
-						<artifactId>org.eclipse.koneki.ldt.feature.group</artifactId>
+						<artifactId>org.eclipse.ldt.feature.group</artifactId>
 					</dependency>
 				</dependencies>   	
 			</configuration>
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/AllCoreTests.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/AllCoreTests.java
index 746b4c5..90944e1 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/AllCoreTests.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/AllCoreTests.java
@@ -8,9 +8,9 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.tests;

+package org.eclipse.ldt.core.tests;

 

-import org.eclipse.koneki.ldt.core.tests.internal.ast.AllASTTests;

+import org.eclipse.ldt.core.tests.internal.ast.AllASTTests;

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/AllASTTests.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/AllASTTests.java
index 6a0eef6..23316d9 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/AllASTTests.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/AllASTTests.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.core.tests.internal.ast;

+package org.eclipse.ldt.core.tests.internal.ast;

 

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestExpressions.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestExpressions.java
index 99d43ef..601c34e 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestExpressions.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestExpressions.java
@@ -15,7 +15,7 @@
  * $Author: kkinfoo $
  * $Id: TestExpressions.java 2161 2009-07-23 10:07:30Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
@@ -23,9 +23,9 @@ import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.ast.expressions.Expression;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.compiler.problem.IProblemReporter;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParser;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParser;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
 
 /**
  * The Class TestExpressions, tests if {@linkplain LuaSourceParser} can handle every kind of {@linkplain Expression} that Lua offers.
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestLuaBinaryOperations.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestLuaBinaryOperations.java
index edc8b5a..a74de0f 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestLuaBinaryOperations.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestLuaBinaryOperations.java
@@ -15,15 +15,15 @@
  * $Author: kkinfoo $
  * $Id: TestLuaBinaryOperations.java 2161 2009-07-23 10:07:30Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.compiler.problem.IProblemReporter;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
 
 /**
  * The Class TestLuaBinaryOperations. Aims to test implementation of Lua binary operations in the parser.
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestLuaSourceParser.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestLuaSourceParser.java
index 6312735..074c48a 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestLuaSourceParser.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestLuaSourceParser.java
@@ -15,15 +15,15 @@
  * $Author: kkinfoo $
  * $Id: TestLuaSourceParser.java 2161 2009-07-23 10:07:30Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.compiler.problem.IProblemReporter;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
 
 /**
  * The Class TestLuaSourceParser. Is the privileged entrance of the package. Allows to generate AST from source from a file or even straight from
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestModuleDeclaration.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestModuleDeclaration.java
index 6843da4..ba64a21 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestModuleDeclaration.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestModuleDeclaration.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
@@ -20,9 +20,9 @@ import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.ast.parser.ISourceParser;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.core.DLTKCore;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
 
 public class TestModuleDeclaration extends TestCase {
 
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestMultipleParsing.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestMultipleParsing.java
index aa3dff4..7180ef4 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestMultipleParsing.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestMultipleParsing.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
 import org.eclipse.dltk.ast.parser.ISourceParser;
 import org.eclipse.dltk.compiler.env.ModuleSource;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
 
 /**
  * Just checks if it is safe to parse several sources file simultaneously
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestSourceElementRequestVisitor.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestSourceElementRequestVisitor.java
index 4af2ff8..6fd299c 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestSourceElementRequestVisitor.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestSourceElementRequestVisitor.java
@@ -15,12 +15,12 @@
  * $Author$
  * $Id$
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceElementParser;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParser;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceElementParser;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParser;
 
 /**
  * The Class TestSourceElementRequestVisitor aims to provide a way to trace how AST from {@linkplain LuaSourceParser} behaves.
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestStatements.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestStatements.java
index accfbbc..2c81449 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestStatements.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestStatements.java
@@ -15,7 +15,7 @@
  * $Author: kkinfoo $
  * $Id: TestStatements.java 2161 2009-07-23 10:07:30Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import java.util.Random;
 
@@ -24,8 +24,8 @@ import junit.framework.TestCase;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.compiler.problem.IProblemReporter;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
 
 /**
  * The Class TestStatements aims to check full coverage of Lua's key words. In order to do so it checks every kind of statements of the language in
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestTables.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestTables.java
index 50c3ac0..38c5856 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestTables.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestTables.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.AbstractParserTest;
+import org.eclipse.ldt.core.tests.internal.ast.utils.AbstractParserTest;
 import org.junit.Test;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestUnaryOperations.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestUnaryOperations.java
index 4b020f6..12cb4bc 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestUnaryOperations.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestUnaryOperations.java
@@ -15,15 +15,15 @@
  * $Author: kkinfoo $
  * $Id: TestUnaryOperations.java 2161 2009-07-23 10:07:30Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.compiler.problem.IProblemReporter;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
 
 /**
  * The Class TestUnaryOperations checks implementation of Lua's unary operators in the parser.
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestVisitor.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestVisitor.java
index 77d085d..69ad93c 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/TestVisitor.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/TestVisitor.java
@@ -15,7 +15,7 @@
  * $Author: kkinfoo $
  * $Id: TestVisitor.java 2161 2009-07-23 10:07:30Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast;
+package org.eclipse.ldt.core.tests.internal.ast;
 
 import junit.framework.TestCase;
 
@@ -24,9 +24,9 @@ import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.ast.parser.ISourceParser;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.compiler.problem.IProblemReporter;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.DummyReporter;
-import org.eclipse.koneki.ldt.core.tests.internal.ast.utils.SpyVisitor;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.tests.internal.ast.utils.DummyReporter;
+import org.eclipse.ldt.core.tests.internal.ast.utils.SpyVisitor;
 
 /**
  * The Class TestVisitor checks how AST is can be walked through.
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/AbstractParserTest.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/AbstractParserTest.java
index f094775..ffd946c 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/AbstractParserTest.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/AbstractParserTest.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.tests.internal.ast.utils;
+package org.eclipse.ldt.core.tests.internal.ast.utils;
 
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
 import org.eclipse.dltk.ast.parser.ISourceParser;
 import org.eclipse.dltk.compiler.env.ModuleSource;
 import org.eclipse.dltk.compiler.problem.IProblemReporter;
-import org.eclipse.koneki.ldt.core.internal.ast.models.common.LuaSourceRoot;
-import org.eclipse.koneki.ldt.core.internal.ast.parser.LuaSourceParserFactory;
+import org.eclipse.ldt.core.internal.ast.models.common.LuaSourceRoot;
+import org.eclipse.ldt.core.internal.ast.parser.LuaSourceParserFactory;
 import org.junit.Assert;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/CollectVisitor.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/CollectVisitor.java
index 82f63ea..101e44f 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/CollectVisitor.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/CollectVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.tests.internal.ast.utils;
+package org.eclipse.ldt.core.tests.internal.ast.utils;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/DeclarationVisitor.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/DeclarationVisitor.java
index 6cb7b62..c78892a 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/DeclarationVisitor.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/DeclarationVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.tests.internal.ast.utils;
+package org.eclipse.ldt.core.tests.internal.ast.utils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/DummyReporter.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/DummyReporter.java
index bb552f3..202c578 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/DummyReporter.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/DummyReporter.java
@@ -15,7 +15,7 @@
  * $Author: kkinfoo $
  * $Id: DummyReporter.java 2161 2009-07-23 10:07:30Z kkinfoo $
  */
-package org.eclipse.koneki.ldt.core.tests.internal.ast.utils;
+package org.eclipse.ldt.core.tests.internal.ast.utils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/SpyVisitor.java b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/SpyVisitor.java
index 7af8fe7..56c924a 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/src/org/eclipse/koneki/ldt/core/tests/internal/ast/utils/SpyVisitor.java
+++ b/tests/org.eclipse.ldt.core.tests/src/org/eclipse/ldt/core/tests/internal/ast/utils/SpyVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.core.tests.internal.ast.utils;
+package org.eclipse.ldt.core.tests.internal.ast.utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/tests/org.eclipse.ldt.jnlua.tests/.checkstyle b/tests/org.eclipse.ldt.jnlua.tests/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/tests/org.eclipse.ldt.jnlua.tests/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.classpath b/tests/org.eclipse.ldt.jnlua.tests/.classpath
index ad32c83..ad32c83 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.classpath
+++ b/tests/org.eclipse.ldt.jnlua.tests/.classpath
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.fbprefs b/tests/org.eclipse.ldt.jnlua.tests/.fbprefs
index 968afbf..968afbf 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.fbprefs
+++ b/tests/org.eclipse.ldt.jnlua.tests/.fbprefs
diff --git a/tests/org.eclipse.koneki.ldt.core.tests/.project b/tests/org.eclipse.ldt.jnlua.tests/.project
index be4374a..1077c81 100644
--- a/tests/org.eclipse.koneki.ldt.core.tests/.project
+++ b/tests/org.eclipse.ldt.jnlua.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.koneki.ldt.core.tests</name>

+	<name>org.eclipse.ldt.jnlua.tests</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.jdt.core.prefs
index 06ea639..06ea639 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.pde.core.prefs
+++ b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.pde.prefs
index a5ed9f5..a5ed9f5 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/.settings/org.eclipse.pde.prefs
+++ b/tests/org.eclipse.ldt.jnlua.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ldt.jnlua.tests/META-INF/MANIFEST.MF
index 9e54335..807ccaf 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ldt.jnlua.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.jnlua.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.jnlua.tests;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
@@ -10,5 +10,5 @@ Require-Bundle: org.eclipse.ui,
  com.naef.jnlua;bundle-version="1.0.3"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.jnlua.internal.tests;x-internal:=true,
- org.eclipse.koneki.ldt.jnlua.tests
+Export-Package: org.eclipse.ldt.jnlua.internal.tests;x-internal:=true,
+ org.eclipse.ldt.jnlua.tests
diff --git a/tests/org.eclipse.ldt.jnlua.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.ldt.jnlua.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..8cff693
--- /dev/null
+++ b/tests/org.eclipse.ldt.jnlua.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.ldt.lua.tests
+Bundle-Name = Jnlua integration Tests
+Bundle-Vendor = Eclipse LDT
\ No newline at end of file
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/build.properties b/tests/org.eclipse.ldt.jnlua.tests/build.properties
index b245694..b245694 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/build.properties
+++ b/tests/org.eclipse.ldt.jnlua.tests/build.properties
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/pom.xml b/tests/org.eclipse.ldt.jnlua.tests/pom.xml
index bee00ba..2afc479 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/pom.xml
+++ b/tests/org.eclipse.ldt.jnlua.tests/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.jnlua.tests</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.jnlua.tests</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/src/org/eclipse/koneki/ldt/jnlua/internal/tests/ConcurrencyTest.java b/tests/org.eclipse.ldt.jnlua.tests/src/org/eclipse/ldt/jnlua/internal/tests/ConcurrencyTest.java
index 2ca7f68..db1c89a 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/src/org/eclipse/koneki/ldt/jnlua/internal/tests/ConcurrencyTest.java
+++ b/tests/org.eclipse.ldt.jnlua.tests/src/org/eclipse/ldt/jnlua/internal/tests/ConcurrencyTest.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.jnlua.internal.tests;
+package org.eclipse.ldt.jnlua.internal.tests;
 
 import junit.framework.TestCase;
 
diff --git a/tests/org.eclipse.koneki.ldt.jnlua.tests/src/org/eclipse/koneki/ldt/jnlua/tests/AllJNLuaTests.java b/tests/org.eclipse.ldt.jnlua.tests/src/org/eclipse/ldt/jnlua/tests/AllJNLuaTests.java
index 8495679..2c63cdb 100644
--- a/tests/org.eclipse.koneki.ldt.jnlua.tests/src/org/eclipse/koneki/ldt/jnlua/tests/AllJNLuaTests.java
+++ b/tests/org.eclipse.ldt.jnlua.tests/src/org/eclipse/ldt/jnlua/tests/AllJNLuaTests.java
@@ -8,9 +8,9 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.jnlua.tests;

+package org.eclipse.ldt.jnlua.tests;

 

-import org.eclipse.koneki.ldt.jnlua.internal.tests.ConcurrencyTest;

+import org.eclipse.ldt.jnlua.internal.tests.ConcurrencyTest;

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

diff --git a/tests/org.eclipse.ldt.lua.tests/.checkstyle b/tests/org.eclipse.ldt.lua.tests/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/tests/org.eclipse.ldt.lua.tests/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.classpath b/tests/org.eclipse.ldt.lua.tests/.classpath
index 739bfd0..739bfd0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.classpath
+++ b/tests/org.eclipse.ldt.lua.tests/.classpath
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.externalToolBuilders/Import Lua Libraries.launch b/tests/org.eclipse.ldt.lua.tests/.externalToolBuilders/Import Lua Libraries.launch
index d0d3795..d924486 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.externalToolBuilders/Import Lua Libraries.launch
+++ b/tests/org.eclipse.ldt.lua.tests/.externalToolBuilders/Import Lua Libraries.launch
@@ -2,13 +2,13 @@
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.koneki.ldt.lua.tests/lib&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.ldt.lua.tests/lib&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="koneki.ldt"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/koneki.ldt/libraries/doctemplates&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/koneki.ldt/libraries/luaformatter&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/koneki.ldt/libraries/markdown&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/koneki.ldt/libraries/modelsbuilder&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/koneki.ldt/libraries/penlight&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/koneki.ldt/libraries/templateengine&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.koneki.ldt.lua.tests/build.xml}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ldt"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/doctemplates&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/luaformatter&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/markdown&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/modelsbuilder&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/penlight&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/eclipse.ldt/libraries/templateengine&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ldt.lua.tests/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 </launchConfiguration>
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.fbprefs b/tests/org.eclipse.ldt.lua.tests/.fbprefs
index 31bdf7e..31bdf7e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.fbprefs
+++ b/tests/org.eclipse.ldt.lua.tests/.fbprefs
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.project b/tests/org.eclipse.ldt.lua.tests/.project
index dba1893..c4501bf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.project
+++ b/tests/org.eclipse.ldt.lua.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.lua.tests</name>
+	<name>org.eclipse.ldt.lua.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.core.resources.prefs
index c3f9900..c3f9900 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22..5a0ad22 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.core.runtime.prefs
+++ b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.jdt.core.prefs
index c8dd566..c8dd566 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.pde.core.prefs
index 09a7791..09a7791 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.pde.core.prefs
+++ b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.pde.prefs
index 012aec9..012aec9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/.settings/org.eclipse.pde.prefs
+++ b/tests/org.eclipse.ldt.lua.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.ldt.lua.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ldt.lua.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9babc73
--- /dev/null
+++ b/tests/org.eclipse.ldt.lua.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.ldt.lua.tests;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-Activator: org.eclipse.ldt.lua.tests.internal.Activator
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.text;bundle-version="3.5.0",
+ org.junit;bundle-version="4.5.0",
+ org.eclipse.ldt.metalua;bundle-version="0.9.0",
+ org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.formatter;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.ldt;bundle-version="0.9.0",
+ com.cforcoding.jmd;bundle-version="0.8.1",
+ com.naef.jnlua;bundle-version="[0.9.1,1.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: diff.match.patch;x-internal:=true,
+ org.eclipse.ldt.lua.tests,
+ org.eclipse.ldt.lua.tests.internal;x-internal:=true,
+ org.eclipse.ldt.lua.tests.internal.ast.models.api;x-internal:=true,
+ org.eclipse.ldt.lua.tests.internal.ast.models.internal;x-internal:=true,
+ org.eclipse.ldt.lua.tests.internal.formatter;x-internal:=true,
+ org.eclipse.ldt.lua.tests.internal.template.engine;x-internal:=true,
+ org.eclipse.ldt.lua.tests.internal.utils;x-internal:=true
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ClassPath: libjava/dmp.jar,
+ .
diff --git a/tests/org.eclipse.ldt.lua.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.ldt.lua.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..6efd04e
--- /dev/null
+++ b/tests/org.eclipse.ldt.lua.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.ldt.parser.apimodel.tests
+Bundle-Name = Lua Tests
+Bundle-Vendor = Eclipse LDT
\ No newline at end of file
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/build.properties b/tests/org.eclipse.ldt.lua.tests/build.properties
index c50471e..c50471e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/build.properties
+++ b/tests/org.eclipse.ldt.lua.tests/build.properties
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/build.xml b/tests/org.eclipse.ldt.lua.tests/build.xml
index 79783d6..79783d6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/build.xml
+++ b/tests/org.eclipse.ldt.lua.tests/build.xml
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/domhandler.lua b/tests/org.eclipse.ldt.lua.tests/lib/domhandler.lua
index aa9fe97..aa9fe97 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/domhandler.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/domhandler.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/external/.gitignore b/tests/org.eclipse.ldt.lua.tests/lib/external/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/external/.gitignore
+++ b/tests/org.eclipse.ldt.lua.tests/lib/external/.gitignore
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/serpent.lua b/tests/org.eclipse.ldt.lua.tests/lib/serpent.lua
index 5c8a254..5c8a254 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/serpent.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/serpent.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/tablecompare.lua b/tests/org.eclipse.ldt.lua.tests/lib/tablecompare.lua
index 3a7409d..3a7409d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/tablecompare.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/tablecompare.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/tabledumpbeautifier.lua b/tests/org.eclipse.ldt.lua.tests/lib/tabledumpbeautifier.lua
index e83e416..e83e416 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/tabledumpbeautifier.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/tabledumpbeautifier.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/testmodelutil.lua b/tests/org.eclipse.ldt.lua.tests/lib/testmodelutil.lua
index cd5f8dd..cd5f8dd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/testmodelutil.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/testmodelutil.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/testutil.lua b/tests/org.eclipse.ldt.lua.tests/lib/testutil.lua
index 89d90cb..d99a0b7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/testutil.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/testutil.lua
@@ -117,7 +117,7 @@ function M.comparehtml(generatedtable, referencetable, generatedhtml, referenceh
 		diff:diff_cleanupSemantic(differences)
 		
 		-- Prettify the result
-		local diffutil = java.require("org.eclipse.koneki.ldt.lua.tests.internal.utils.DiffUtil")
+		local diffutil = java.require("org.eclipse.ldt.lua.tests.internal.utils.DiffUtil")
 		local prettydiff = diffutil:diff_pretty_diff(differences)
 		
 		-- Formalise first table output
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/xml.lua b/tests/org.eclipse.ldt.lua.tests/lib/xml.lua
index e588594..e588594 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/xml.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/xml.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/lib/xmlformatter.lua b/tests/org.eclipse.ldt.lua.tests/lib/xmlformatter.lua
index 1e35bd9..1e35bd9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/lib/xmlformatter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/lib/xmlformatter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/libjava/dmp.jar b/tests/org.eclipse.ldt.lua.tests/libjava/dmp.jar
index ebbe87a..ebbe87a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/libjava/dmp.jar
+++ b/tests/org.eclipse.ldt.lua.tests/libjava/dmp.jar
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/pom.xml b/tests/org.eclipse.ldt.lua.tests/pom.xml
index 3fc9750..02fd8db 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/pom.xml
+++ b/tests/org.eclipse.ldt.lua.tests/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.lua.tests</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.lua.tests</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
@@ -35,7 +35,7 @@
 	     	<dependencies>
 				<dependency>
 					<type>p2-installable-unit</type>
-					<artifactId>org.eclipse.koneki.ldt.feature.group</artifactId>
+					<artifactId>org.eclipse.ldt.feature.group</artifactId>
 				</dependency>
 			</dependencies>
 	      </configuration>
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/generatehtml.lua b/tests/org.eclipse.ldt.lua.tests/scripts/generatehtml.lua
index c22bffc..c22bffc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/generatehtml.lua
+++ b/tests/org.eclipse.ldt.lua.tests/scripts/generatehtml.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/modeltransformations.lua b/tests/org.eclipse.ldt.lua.tests/scripts/modeltransformations.lua
index bd3050a..bd3050a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/modeltransformations.lua
+++ b/tests/org.eclipse.ldt.lua.tests/scripts/modeltransformations.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/serializeapimodel.lua b/tests/org.eclipse.ldt.lua.tests/scripts/serializeapimodel.lua
index 6c57e27..6c57e27 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/serializeapimodel.lua
+++ b/tests/org.eclipse.ldt.lua.tests/scripts/serializeapimodel.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/serializebothmodel.lua b/tests/org.eclipse.ldt.lua.tests/scripts/serializebothmodel.lua
index 0a1bf7e..0a1bf7e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/serializebothmodel.lua
+++ b/tests/org.eclipse.ldt.lua.tests/scripts/serializebothmodel.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/serializeinternalmodel.lua b/tests/org.eclipse.ldt.lua.tests/scripts/serializeinternalmodel.lua
index 7f4baee..7f4baee 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/scripts/serializeinternalmodel.lua
+++ b/tests/org.eclipse.ldt.lua.tests/scripts/serializeinternalmodel.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/AllLuaIntegrationTests.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/AllLuaIntegrationTests.java
index 67b62c6..e810734 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/AllLuaIntegrationTests.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/AllLuaIntegrationTests.java
@@ -8,21 +8,21 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.lua.tests;

+package org.eclipse.ldt.lua.tests;

 

 import junit.framework.Test;

 import junit.framework.TestCase;

 import junit.framework.TestSuite;

 

-import org.eclipse.koneki.ldt.lua.tests.internal.ast.models.api.APIModelTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.ast.models.api.APIModelToHTMLTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.ast.models.internal.InternalModelTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.FourSpacesFormatterTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.LineEndingTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.MixedFormatterTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.TabFormatterTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.template.engine.JDMTemplateEngineTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.template.engine.TemplateEngineTestSuite;

+import org.eclipse.ldt.lua.tests.internal.ast.models.api.APIModelTestSuite;

+import org.eclipse.ldt.lua.tests.internal.ast.models.api.APIModelToHTMLTestSuite;

+import org.eclipse.ldt.lua.tests.internal.ast.models.internal.InternalModelTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.FourSpacesFormatterTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.LineEndingTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.MixedFormatterTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.TabFormatterTestSuite;

+import org.eclipse.ldt.lua.tests.internal.template.engine.JDMTemplateEngineTestSuite;

+import org.eclipse.ldt.lua.tests.internal.template.engine.TemplateEngineTestSuite;

 

 public class AllLuaIntegrationTests extends TestCase {

 

diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/AllLuaTests.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/AllLuaTests.java
index e088e1c..37f89ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/AllLuaTests.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/AllLuaTests.java
@@ -8,22 +8,22 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.lua.tests;

+package org.eclipse.ldt.lua.tests;

 

 import junit.framework.Test;

 import junit.framework.TestCase;

 import junit.framework.TestSuite;

 

-import org.eclipse.koneki.ldt.lua.tests.internal.ast.models.api.APIModelTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.ast.models.api.APIModelToHTMLTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.ast.models.both.BothModelTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.ast.models.internal.InternalModelTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.FourSpacesFormatterTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.LineEndingTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.MixedFormatterTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.formatter.TabFormatterTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.template.engine.JDMTemplateEngineTestSuite;

-import org.eclipse.koneki.ldt.lua.tests.internal.template.engine.TemplateEngineTestSuite;

+import org.eclipse.ldt.lua.tests.internal.ast.models.api.APIModelTestSuite;

+import org.eclipse.ldt.lua.tests.internal.ast.models.api.APIModelToHTMLTestSuite;

+import org.eclipse.ldt.lua.tests.internal.ast.models.both.BothModelTestSuite;

+import org.eclipse.ldt.lua.tests.internal.ast.models.internal.InternalModelTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.FourSpacesFormatterTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.LineEndingTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.MixedFormatterTestSuite;

+import org.eclipse.ldt.lua.tests.internal.formatter.TabFormatterTestSuite;

+import org.eclipse.ldt.lua.tests.internal.template.engine.JDMTemplateEngineTestSuite;

+import org.eclipse.ldt.lua.tests.internal.template.engine.TemplateEngineTestSuite;

 

 public class AllLuaTests extends TestCase {

 

diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/Activator.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/Activator.java
index b60b37a..595069f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/Activator.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal;
+package org.eclipse.ldt.lua.tests.internal;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
@@ -17,7 +17,7 @@ import org.osgi.framework.BundleContext;
 
 public class Activator extends Plugin {
 
-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.lua.tests"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.ldt.lua.tests"; //$NON-NLS-1$
 	private static Activator plugin;
 
 	public Activator() {
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/api/APIModelTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/api/APIModelTestSuite.java
index 43a42e0..9f1745d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/api/APIModelTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/api/APIModelTestSuite.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.ast.models.api;
+package org.eclipse.ldt.lua.tests.internal.ast.models.api;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.LuaTestCase;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.LuaTestCase;
 
 public class APIModelTestSuite extends AbstractLuaTestSuite {
 
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/api/APIModelToHTMLTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/api/APIModelToHTMLTestSuite.java
index 809dc40..cf04857 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/api/APIModelToHTMLTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/api/APIModelToHTMLTestSuite.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.ast.models.api;
+package org.eclipse.ldt.lua.tests.internal.ast.models.api;
 
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
 
 public class APIModelToHTMLTestSuite extends AbstractLuaTestSuite {
 
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/both/BothModelTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/both/BothModelTestSuite.java
index 77fa1fb..9eb925e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/both/BothModelTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/both/BothModelTestSuite.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.ast.models.both;
+package org.eclipse.ldt.lua.tests.internal.ast.models.both;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.LuaTestCase;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.LuaTestCase;
 
 public class BothModelTestSuite extends AbstractLuaTestSuite {
 
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/internal/InternalModelTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/internal/InternalModelTestSuite.java
index cca44f5..b0bcd13 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/ast/models/internal/InternalModelTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/ast/models/internal/InternalModelTestSuite.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.ast.models.internal;
+package org.eclipse.ldt.lua.tests.internal.ast.models.internal;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.LuaTestCase;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.LuaTestCase;
 
 public class InternalModelTestSuite extends AbstractLuaTestSuite {
 
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/FourSpacesFormatterTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/FourSpacesFormatterTestSuite.java
index 27f263e..07191ab 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/FourSpacesFormatterTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/FourSpacesFormatterTestSuite.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.formatter;
+package org.eclipse.ldt.lua.tests.internal.formatter;
 
 import org.eclipse.core.runtime.Path;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
 
 public class FourSpacesFormatterTestSuite extends AbstractLuaTestSuite {
 
@@ -20,7 +20,7 @@ public class FourSpacesFormatterTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
 	 */
 	@Override
 	protected String getReferenceFolderPath() {
@@ -28,7 +28,7 @@ public class FourSpacesFormatterTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
 	 */
 	@Override
 	protected String getTestModuleName() {
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/LineEndingTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/LineEndingTestSuite.java
index 6d53dba..537c8a7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/LineEndingTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/LineEndingTestSuite.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.formatter;
+package org.eclipse.ldt.lua.tests.internal.formatter;
 
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
 
 public class LineEndingTestSuite extends AbstractLuaTestSuite {
 
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/MixedFormatterTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/MixedFormatterTestSuite.java
index 86aaf14..3a2425c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/MixedFormatterTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/MixedFormatterTestSuite.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.formatter;
+package org.eclipse.ldt.lua.tests.internal.formatter;
 
 import org.eclipse.core.runtime.Path;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
 
 public class MixedFormatterTestSuite extends AbstractLuaTestSuite {
 
@@ -20,7 +20,7 @@ public class MixedFormatterTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
 	 */
 	@Override
 	protected String getReferenceFolderPath() {
@@ -28,7 +28,7 @@ public class MixedFormatterTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
 	 */
 	@Override
 	protected String getTestModuleName() {
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/TabFormatterTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/TabFormatterTestSuite.java
index d5dda2e..cd9f13e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/formatter/TabFormatterTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/formatter/TabFormatterTestSuite.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.formatter;
+package org.eclipse.ldt.lua.tests.internal.formatter;
 
 import org.eclipse.core.runtime.Path;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
 
 public class TabFormatterTestSuite extends AbstractLuaTestSuite {
 
@@ -20,7 +20,7 @@ public class TabFormatterTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
 	 */
 	@Override
 	protected String getReferenceFolderPath() {
@@ -28,7 +28,7 @@ public class TabFormatterTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
 	 */
 	@Override
 	protected String getTestModuleName() {
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java
index b7894c1..a0954bc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.template.engine;
+package org.eclipse.ldt.lua.tests.internal.template.engine;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,9 +17,9 @@ import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.LuaTestCase;
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.LuaTestModuleRunner;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.LuaTestCase;
+import org.eclipse.ldt.lua.tests.internal.utils.LuaTestModuleRunner;
 
 import com.cforcoding.jmd.MarkDown;
 import com.naef.jnlua.LuaState;
@@ -36,7 +36,7 @@ public class JDMTemplateEngineTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite#getInputFolderPath()
+	 * @see org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite#getInputFolderPath()
 	 */
 	@Override
 	protected String getInputFolderPath() {
@@ -44,7 +44,7 @@ public class JDMTemplateEngineTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getReferenceFolderPath()
 	 */
 	@Override
 	protected String getReferenceFolderPath() {
@@ -52,7 +52,7 @@ public class JDMTemplateEngineTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
+	 * @see org.eclipse.ldt.parser.lua.tests.LDTLuaAbstractTestSuite#getTestModuleName()
 	 */
 	@Override
 	protected String getTestModuleName() {
@@ -60,7 +60,7 @@ public class JDMTemplateEngineTestSuite extends AbstractLuaTestSuite {
 	}
 
 	/**
-	 * @see org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite#createTestCase(java.lang.String, java.lang.String,
+	 * @see org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite#createTestCase(java.lang.String, java.lang.String,
 	 *      org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IPath, java.util.List)
 	 */
 	@Override
@@ -68,7 +68,7 @@ public class JDMTemplateEngineTestSuite extends AbstractLuaTestSuite {
 			List<String> directoryListForLuaPath) {
 		return new LuaTestCase(testName, testModuleName, inputFilePath, referenceFilePath, directoryListForLuaPath) {
 			/**
-			 * @see org.eclipse.koneki.ldt.lua.tests.internal.utils.LuaTestCase#createLuaRunner(java.lang.String, java.lang.String, java.lang.String,
+			 * @see org.eclipse.ldt.lua.tests.internal.utils.LuaTestCase#createLuaRunner(java.lang.String, java.lang.String, java.lang.String,
 			 *      java.util.List, java.util.List)
 			 */
 			@Override
@@ -76,7 +76,7 @@ public class JDMTemplateEngineTestSuite extends AbstractLuaTestSuite {
 					List<String> luapath, List<String> files) {
 				return new LuaTestModuleRunner(module, absoluteSourcePath, asbsoluteReferencePath, luapath, files) {
 					/**
-					 * @see org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule#createLuaState()
+					 * @see org.eclipse.ldt.metalua.AbstractMetaLuaModule#createLuaState()
 					 */
 					@Override
 					protected LuaState createLuaState() {
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java
index 8f48401..9356469 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.template.engine;
+package org.eclipse.ldt.lua.tests.internal.template.engine;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.koneki.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
+import org.eclipse.ldt.lua.tests.internal.utils.AbstractLuaTestSuite;
 
 /**
  * Template Engine tests. The template engine is responsible to generate HTML This test start from lua files, generate associed HTML documentation
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/AbstractLuaTestSuite.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/AbstractLuaTestSuite.java
index 91353bd..133d908 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/AbstractLuaTestSuite.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/AbstractLuaTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.utils;
+package org.eclipse.ldt.lua.tests.internal.utils;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.koneki.ldt.lua.tests.internal.Activator;
+import org.eclipse.ldt.lua.tests.internal.Activator;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/DiffUtil.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/DiffUtil.java
index ad97738..786648d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/DiffUtil.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/DiffUtil.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.lua.tests.internal.utils;

+package org.eclipse.ldt.lua.tests.internal.utils;

 

 import java.util.LinkedList;

 

diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/LuaTestCase.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/LuaTestCase.java
index a41140e..e19db38 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/LuaTestCase.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/LuaTestCase.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.utils;
+package org.eclipse.ldt.lua.tests.internal.utils;
 
 import java.io.File;
 import java.text.MessageFormat;
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/LuaTestModuleRunner.java b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/LuaTestModuleRunner.java
index a75fe25..16ad69b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/utils/LuaTestModuleRunner.java
+++ b/tests/org.eclipse.ldt.lua.tests/src/org/eclipse/ldt/lua/tests/internal/utils/LuaTestModuleRunner.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.lua.tests.internal.utils;
+package org.eclipse.ldt.lua.tests.internal.utils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.koneki.ldt.lua.tests.internal.Activator;
-import org.eclipse.koneki.ldt.metalua.AbstractMetaLuaModule;
+import org.eclipse.ldt.lua.tests.internal.Activator;
+import org.eclipse.ldt.metalua.AbstractMetaLuaModule;
 import org.junit.Assert;
 
 import com.naef.jnlua.LuaState;
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedparam.html
index 0343a94..0343a94 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedparam.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedparam2.html
index 289fe7f..289fe7f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedparam2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam3.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedparam3.html
index 409f4bf..409f4bf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam3.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedparam3.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html
index 7a147ca..7a147ca 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html
index b00fe80..b00fe80 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html
index d1808bb..d1808bb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html
index 85732cd..85732cd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html
index 0a7d527..0a7d527 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubledescribedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubledescribedreturn.html
index bc93c1e..bc93c1e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubledescribedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubledescribedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypedreturn.html
index d601acb..d601acb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypelinkedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypelinkedreturn.html
index 477bc42..477bc42 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypelinkedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubledescribedtypelinkedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubletypedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubletypedreturn.html
index 279a3b0..279a3b0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubletypedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubletypedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubletypelinkedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubletypelinkedreturn.html
index 606b9d5..606b9d5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/doubletypelinkedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/doubletypelinkedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/empty.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/empty.html
index f2eea4a..f2eea4a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/empty.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/empty.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/nodeclaredparent.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/nodeclaredparent.html
index e1af46c..e1af46c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/nodeclaredparent.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/nodeclaredparent.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/parenttypeafter.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/parenttypeafter.html
index e1af46c..e1af46c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/parenttypeafter.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/parenttypeafter.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/selfparam.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/selfparam.html
index 636a8c9..636a8c9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/selfparam.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/selfparam.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/selfparam2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/selfparam2.html
index ec65e27..ec65e27 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/selfparam2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/selfparam2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedparam.html
index 957207d..957207d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedparam.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedparam2.html
index a8d1bc9..a8d1bc9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedparam2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam3.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedparam3.html
index a8d1bc9..a8d1bc9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam3.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedparam3.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html
index 76d17fc..76d17fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedreturn2.html
index 0fa561b..0fa561b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedreturn2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn3.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedreturn3.html
index 0fa561b..0fa561b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn3.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typedreturn3.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html
index 38c2727..38c2727 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html
index 77883ef..77883ef 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/field.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/field.html
index b04b042..b04b042 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/field.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/field.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/function.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/function.html
index 00751dc..00751dc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/function.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/function.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/functionwithparams.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/functionwithparams.html
index 45f3b63..45f3b63 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/functionwithparams.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/functionwithparams.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/functionwithselfparams.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/functionwithselfparams.html
index 7f80edf..7f80edf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/functionwithselfparams.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/functionwithselfparams.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/typedfield.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/typedfield.html
index 1883dfd..1883dfd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/typedfield.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/global/typedfield.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/atindescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/atindescription.html
index 54179ca..54179ca 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/atindescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/atindescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/callof.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/callof.html
index fd7fc5a..fd7fc5a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/callof.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/callof.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/callofinparent.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/callofinparent.html
index 120850b..120850b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/callofinparent.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/callofinparent.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/callofwithparams.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/callofwithparams.html
index 304cc10..304cc10 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/callofwithparams.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/callofwithparams.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/customreturns.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/customreturns.html
index abc36b5..abc36b5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/customreturns.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/customreturns.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink.html
index 3900338..3900338 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink2.html
index f717147..f717147 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionstartwithinlinelink2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionwithindentation.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionwithindentation.html
index 921c355..921c355 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionwithindentation.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionwithindentation.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionwithtabindentation.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionwithtabindentation.html
index 921c355..921c355 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/descriptionwithtabindentation.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/descriptionwithtabindentation.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/hyphenlinedescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/hyphenlinedescription.html
index f3ed91e..f3ed91e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/hyphenlinedescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/hyphenlinedescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/ignorefirstline.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/ignorefirstline.html
index bba05fb..bba05fb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/ignorefirstline.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/ignorefirstline.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/listdescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/listdescription.html
index 581f68a..581f68a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/listdescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/listdescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/listdescriptionwithdescribedmodule.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/listdescriptionwithdescribedmodule.html
index 74ec08e..74ec08e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/listdescriptionwithdescribedmodule.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/listdescriptionwithdescribedmodule.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/listexternaltype.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/listexternaltype.html
index 6e30e03..6e30e03 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/listexternaltype.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/listexternaltype.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/mapdescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/mapdescription.html
index 58a38d4..58a38d4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/mapdescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/mapdescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/mapdescriptionwithdescribedmodule.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/mapdescriptionwithdescribedmodule.html
index eaf9ee9..eaf9ee9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/mapdescriptionwithdescribedmodule.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/mapdescriptionwithdescribedmodule.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/mapexternaltype.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/mapexternaltype.html
index 8465543..8465543 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/mapexternaltype.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/mapexternaltype.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/nodescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/nodescription.html
index 43d671d..43d671d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/nodescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/nodescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/onelinedescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/onelinedescription.html
index 9e96e1c..9e96e1c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/onelinedescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/onelinedescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html
index f64236d..f64236d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html
index 61f9efd..61f9efd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html
index a9444b6..a9444b6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription3.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription3.html
index ae3a6cd..ae3a6cd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription3.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription3.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription4.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription4.html
index 9a94702..9a94702 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription4.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription4.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription5.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription5.html
index 743bce0..743bce0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription5.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription5.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription6.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription6.html
index 743bce0..743bce0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription6.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription6.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription7.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription7.html
index e5f89d7..e5f89d7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription7.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription7.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription8.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription8.html
index e5f89d7..e5f89d7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription8.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription8.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/simpleinheritance.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/simpleinheritance.html
index d3a730d..d3a730d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/simpleinheritance.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/simpleinheritance.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/simplelist.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/simplelist.html
index 99e9b81..99e9b81 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/simplelist.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/simplelist.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/simplemap.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/simplemap.html
index 847eff5..847eff5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/simplemap.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/module/simplemap.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/callof.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/callof.html
index 8d7b7d9..8d7b7d9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/callof.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/callof.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/callofinparent.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/callofinparent.html
index 9473068..9473068 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/callofinparent.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/callofinparent.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/callofwithparams.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/callofwithparams.html
index 8284cdc..8284cdc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/callofwithparams.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/callofwithparams.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/empty.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/empty.html
index 420708b..420708b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/empty.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/empty.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/field.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/field.html
index 2fece65..2fece65 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/field.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/field.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html
index ef9676e..ef9676e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinefield.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/inlinefield.html
index e2adddd..e2adddd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinefield.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/inlinefield.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinetypedfield.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/inlinetypedfield.html
index d345455..d345455 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinetypedfield.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/inlinetypedfield.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/listdescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/listdescription.html
index 4c54a29..4c54a29 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/listdescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/listdescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/listdescriptionwithdescribedtype.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/listdescriptionwithdescribedtype.html
index b5bf2af..b5bf2af 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/listdescriptionwithdescribedtype.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/listdescriptionwithdescribedtype.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/mapdescription.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/mapdescription.html
index 29947c5..29947c5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/mapdescription.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/mapdescription.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/mapdescriptionwithdescribedtype.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/mapdescriptionwithdescribedtype.html
index 1c148b6..1c148b6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/mapdescriptionwithdescribedtype.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/mapdescriptionwithdescribedtype.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/nodeclaredparent.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/nodeclaredparent.html
index 20d0b76..20d0b76 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/nodeclaredparent.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/nodeclaredparent.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/nodeclaredtype.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/nodeclaredtype.html
index ac38a17..ac38a17 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/nodeclaredtype.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/nodeclaredtype.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/parentdeclaredafter.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/parentdeclaredafter.html
index 20d0b76..20d0b76 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/parentdeclaredafter.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/parentdeclaredafter.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/simpleinheritance.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/simpleinheritance.html
index 02d0121..02d0121 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/simpleinheritance.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/simpleinheritance.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/simplelist.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/simplelist.html
index a3433c9..a3433c9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/simplelist.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/simplelist.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/simplemap.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/simplemap.html
index 36b17ca..36b17ca 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/simplemap.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/simplemap.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedeclaredafter.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/typedeclaredafter.html
index ac38a17..ac38a17 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedeclaredafter.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/typedeclaredafter.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedfield.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/typedfield.html
index 8745ac0..8745ac0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedfield.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/type/typedfield.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/external.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/external.html
index 81aa5d3..81aa5d3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/external.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/external.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/internal.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/internal.html
index 235d033..235d033 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/internal.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/internal.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/list.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/list.html
index 8867116..8867116 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/list.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/list.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/map.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/map.html
index 9918952..9918952 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/map.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/map.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/primitive.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/primitive.html
index faa6c2f..faa6c2f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/primitive.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/primitive.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/recursive.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/recursive.html
index e5d3d6e..e5d3d6e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/recursive.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/recursive.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/table.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/table.html
index aa10ce7..aa10ce7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/typref/table.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/typref/table.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/field.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/field.html
index 894cd9a..894cd9a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/field.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/field.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/field2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/field2.html
index 2f0b791..2f0b791 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/field2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/field2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/function.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/function.html
index 91d8b65..91d8b65 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/function.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/function.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/function2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/function2.html
index 73ceaaf..73ceaaf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/function2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/function2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/module.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/module.html
index a32dfac..a32dfac 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/module.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/module.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/module2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/module2.html
index 5ddd12b..5ddd12b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/module2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/module2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/type.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/type.html
index 4504d1c..4504d1c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/type.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/type.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/type2.html b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/type2.html
index 5f2abd7..5f2abd7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/usage/type2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/html/usage/type2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedparam.lua
index 0581f52..0581f52 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedparam2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedparam2.lua
index 1e52357..1e52357 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedparam2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedparam2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedparam3.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedparam3.lua
index fb194a6..fb194a6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedparam3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedparam3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedreturn.lua
index e2c8a13..e2c8a13 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypedparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypedparam.lua
index 8b344b6..8b344b6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypedparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypedparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypedreturn.lua
index 2ffb4f0..2ffb4f0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedparam.lua
index 2618dd0..2618dd0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedreturn.lua
index 3d0596a..3d0596a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/describedtypelinkedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedreturn.lua
index 8dda2b4..8dda2b4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypedreturn.lua
index 3134b8f..3134b8f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypelinkedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypelinkedreturn.lua
index dcf3d4b..dcf3d4b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypelinkedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubledescribedtypelinkedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubletypedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubletypedreturn.lua
index 34c0e63..34c0e63 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubletypedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubletypedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubletypelinkedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubletypelinkedreturn.lua
index a2f2057..a2f2057 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/doubletypelinkedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/doubletypelinkedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/empty.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/empty.lua
index 7de92c1..7de92c1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/empty.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/empty.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/nodeclaredparent.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/nodeclaredparent.lua
index 41963d7..41963d7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/nodeclaredparent.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/nodeclaredparent.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/parenttypeafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/parenttypeafter.lua
index 6571e3b..6571e3b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/parenttypeafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/parenttypeafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/selfparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/selfparam.lua
index 7513af7..7513af7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/selfparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/selfparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/selfparam2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/selfparam2.lua
index bad5419..bad5419 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/selfparam2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/selfparam2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedparam.lua
index a1cf3ad..a1cf3ad 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedparam2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedparam2.lua
index d0de422..d0de422 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedparam2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedparam2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedparam3.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedparam3.lua
index 2056078..2056078 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedparam3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedparam3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedreturn.lua
index 74ad19c..74ad19c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedreturn2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedreturn2.lua
index 9f7969f..9f7969f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedreturn2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedreturn2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedreturn3.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedreturn3.lua
index d077e4b..d077e4b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typedreturn3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typedreturn3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typelinkedparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typelinkedparam.lua
index c3e3c74..c3e3c74 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typelinkedparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typelinkedparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typelinkedreturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typelinkedreturn.lua
index 77ac3c5..77ac3c5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/function/typelinkedreturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/function/typelinkedreturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/field.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/field.lua
index 7b884e3..7b884e3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/field.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/field.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/function.lua
index df7501f..df7501f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/functionwithparams.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/functionwithparams.lua
index 42f2ad8..42f2ad8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/functionwithparams.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/functionwithparams.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/functionwithselfparams.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/functionwithselfparams.lua
index a2dd255..a2dd255 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/functionwithselfparams.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/functionwithselfparams.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/typedfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/typedfield.lua
index 6d0539c..6d0539c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/global/typedfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/global/typedfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/atindescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/atindescription.lua
index 38e54bf..38e54bf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/atindescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/atindescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/callof.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/callof.lua
index 454ea9c..454ea9c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/callof.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/callof.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/callofinparent.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/callofinparent.lua
index a784f44..a784f44 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/callofinparent.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/callofinparent.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/callofwithparams.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/callofwithparams.lua
index 4777a71..4777a71 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/callofwithparams.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/callofwithparams.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/customreturns.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/customreturns.lua
index f687895..f687895 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/customreturns.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/customreturns.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink.lua
index f10120d..f10120d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink2.lua
index 01668c0..01668c0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionstartwithinlinelink2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithindentation.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithindentation.lua
index 28e631f..28e631f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithindentation.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithindentation.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithtabindentation.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithtabindentation.lua
index 8fb413b..8fb413b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithtabindentation.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/descriptionwithtabindentation.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/hyphenlinedescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/hyphenlinedescription.lua
index 6673325..6673325 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/hyphenlinedescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/hyphenlinedescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/ignorefirstline.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/ignorefirstline.lua
index 7561be1..7561be1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/ignorefirstline.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/ignorefirstline.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/listdescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/listdescription.lua
index 8fa4784..8fa4784 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/listdescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/listdescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/listdescriptionwithdescribedmodule.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/listdescriptionwithdescribedmodule.lua
index 10fb3b0..10fb3b0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/listdescriptionwithdescribedmodule.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/listdescriptionwithdescribedmodule.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/listexternaltype.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/listexternaltype.lua
index 921ec2a..921ec2a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/listexternaltype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/listexternaltype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/mapdescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/mapdescription.lua
index 4ddd330..4ddd330 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/mapdescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/mapdescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/mapdescriptionwithdescribedmodule.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/mapdescriptionwithdescribedmodule.lua
index 31601e3..31601e3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/mapdescriptionwithdescribedmodule.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/mapdescriptionwithdescribedmodule.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/mapexternaltype.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/mapexternaltype.lua
index 496e36f..496e36f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/mapexternaltype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/mapexternaltype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/nodescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/nodescription.lua
index a17a15f..a17a15f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/nodescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/nodescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/onelinedescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/onelinedescription.lua
index 712b657..712b657 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/onelinedescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/onelinedescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortdescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortdescription.lua
index 044bbd6..044bbd6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortdescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortdescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription.lua
index 4ef8e24..4ef8e24 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription2.lua
index b1611ef..b1611ef 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription3.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription3.lua
index e1c119b..e1c119b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription4.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription4.lua
index 693d7f0..693d7f0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription4.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription4.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription5.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription5.lua
index 7309cb1..7309cb1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription5.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription5.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription6.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription6.lua
index 393af98..393af98 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription6.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription6.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription7.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription7.lua
index c21f63c..c21f63c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription7.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription7.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription8.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription8.lua
index 1bbe466..1bbe466 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription8.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/shortlongdescription8.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/simpleinheritance.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/simpleinheritance.lua
index 7ec4afe..7ec4afe 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/simpleinheritance.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/simpleinheritance.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/simplelist.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/simplelist.lua
index 8551562..8551562 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/simplelist.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/simplelist.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/simplemap.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/simplemap.lua
index 9cb903c..9cb903c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/module/simplemap.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/module/simplemap.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/callof.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/callof.lua
index 29799d9..29799d9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/callof.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/callof.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/callofinparent.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/callofinparent.lua
index 5f83ec0..5f83ec0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/callofinparent.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/callofinparent.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/callofwithparams.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/callofwithparams.lua
index 2407588..2407588 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/callofwithparams.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/callofwithparams.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/empty.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/empty.lua
index 3e2fa8f..3e2fa8f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/empty.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/empty.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/field.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/field.lua
index 551c9f4..551c9f4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/field.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/field.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/inlinedescribedtypedfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/inlinedescribedtypedfield.lua
index 570bfee..570bfee 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/inlinedescribedtypedfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/inlinedescribedtypedfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/inlinefield.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/inlinefield.lua
index 526c147..526c147 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/inlinefield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/inlinefield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/inlinetypedfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/inlinetypedfield.lua
index bc3fbd8..bc3fbd8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/inlinetypedfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/inlinetypedfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/listdescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/listdescription.lua
index f8e0ebc..f8e0ebc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/listdescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/listdescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/listdescriptionwithdescribedtype.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/listdescriptionwithdescribedtype.lua
index 43ec3c8..43ec3c8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/listdescriptionwithdescribedtype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/listdescriptionwithdescribedtype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/mapdescription.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/mapdescription.lua
index 698dc99..698dc99 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/mapdescription.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/mapdescription.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/mapdescriptionwithdescribedtype.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/mapdescriptionwithdescribedtype.lua
index 89a6ba5..89a6ba5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/mapdescriptionwithdescribedtype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/mapdescriptionwithdescribedtype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredparent.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredparent.lua
index fb4b178..fb4b178 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredparent.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredparent.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredtype.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredtype.lua
index 9fa6b3a..9fa6b3a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredtype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/nodeclaredtype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/parentdeclaredafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/parentdeclaredafter.lua
index 87cb9c7..87cb9c7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/parentdeclaredafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/parentdeclaredafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/simpleinheritance.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/simpleinheritance.lua
index 29fb4fc..29fb4fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/simpleinheritance.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/simpleinheritance.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/simplelist.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/simplelist.lua
index 0c13cef..0c13cef 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/simplelist.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/simplelist.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/simplemap.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/simplemap.lua
index 552952d..552952d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/simplemap.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/simplemap.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/typedeclaredafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/typedeclaredafter.lua
index bf14c47..bf14c47 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/typedeclaredafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/typedeclaredafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/typedfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/typedfield.lua
index 5637e7e..5637e7e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/type/typedfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/type/typedfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/external.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/external.lua
index 7924e5f..7924e5f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/external.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/external.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/internal.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/internal.lua
index 0be1827..0be1827 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/internal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/internal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/list.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/list.lua
index 4fdb021..4fdb021 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/list.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/list.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/map.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/map.lua
index 2598a22..2598a22 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/map.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/map.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/primitive.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/primitive.lua
index 74bf6bb..74bf6bb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/primitive.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/primitive.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/recursive.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/recursive.lua
index a865895..a865895 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/recursive.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/recursive.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/table.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/table.lua
index d7e6b19..d7e6b19 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/typref/table.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/typref/table.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/field.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/field.lua
index 9d6833d..9d6833d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/field.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/field.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/field2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/field2.lua
index 4bd4e17..4bd4e17 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/field2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/field2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/function.lua
index 567eb89..567eb89 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/function2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/function2.lua
index 48548b0..48548b0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/function2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/function2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/module.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/module.lua
index 652a77b..652a77b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/module.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/module.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/module2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/module2.lua
index 560a93d..560a93d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/module2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/module2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/type.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/type.lua
index ce7758c..ce7758c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/type.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/type.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/type2.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/type2.lua
index de333e7..de333e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/lua/usage/type2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/lua/usage/type2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedparam.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedparam.serialized
index bf1efea..bf1efea 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedparam.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedparam.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedparam2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedparam2.serialized
index e5e93ec..e5e93ec 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedparam2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedparam2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedparam3.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedparam3.serialized
index 6bbcc81..6bbcc81 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedparam3.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedparam3.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedreturn.serialized
index cdcdab7..cdcdab7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypedparam.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypedparam.serialized
index 6599595..6599595 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypedparam.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypedparam.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypedreturn.serialized
index 01588e3..01588e3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedparam.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedparam.serialized
index 4457571..4457571 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedparam.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedparam.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedreturn.serialized
index 8a23e5e..8a23e5e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/describedtypelinkedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubledescribedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubledescribedreturn.serialized
index 31b5187..31b5187 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubledescribedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubledescribedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypedreturn.serialized
index 52ec7b5..52ec7b5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypelinkedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypelinkedreturn.serialized
index 2146a9f..2146a9f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypelinkedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubledescribedtypelinkedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubletypedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubletypedreturn.serialized
index 45d006c..45d006c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubletypedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubletypedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubletypelinkedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubletypelinkedreturn.serialized
index bbb83da..bbb83da 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/doubletypelinkedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/doubletypelinkedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/empty.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/empty.serialized
index ba4c2f4..ba4c2f4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/empty.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/empty.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/nodeclaredparent.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/nodeclaredparent.serialized
index 8a3c10c..8a3c10c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/nodeclaredparent.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/nodeclaredparent.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/parenttypeafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/parenttypeafter.serialized
index af99930..af99930 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/parenttypeafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/parenttypeafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/selfparam.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/selfparam.serialized
index f74e758..f74e758 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/selfparam.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/selfparam.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/selfparam2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/selfparam2.serialized
index 129f848..129f848 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/selfparam2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/selfparam2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedparam.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedparam.serialized
index caeaf7f..caeaf7f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedparam.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedparam.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedparam2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedparam2.serialized
index bf6875a..bf6875a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedparam2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedparam2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedparam3.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedparam3.serialized
index 5051abe..5051abe 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedparam3.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedparam3.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedreturn.serialized
index d01404d..d01404d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedreturn2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedreturn2.serialized
index 4f0068f..4f0068f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedreturn2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedreturn2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedreturn3.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedreturn3.serialized
index 9906a11..9906a11 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typedreturn3.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typedreturn3.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typelinkedparam.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typelinkedparam.serialized
index 972d0cb..972d0cb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typelinkedparam.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typelinkedparam.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typelinkedreturn.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typelinkedreturn.serialized
index bd4dc62..bd4dc62 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/function/typelinkedreturn.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/function/typelinkedreturn.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/field.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/field.serialized
index 69abebe..69abebe 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/field.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/field.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/function.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/function.serialized
index a084b2c..a084b2c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/function.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/function.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/functionwithparams.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/functionwithparams.serialized
index ac7a46c..ac7a46c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/functionwithparams.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/functionwithparams.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/functionwithselfparams.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/functionwithselfparams.serialized
index bf4acf8..bf4acf8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/functionwithselfparams.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/functionwithselfparams.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/typedfield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/typedfield.serialized
index 114b797..114b797 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/global/typedfield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/global/typedfield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/atindescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/atindescription.serialized
index 6a7c809..6a7c809 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/atindescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/atindescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/callof.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/callof.serialized
index 552e9d1..552e9d1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/callof.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/callof.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/callofinparent.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/callofinparent.serialized
index 56313ba..56313ba 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/callofinparent.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/callofinparent.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/callofwithparams.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/callofwithparams.serialized
index 7326762..7326762 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/callofwithparams.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/callofwithparams.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/customreturns.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/customreturns.serialized
index 48e41ed..48e41ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/customreturns.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/customreturns.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink.serialized
index bb96292..bb96292 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink2.serialized
index 6740a0e..6740a0e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionstartwithinlinelink2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionwithindentation.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionwithindentation.serialized
index 6ba9240..6ba9240 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionwithindentation.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionwithindentation.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionwithtabindentation.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionwithtabindentation.serialized
index 8516fe9..8516fe9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/descriptionwithtabindentation.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/descriptionwithtabindentation.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/hyphenlinedescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/hyphenlinedescription.serialized
index d894158..d894158 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/hyphenlinedescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/hyphenlinedescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/ignorefirstline.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/ignorefirstline.serialized
index 6c91923..6c91923 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/ignorefirstline.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/ignorefirstline.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/listdescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/listdescription.serialized
index 7ef0a0e..7ef0a0e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/listdescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/listdescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/listdescriptionwithdescribedmodule.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/listdescriptionwithdescribedmodule.serialized
index 8a4c26f..8a4c26f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/listdescriptionwithdescribedmodule.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/listdescriptionwithdescribedmodule.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/listexternaltype.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/listexternaltype.serialized
index 00ec8e2..00ec8e2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/listexternaltype.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/listexternaltype.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/mapdescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/mapdescription.serialized
index 74f54c7..74f54c7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/mapdescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/mapdescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/mapdescriptionwithdescribedmodule.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/mapdescriptionwithdescribedmodule.serialized
index 8f479ba..8f479ba 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/mapdescriptionwithdescribedmodule.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/mapdescriptionwithdescribedmodule.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/mapexternaltype.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/mapexternaltype.serialized
index 6e104d8..6e104d8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/mapexternaltype.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/mapexternaltype.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/nodescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/nodescription.serialized
index c48ff88..c48ff88 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/nodescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/nodescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/onelinedescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/onelinedescription.serialized
index 2ca9993..2ca9993 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/onelinedescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/onelinedescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortdescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortdescription.serialized
index 01cbbcf..01cbbcf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortdescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortdescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription.serialized
index f7e6b87..f7e6b87 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription2.serialized
index 198a2c0..198a2c0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription3.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription3.serialized
index c5c990a..c5c990a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription3.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription3.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription4.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription4.serialized
index 3df29ba..3df29ba 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription4.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription4.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription5.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription5.serialized
index 35acdff..35acdff 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription5.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription5.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription6.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription6.serialized
index 4557fcd..4557fcd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription6.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription6.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription7.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription7.serialized
index b941ff1..b941ff1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription7.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription7.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription8.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription8.serialized
index d0d4300..d0d4300 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription8.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/shortlongdescription8.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/simpleinheritance.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/simpleinheritance.serialized
index 57e614d..57e614d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/simpleinheritance.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/simpleinheritance.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/simplelist.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/simplelist.serialized
index 928769a..928769a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/simplelist.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/simplelist.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/simplemap.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/simplemap.serialized
index 923af94..923af94 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/module/simplemap.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/module/simplemap.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/callof.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/callof.serialized
index 462bfcc..462bfcc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/callof.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/callof.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/callofinparent.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/callofinparent.serialized
index 283aa20..283aa20 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/callofinparent.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/callofinparent.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/callofwithparams.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/callofwithparams.serialized
index 7a83612..7a83612 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/callofwithparams.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/callofwithparams.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/empty.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/empty.serialized
index 48bc8bd..48bc8bd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/empty.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/empty.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/field.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/field.serialized
index 3de6885..3de6885 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/field.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/field.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/inlinedescribedtypedfield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/inlinedescribedtypedfield.serialized
index f343dac..f343dac 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/inlinedescribedtypedfield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/inlinedescribedtypedfield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/inlinefield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/inlinefield.serialized
index b1d20fc..b1d20fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/inlinefield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/inlinefield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/inlinetypedfield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/inlinetypedfield.serialized
index 5cdc84c..5cdc84c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/inlinetypedfield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/inlinetypedfield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/listdescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/listdescription.serialized
index 2087f6b..2087f6b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/listdescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/listdescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/listdescriptionwithdescribedtype.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/listdescriptionwithdescribedtype.serialized
index c3b8b9f..c3b8b9f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/listdescriptionwithdescribedtype.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/listdescriptionwithdescribedtype.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/mapdescription.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/mapdescription.serialized
index 9af73a0..9af73a0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/mapdescription.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/mapdescription.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/mapdescriptionwithdescribedtype.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/mapdescriptionwithdescribedtype.serialized
index c07ac8d..c07ac8d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/mapdescriptionwithdescribedtype.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/mapdescriptionwithdescribedtype.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/nodeclaredparent.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/nodeclaredparent.serialized
index 444a2fc..444a2fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/nodeclaredparent.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/nodeclaredparent.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/nodeclaredtype.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/nodeclaredtype.serialized
index 5ac9799..5ac9799 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/nodeclaredtype.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/nodeclaredtype.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/parentdeclaredafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/parentdeclaredafter.serialized
index 2189c21..2189c21 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/parentdeclaredafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/parentdeclaredafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/simpleinheritance.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/simpleinheritance.serialized
index 0b140af..0b140af 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/simpleinheritance.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/simpleinheritance.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/simplelist.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/simplelist.serialized
index cfbbda5..cfbbda5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/simplelist.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/simplelist.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/simplemap.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/simplemap.serialized
index 65d0b71..65d0b71 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/simplemap.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/simplemap.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/typedeclaredafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/typedeclaredafter.serialized
index 4fc80a8..4fc80a8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/typedeclaredafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/typedeclaredafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/typedfield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/typedfield.serialized
index 9504524..9504524 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/type/typedfield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/type/typedfield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/external.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/external.serialized
index a158f85..a158f85 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/external.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/external.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/internal.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/internal.serialized
index 8d729f2..8d729f2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/internal.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/internal.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/list.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/list.serialized
index 5f66da2..5f66da2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/list.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/list.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/map.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/map.serialized
index 79fce10..79fce10 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/map.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/map.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/primitive.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/primitive.serialized
index 4215bd2..4215bd2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/primitive.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/primitive.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/recursive.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/recursive.serialized
index e33efd9..e33efd9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/recursive.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/recursive.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/table.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/table.serialized
index f607c5a..f607c5a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/typref/table.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/typref/table.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/field.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/field.serialized
index 686e9fa..686e9fa 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/field.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/field.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/field2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/field2.serialized
index 06cd2ce..06cd2ce 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/field2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/field2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/function.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/function.serialized
index ffa8406..ffa8406 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/function.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/function.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/function2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/function2.serialized
index 12d4c8a..12d4c8a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/function2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/function2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/module.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/module.serialized
index 4aae6fe..4aae6fe 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/module.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/module.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/module2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/module2.serialized
index e3ce53d..e3ce53d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/module2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/module2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/type.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/type.serialized
index ef83952..ef83952 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/type.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/type.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/type2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/type2.serialized
index e206bb9..e206bb9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/model/usage/type2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/model/usage/type2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/test.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/test.lua
index 030a719..030a719 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/test.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/test.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/testhtml.lua b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/testhtml.lua
index 2e077e6..2e077e6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/testhtml.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/apimodel/testhtml.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/commenttyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/commenttyping.lua
index afbac9d..afbac9d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/commenttyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/commenttyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionafter.lua
index 2418512..2418512 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionbefore.lua
index daa6e5a..daa6e5a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionpriority.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionpriority.lua
index 716b698..716b698 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionpriority.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/descriptionpriority.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping.lua
index 1fefc37..1fefc37 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping2.lua
index 101fdb3..101fdb3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/fieldtagtyping2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/moduletagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/moduletagtyping.lua
index 7f6d6ab..7f6d6ab 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/moduletagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/moduletagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/nodescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/nodescriptionbefore.lua
index 882ef1d..882ef1d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/nodescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/nodescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/notglobal.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/notglobal.lua
index b71203a..b71203a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/notglobal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/notglobal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/typetagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/typetagtyping.lua
index 47ec7be..47ec7be 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfield/typetagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfield/typetagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/functiontagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/functiontagtyping.lua
index 78ce72d..78ce72d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/functiontagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/functiontagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldec.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldec.lua
index 07bdf83..07bdf83 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldec.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldec.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionafter.lua
index 796fa71..796fa71 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionbefore.lua
index a47c71a..a47c71a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionpriority.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionpriority.lua
index 6260759..6260759 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionpriority.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecdescriptionpriority.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionafter.lua
index 79cdf63..79cdf63 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionbefore.lua
index 692b7fb..692b7fb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globaldecnodescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrec.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrec.lua
index a6abbe5..a6abbe5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrec.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrec.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionafter.lua
index b683097..b683097 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionbefore.lua
index 625fe88..625fe88 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecdescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionafter.lua
index b3dfa31..b3dfa31 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionbefore.lua
index 1c63f14..1c63f14 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/globalrecnodescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobaldec.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobaldec.lua
index c785482..c785482 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobaldec.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobaldec.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobalrec.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobalrec.lua
index 4496b57..4496b57 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobalrec.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globalfunction/notglobalrec.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction1.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction1.lua
index ff60e41..ff60e41 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction2.lua
index af99c10..af99c10 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction3.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction3.lua
index 5b58049..5b58049 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectfunction3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype1.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype1.lua
index 70bd2d1..70bd2d1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype2.lua
index c295b2f..c295b2f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/affectprimitivetype2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap1.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap1.lua
index 84d9272..84d9272 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap2.lua
index 1319661..1319661 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap3.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap3.lua
index 097fd99..097fd99 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/deepmap3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/emptytable.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/emptytable.lua
index edcdccb..edcdccb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/emptytable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/emptytable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/list.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/list.lua
index ede9d48..ede9d48 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/list.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/list.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/map1.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/map1.lua
index 18bb920..18bb920 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/map1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/map1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/map2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/map2.lua
index 6e15571..6e15571 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/map2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/map2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap.lua
index fb821ea..fb821ea 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap2.lua
index 8658f5e..8658f5e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/mixedlistmap2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/recursivetable.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/recursivetable.lua
index 1294a98..1294a98 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/globaltable/recursivetable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/globaltable/recursivetable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/commenttyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/commenttyping.lua
index f20ea55..f20ea55 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/commenttyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/commenttyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionafter.lua
index ff654d2..ff654d2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionbefore.lua
index cf8095a..cf8095a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionpriority.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionpriority.lua
index 8c054b5..8c054b5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionpriority.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/descriptionpriority.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/fieldtagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/fieldtagtyping.lua
index fb2f741..fb2f741 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/fieldtagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/fieldtagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/moduletagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/moduletagtyping.lua
index 380e13d..380e13d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/moduletagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/moduletagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionafter.lua
index 3be24a9..3be24a9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionbefore.lua
index db66c6b..db66c6b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/nodescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/typetagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/typetagtyping.lua
index a69d2bb..a69d2bb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfield/typetagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfield/typetagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/functiontagtyping.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/functiontagtyping.lua
index 6d49c68..6d49c68 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/functiontagtyping.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/functiontagtyping.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdec.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdec.lua
index 6d21725..6d21725 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdec.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdec.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionafter.lua
index 278baae..278baae 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionbefore.lua
index 73ed726..73ed726 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionpriority.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionpriority.lua
index 3b08dff..3b08dff 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionpriority.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecdescriptionpriority.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionafter.lua
index 85f2464..85f2464 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionbefore.lua
index 0ca669a..0ca669a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localdecnodescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrec.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrec.lua
index 5b29bbc..5b29bbc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrec.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrec.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionafter.lua
index 5c13964..5c13964 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionbefore.lua
index 1bfb044..1bfb044 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionpriority.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionpriority.lua
index d379fdc..d379fdc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionpriority.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecdescriptionpriority.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionafter.lua
index ce4b66c..ce4b66c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionbefore.lua
index d2dc08f..d2dc08f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/localfunction/localrecnodescriptionbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/alloptional.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/alloptional.lua
index 0759059..0759059 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/alloptional.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/alloptional.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/commented.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/commented.lua
index 43e861e..43e861e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/commented.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/commented.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/inaffectationfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/inaffectationfield.lua
index a8dc262..a8dc262 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/inaffectationfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/inaffectationfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/rawcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/rawcomment.lua
index 611a6e3..611a6e3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/rawcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/rawcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/simple.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/simple.lua
index 432cf35..432cf35 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/simple.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/simple.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/typed.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/typed.lua
index ebe34dc..ebe34dc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/typed.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/typed.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/withparent.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/withparent.lua
index fd8f0c6..fd8f0c6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfield/withparent.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfield/withparent.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/commented.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/commented.lua
index c9418a6..c9418a6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/commented.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/commented.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/complete.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/complete.lua
index 34196eb..34196eb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/complete.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/complete.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/differentname.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/differentname.lua
index e879e64..e879e64 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/differentname.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/differentname.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param.lua
index 66c231a..66c231a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param2.lua
index f4bae1f..f4bae1f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/param2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/return.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/return.lua
index e9a6559..e9a6559 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/return.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/return.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple.lua
index 4b59539..4b59539 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple2.lua
index 4d5e6a1..4d5e6a1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/simple2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withname.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withname.lua
index 516027c..516027c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withname.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withname.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent.lua
index b07642b..b07642b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent2.lua
index 3948983..3948983 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withparent2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withtag.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withtag.lua
index c92eb6b..c92eb6b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withtag.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalfunction/withtag.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield.lua
index 13063bd..13063bd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield2.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield2.lua
index ed064a2..ed064a2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield3.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield3.lua
index f06e0b5..f06e0b5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefield3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefunction.lua
index 6f247ac..6f247ac 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/samefunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/sametype.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/sametype.lua
index 945be09..945be09 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/sametype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmixedtag/sametype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/comment.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/comment.lua
index 00c9f41..00c9f41 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/comment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/comment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/differentname.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/differentname.lua
index 20aaa64..20aaa64 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/differentname.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/differentname.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/rawcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/rawcomment.lua
index c6a4ac8..c6a4ac8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/rawcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/rawcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/simple.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/simple.lua
index 72d5050..72d5050 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionalmodule/simple.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionalmodule/simple.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/commented.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/commented.lua
index fed580e..fed580e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/commented.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/commented.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/field.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/field.lua
index 4838522..4838522 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/field.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/field.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/function.lua
index 1b3ce15..1b3ce15 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/inaffectationfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/inaffectationfield.lua
index d1caff5..d1caff5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/inaffectationfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/inaffectationfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/inblockfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/inblockfield.lua
index 11d2d47..11d2d47 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/inblockfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/inblockfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/simple.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/simple.lua
index 647c201..647c201 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/optionaltype/simple.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/optionaltype/simple.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/globaldecfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/globaldecfunction.lua
index ffd51e9..ffd51e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/globaldecfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/globaldecfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/globalrecfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/globalrecfunction.lua
index 3750bd7..3750bd7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/globalrecfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/globalrecfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/indexfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/indexfunction.lua
index 3353667..3353667 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/indexfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/indexfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/localdecfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/localdecfunction.lua
index 56a3c20..56a3c20 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/localdecfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/localdecfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/localrecfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/localrecfunction.lua
index d62f59d..d62f59d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/input/parameters/localrecfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/input/parameters/localrecfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/commenttyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/commenttyping.serialized
index bec05a6..bec05a6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/commenttyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/commenttyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionafter.serialized
index 50f28c7..50f28c7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionbefore.serialized
index ca29182..ca29182 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionpriority.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionpriority.serialized
index 0ea9d4f..0ea9d4f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionpriority.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/descriptionpriority.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping.serialized
index e11fe46..e11fe46 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping2.serialized
index 830c009..830c009 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/fieldtagtyping2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/moduletagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/moduletagtyping.serialized
index 1a996c9..1a996c9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/moduletagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/moduletagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.lua
index 6e8d648..6e8d648 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.serialized
index 8826a1a..8826a1a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionbefore.serialized
index a505fb8..a505fb8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/nodescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/notglobal.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/notglobal.serialized
index c21f538..c21f538 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/notglobal.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/notglobal.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/typetagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/typetagtyping.serialized
index 80de7f5..80de7f5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfield/typetagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfield/typetagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/functiontagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/functiontagtyping.serialized
index 9b898c3..9b898c3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/functiontagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/functiontagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldec.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldec.serialized
index 84fa437..84fa437 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldec.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldec.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionafter.serialized
index 480d246..480d246 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionbefore.serialized
index a70516d..a70516d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionpriority.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionpriority.serialized
index 2e48463..2e48463 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionpriority.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecdescriptionpriority.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionafter.serialized
index 18bb058..18bb058 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionbefore.serialized
index c0f1e61..c0f1e61 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globaldecnodescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrec.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrec.serialized
index 6b7fc7e..6b7fc7e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrec.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrec.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionafter.serialized
index 1ed3023..1ed3023 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionbefore.serialized
index 4441b5f..4441b5f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecdescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionafter.serialized
index 055a3a9..055a3a9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionbefore.serialized
index d800419..d800419 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/globalrecnodescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobaldec.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobaldec.serialized
index 12bd9bd..12bd9bd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobaldec.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobaldec.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobalrec.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobalrec.serialized
index 0f3ee16..0f3ee16 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobalrec.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globalfunction/notglobalrec.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction1.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction1.serialized
index 2f313dc..2f313dc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction1.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction1.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction2.serialized
index 743d1ec..743d1ec 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction3.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction3.serialized
index 5942d8e..5942d8e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction3.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectfunction3.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype1.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype1.serialized
index 429649a..429649a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype1.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype1.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype2.serialized
index c9637a6..c9637a6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/affectprimitivetype2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap1.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap1.serialized
index 7b76d52..7b76d52 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap1.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap1.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap2.serialized
index c5bb9bd..c5bb9bd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap3.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap3.serialized
index 16d1b90..16d1b90 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap3.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/deepmap3.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/emptytable.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/emptytable.serialized
index 7c8bfbf..7c8bfbf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/emptytable.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/emptytable.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/list.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/list.serialized
index 60ad7ff..60ad7ff 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/list.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/list.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/map1.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/map1.serialized
index f3a4cf0..f3a4cf0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/map1.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/map1.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/map2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/map2.serialized
index 3eca012..3eca012 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/map2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/map2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap.serialized
index 5b5c461..5b5c461 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap2.serialized
index bd52743..bd52743 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/mixedlistmap2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/recursivetable.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/recursivetable.serialized
index e3ba765..e3ba765 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/globaltable/recursivetable.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/globaltable/recursivetable.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/commenttyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/commenttyping.serialized
index 8ada504..8ada504 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/commenttyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/commenttyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionafter.serialized
index 5928658..5928658 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionbefore.serialized
index a56e0c4..a56e0c4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionpriority.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionpriority.serialized
index ca84676..ca84676 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionpriority.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/descriptionpriority.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/fieldtagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/fieldtagtyping.serialized
index 70eb765..70eb765 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/fieldtagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/fieldtagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/moduletagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/moduletagtyping.serialized
index 54f4ab3..54f4ab3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/moduletagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/moduletagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionafter.serialized
index 2cf322b..2cf322b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionbefore.serialized
index b9ca5fc..b9ca5fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/nodescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/typetagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/typetagtyping.serialized
index 5320266..5320266 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfield/typetagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfield/typetagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/functiontagtyping.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/functiontagtyping.serialized
index 82c8ef1..82c8ef1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/functiontagtyping.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/functiontagtyping.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdec.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdec.serialized
index d5b6701..d5b6701 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdec.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdec.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionafter.serialized
index 5fb98e9..5fb98e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionbefore.serialized
index 6e1852b..6e1852b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionpriority.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionpriority.serialized
index b3dcf7b..b3dcf7b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionpriority.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecdescriptionpriority.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionafter.serialized
index dab862c..dab862c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionbefore.serialized
index 5b10c56..5b10c56 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localdecnodescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrec.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrec.serialized
index e183a79..e183a79 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrec.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrec.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionafter.serialized
index 33def30..33def30 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionbefore.serialized
index f06a17f..f06a17f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionpriority.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionpriority.serialized
index 0092cd0..0092cd0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionpriority.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecdescriptionpriority.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionafter.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionafter.serialized
index 21e01d6..21e01d6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionafter.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionafter.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionbefore.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionbefore.serialized
index dfb5c6d..dfb5c6d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionbefore.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/localfunction/localrecnodescriptionbefore.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/alloptional.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/alloptional.serialized
index 51932bb..51932bb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/alloptional.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/alloptional.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/commented.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/commented.serialized
index ed641a8..ed641a8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/commented.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/commented.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/inaffectationfield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/inaffectationfield.serialized
index 5aa44cb..5aa44cb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/inaffectationfield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/inaffectationfield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/rawcomment.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/rawcomment.serialized
index c1a05ae..c1a05ae 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/rawcomment.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/rawcomment.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/simple.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/simple.serialized
index 6637f90..6637f90 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/simple.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/simple.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/typed.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/typed.serialized
index 22ddcf8..22ddcf8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/typed.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/typed.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/withparent.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/withparent.serialized
index a5c07f8..a5c07f8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfield/withparent.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfield/withparent.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/commented.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/commented.serialized
index faa3323..faa3323 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/commented.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/commented.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/complete.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/complete.serialized
index 135c97a..135c97a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/complete.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/complete.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/differentname.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/differentname.serialized
index d1a2fae..d1a2fae 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/differentname.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/differentname.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param.serialized
index 153352a..153352a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param2.serialized
index baa9894..baa9894 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/param2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/return.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/return.serialized
index 6f0ebfc..6f0ebfc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/return.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/return.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple.serialized
index 4309fe6..4309fe6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple2.serialized
index 6874761..6874761 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/simple2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withname.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withname.serialized
index a8c0b40..a8c0b40 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withname.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withname.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent.serialized
index bc4e7a0..bc4e7a0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent2.serialized
index 273e083..273e083 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withparent2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withtag.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withtag.serialized
index fc589d8..fc589d8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withtag.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalfunction/withtag.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield.serialized
index edaf164..edaf164 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield2.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield2.serialized
index d1ae8ca..d1ae8ca 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield2.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield2.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield3.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield3.serialized
index 5ad66cc..5ad66cc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield3.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefield3.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefunction.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefunction.serialized
index e3b0233..e3b0233 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefunction.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/samefunction.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/sametype.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/sametype.serialized
index dd9d989..dd9d989 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/sametype.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmixedtag/sametype.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/comment.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/comment.serialized
index ca65b8c..ca65b8c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/comment.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/comment.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/differentname.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/differentname.serialized
index b47d2bd..b47d2bd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/differentname.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/differentname.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/rawcomment.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/rawcomment.serialized
index 1c7714a..1c7714a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/rawcomment.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/rawcomment.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/simple.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/simple.serialized
index 690c0e9..690c0e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/simple.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionalmodule/simple.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/commented.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/commented.serialized
index 83fb73f..83fb73f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/commented.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/commented.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/field.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/field.serialized
index 8e1321e..8e1321e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/field.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/field.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/function.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/function.serialized
index 0757a95..0757a95 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/function.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/function.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inaffectationfield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inaffectationfield.serialized
index 5a84e38..5a84e38 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inaffectationfield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inaffectationfield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inblockfield.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inblockfield.serialized
index 9549183..9549183 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inblockfield.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/inblockfield.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/simple.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/simple.serialized
index d5c4e3d..d5c4e3d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/optionaltype/simple.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/optionaltype/simple.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/globaldecfunction.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/globaldecfunction.serialized
index f2db8ea..f2db8ea 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/globaldecfunction.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/globaldecfunction.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/globalrecfunction.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/globalrecfunction.serialized
index faec851..faec851 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/globalrecfunction.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/globalrecfunction.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/indexfunction.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/indexfunction.serialized
index bcfde9e..bcfde9e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/indexfunction.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/indexfunction.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/localdecfunction.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/localdecfunction.serialized
index 06d1523..06d1523 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/localdecfunction.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/localdecfunction.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/localrecfunction.serialized b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/localrecfunction.serialized
index 423f63e..423f63e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/reference/parameters/localrecfunction.serialized
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/reference/parameters/localrecfunction.serialized
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/test.lua b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/test.lua
index 4689885..4689885 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/bothmodel/test.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/bothmodel/test.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/call.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/call.lua
index f6ad8ed..f6ad8ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/call.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/call.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/call2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/call2.lua
index 3cfb38d..3cfb38d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/call2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/call2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/callindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/callindex.lua
index 4d78c6c..4d78c6c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/callindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/callindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/do.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/do.lua
index 52d92e7..52d92e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/do.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/do.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/doubledo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/doubledo.lua
index c97861a..c97861a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/doubledo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/doubledo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/doublefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/doublefor.lua
index 3779ffb..3779ffb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/doublefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/doublefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/for.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/for.lua
index 4a0f192..4a0f192 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/for.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/for.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/forin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/forin.lua
index d1db3f6..d1db3f6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/forin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/forin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/function.lua
index a01a407..a01a407 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/function2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/function2.lua
index 6045c45..6045c45 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/function2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/function2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/if.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/if.lua
index 845e155..845e155 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/if.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/if.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/ifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/ifelse.lua
index 45af067..45af067 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/ifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/ifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/ifelseif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/ifelseif.lua
index 3aa173b..3aa173b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/ifelseif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/ifelseif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/ifelseifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/ifelseifelse.lua
index 8e3ba33..8e3ba33 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/ifelseifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/ifelseifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/index.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/index.lua
index e3173cb..e3173cb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/index.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/index.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/invoke.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/invoke.lua
index 0527d11..0527d11 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/invoke.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/invoke.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/invoke2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/invoke2.lua
index d7d0d64..d7d0d64 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/invoke2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/invoke2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/local.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/local.lua
index c5082a5..c5082a5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/local.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/local.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/localfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/localfunction.lua
index c26c306..c26c306 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/localfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/localfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/localfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/localfunction2.lua
index c33ba42..c33ba42 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/localfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/localfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longString.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longString.lua
index 60da0f3..60da0f3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longString.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longString.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longString2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longString2.lua
index 6c06fed..6c06fed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longString2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longString2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longstring.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longstring.lua
index d59a7e7..d59a7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longstring.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longstring.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longstring2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longstring2.lua
index 4272aa7..4272aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/longstring2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/longstring2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall.lua
index 4f0da21..4f0da21 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall2.lua
index 9a6b6fb..9a6b6fb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall3.lua
index a8d119a..a8d119a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall4.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall4.lua
index 9813c0c..9813c0c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall4.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall4.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall5.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall5.lua
index 57021ed..57021ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall5.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall5.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall6.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall6.lua
index a19c2e2..a19c2e2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecall6.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecall6.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecallindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecallindex.lua
index 242f408..242f408 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinecallindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinecallindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinefor.lua
index a459653..a459653 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineforin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineforin.lua
index d2f6016..d2f6016 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineforin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineforin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineforin2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineforin2.lua
index 6d48f55..6d48f55 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineforin2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineforin2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineif.lua
index 29a9dc2..29a9dc2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineindex.lua
index 95f9205..95f9205 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineinvokeindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineinvokeindex.lua
index d162a99..d162a99 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineinvokeindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineinvokeindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinelocal.lua
index 9442248..9442248 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction.lua
index 768a818..768a818 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction2.lua
index 2976f2a..2976f2a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinelocalfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinerepeat.lua
index debe47f..debe47f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinereturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinereturn.lua
index 3faac13..3faac13 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinereturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinereturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineset.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineset.lua
index 7c86a13..7c86a13 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilineset.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilineset.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinewhile.lua
index c36c5f7..c36c5f7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/multilinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/multilinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinedo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinedo.lua
index 6308301..6308301 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinedo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinedo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinefor.lua
index 21e6660..21e6660 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelineif.lua
index d15ae53..d15ae53 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinelocal.lua
index dc6668c..dc6668c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinerepeat.lua
index 28f1494..28f1494 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinetable.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinetable.lua
index 08ada4f..08ada4f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinetable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinetable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinewhile.lua
index d951b76..d951b76 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/onelinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/onelinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/repeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/repeat.lua
index 216bcb1..216bcb1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/repeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/repeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/return.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/return.lua
index 0df9306..0df9306 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/return.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/return.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/set.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/set.lua
index 098a7e9..098a7e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/set.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/set.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/table.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/table.lua
index 45efe6f..45efe6f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/table.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/table.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/table2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/table2.lua
index 28ab466..28ab466 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/table2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/table2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/table3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/table3.lua
index 2fc11e1..2fc11e1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/table3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/table3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/while.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/while.lua
index 156462f..156462f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/basic/while.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/basic/while.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/assignmentcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/assignmentcomment.lua
index 0762bca..0762bca 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/assignmentcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/assignmentcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/longafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/longafter.lua
index 2f4945b..2f4945b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/longafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/longafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/longbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/longbefore.lua
index 5627fe0..5627fe0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/longbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/longbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/paramcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/paramcomment.lua
index 3cfb38d..3cfb38d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/paramcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/paramcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/shebang.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/shebang.lua
index c71f520..c71f520 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/shebang.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/shebang.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/shortafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/shortafter.lua
index c9e1a77..c9e1a77 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/shortafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/shortafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/shortbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/shortbefore.lua
index cf48488..cf48488 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/comment/shortbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/comment/shortbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/5level.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/5level.lua
index 85a119d..85a119d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/5level.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/5level.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/blankspace.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/blankspace.lua
index e635860..e635860 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/blankspace.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/blankspace.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/firstline.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/firstline.lua
index d7b450c..d7b450c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/firstline.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/firstline.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/geometry.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/geometry.lua
index 4e3ee58..4e3ee58 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/geometry.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/geometry.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/indexparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/indexparam.lua
index 88ab77b..88ab77b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/indexparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/indexparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/inlineblock.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/inlineblock.lua
index b0c9033..b0c9033 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/inlineblock.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/inlineblock.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/module.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/module.lua
index 229470f..229470f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/module.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/module.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/multipleFunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/multipleFunction.lua
index 5e88fe3..5e88fe3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/multipleFunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/multipleFunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/multipleStatement.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/multipleStatement.lua
index 1d47c85..1d47c85 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/multipleStatement.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/multipleStatement.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/multipleassignment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/multipleassignment.lua
index d89bc54..d89bc54 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/input/complex/multipleassignment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/input/complex/multipleassignment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call.lua
index f6ad8ed..f6ad8ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call2.lua
index ce39a63..ce39a63 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/call2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/callindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/callindex.lua
index 4d78c6c..4d78c6c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/callindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/callindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/do.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/do.lua
index 3c33633..3c33633 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/do.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/do.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doubledo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doubledo.lua
index ceb3827..ceb3827 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doubledo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doubledo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doublefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doublefor.lua
index a4541b7..a4541b7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doublefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/doublefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/for.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/for.lua
index feb06ac..feb06ac 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/for.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/for.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/forin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/forin.lua
index 0d85ff3..0d85ff3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/forin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/forin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function.lua
index 12780aa..12780aa 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function2.lua
index aa607da..aa607da 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/function2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/if.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/if.lua
index e59f518..e59f518 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/if.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/if.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelse.lua
index 33a8702..33a8702 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseif.lua
index db348b8..db348b8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseifelse.lua
index e1685a4..e1685a4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/ifelseifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/index.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/index.lua
index e3173cb..e3173cb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/index.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/index.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke.lua
index 0527d11..0527d11 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke2.lua
index 238ca48..238ca48 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/invoke2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/local.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/local.lua
index c5082a5..c5082a5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/local.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/local.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction.lua
index 0e02612..0e02612 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction2.lua
index cbb496f..cbb496f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/localfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString.lua
index d59a7e7..d59a7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString2.lua
index 4272aa7..4272aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longString2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring.lua
index d59a7e7..d59a7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring2.lua
index 4272aa7..4272aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/longstring2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall.lua
index 0e2d7f5..0e2d7f5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall2.lua
index 9a1e60a..9a1e60a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall3.lua
index 68e1958..68e1958 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall4.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall4.lua
index ce3dde3..ce3dde3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall4.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall4.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall5.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall5.lua
index 59914a4..59914a4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall5.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall5.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall6.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall6.lua
index db55e74..db55e74 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall6.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecall6.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecallindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecallindex.lua
index a245648..a245648 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecallindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinecallindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinefor.lua
index bc129f2..bc129f2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin.lua
index 74c1d48..74c1d48 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin2.lua
index 6dac89e..6dac89e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineforin2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineif.lua
index 7147316..7147316 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineindex.lua
index 713bdc9..713bdc9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineinvokeindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineinvokeindex.lua
index c81d93e..c81d93e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineinvokeindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineinvokeindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocal.lua
index 0299df7..0299df7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction.lua
index 9759563..9759563 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction2.lua
index a56e7aa..a56e7aa 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinelocalfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinerepeat.lua
index 4baa119..4baa119 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinereturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinereturn.lua
index fe438e0..fe438e0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinereturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinereturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineset.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineset.lua
index 28dc952..28dc952 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineset.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilineset.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinewhile.lua
index dec2be9..dec2be9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/multilinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinedo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinedo.lua
index 6308301..6308301 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinedo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinedo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinefor.lua
index 547d77d..547d77d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelineif.lua
index d15ae53..d15ae53 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinelocal.lua
index 2be3ad0..2be3ad0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinerepeat.lua
index 28f1494..28f1494 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinetable.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinetable.lua
index 08ada4f..08ada4f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinetable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinetable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinewhile.lua
index d951b76..d951b76 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/onelinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/repeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/repeat.lua
index 85eb255..85eb255 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/repeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/repeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/return.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/return.lua
index 0df9306..0df9306 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/return.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/return.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/set.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/set.lua
index 098a7e9..098a7e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/set.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/set.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table.lua
index 9d9c701..9d9c701 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table2.lua
index abd2dc4..abd2dc4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table3.lua
index d819d0b..d819d0b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/table3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/while.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/while.lua
index fdce844..fdce844 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/basic/while.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/basic/while.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/assignmentcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/assignmentcomment.lua
index f91585b..f91585b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/assignmentcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/assignmentcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longafter.lua
index 55952a2..55952a2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longbefore.lua
index 2c5aedf..2c5aedf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/longbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/paramcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/paramcomment.lua
index ce39a63..ce39a63 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/paramcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/paramcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shebang.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shebang.lua
index 9fba21d..9fba21d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shebang.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shebang.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortafter.lua
index e0d443e..e0d443e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortbefore.lua
index 38d8f32..38d8f32 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/comment/shortbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/5level.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/5level.lua
index 3780b5a..3780b5a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/5level.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/5level.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/blankspace.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/blankspace.lua
index 10ac2fc..10ac2fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/blankspace.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/blankspace.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/firstline.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/firstline.lua
index e4a5198..e4a5198 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/firstline.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/firstline.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/geometry.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/geometry.lua
index e6cfb33..e6cfb33 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/geometry.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/geometry.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/indexparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/indexparam.lua
index fd6144c..fd6144c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/indexparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/indexparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/inlineblock.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/inlineblock.lua
index 71f4cda..71f4cda 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/inlineblock.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/inlineblock.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/module.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/module.lua
index e5c1b3e..e5c1b3e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/module.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/module.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleFunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleFunction.lua
index 175139b..175139b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleFunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleFunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleStatement.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleStatement.lua
index 1900a40..1900a40 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleStatement.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleStatement.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleassignment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleassignment.lua
index 6762f7e..6762f7e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleassignment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/4spaces/complex/multipleassignment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/call.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/call.lua
index f6ad8ed..f6ad8ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/call.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/call.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/call2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/call2.lua
index 8b401f8..8b401f8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/call2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/call2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/callindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/callindex.lua
index 4d78c6c..4d78c6c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/callindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/callindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/do.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/do.lua
index ea26db4..ea26db4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/do.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/do.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/doubledo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/doubledo.lua
index 5c1065c..5c1065c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/doubledo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/doubledo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/doublefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/doublefor.lua
index 48b669a..48b669a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/doublefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/doublefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/for.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/for.lua
index f1eb959..f1eb959 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/for.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/for.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/forin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/forin.lua
index ad4ffea..ad4ffea 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/forin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/forin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/function.lua
index 2e856a3..2e856a3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/function2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/function2.lua
index 716ffda..716ffda 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/function2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/function2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/if.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/if.lua
index 546ca22..546ca22 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/if.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/if.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelse.lua
index af95792..af95792 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseif.lua
index 12b18bf..12b18bf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseifelse.lua
index 7bd8ad7..7bd8ad7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/ifelseifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/index.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/index.lua
index e3173cb..e3173cb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/index.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/index.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke.lua
index 0527d11..0527d11 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke2.lua
index 926fd90..926fd90 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/invoke2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/local.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/local.lua
index c5082a5..c5082a5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/local.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/local.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction.lua
index 4f3d381..4f3d381 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction2.lua
index 0a6820b..0a6820b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/localfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString.lua
index d59a7e7..d59a7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString2.lua
index 4272aa7..4272aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longString2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring.lua
index d59a7e7..d59a7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring2.lua
index 4272aa7..4272aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/longstring2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall.lua
index 323b4db..323b4db 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall2.lua
index 2ef8684..2ef8684 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall3.lua
index da0140a..da0140a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall4.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall4.lua
index 27766ea..27766ea 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall4.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall4.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall5.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall5.lua
index f568dc3..f568dc3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall5.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall5.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall6.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall6.lua
index 19c4df4..19c4df4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall6.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecall6.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecallindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecallindex.lua
index e070815..e070815 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecallindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinecallindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinefor.lua
index a49f299..a49f299 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin.lua
index 8b97eab..8b97eab 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin2.lua
index f8e269e..f8e269e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineforin2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineif.lua
index 36ce80a..36ce80a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineindex.lua
index 434f188..434f188 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineinvokeindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineinvokeindex.lua
index b966ad1..b966ad1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineinvokeindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineinvokeindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocal.lua
index 24c4639..24c4639 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction.lua
index a7f2076..a7f2076 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction2.lua
index 4b8c3c0..4b8c3c0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinelocalfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinerepeat.lua
index 7011080..7011080 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinereturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinereturn.lua
index 7787898..7787898 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinereturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinereturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineset.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineset.lua
index dcbbc2f..dcbbc2f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineset.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilineset.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinewhile.lua
index dedf995..dedf995 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/multilinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinedo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinedo.lua
index 6308301..6308301 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinedo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinedo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinefor.lua
index 547d77d..547d77d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelineif.lua
index d15ae53..d15ae53 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinelocal.lua
index 2be3ad0..2be3ad0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinerepeat.lua
index 28f1494..28f1494 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinetable.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinetable.lua
index 08ada4f..08ada4f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinetable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinetable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinewhile.lua
index d951b76..d951b76 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/onelinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/repeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/repeat.lua
index 3840e66..3840e66 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/repeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/repeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/return.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/return.lua
index 0df9306..0df9306 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/return.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/return.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/set.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/set.lua
index 098a7e9..098a7e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/set.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/set.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/table.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/table.lua
index 8d44fbd..8d44fbd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/table.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/table.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/table2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/table2.lua
index 12cbb46..12cbb46 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/table2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/table2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/table3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/table3.lua
index a04f1f9..a04f1f9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/table3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/table3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/while.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/while.lua
index f0c8729..f0c8729 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/basic/while.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/basic/while.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/assignmentcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/assignmentcomment.lua
index 864e1c7..864e1c7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/assignmentcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/assignmentcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/longafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/longafter.lua
index e833b08..e833b08 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/longafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/longafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/longbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/longbefore.lua
index b08284b..b08284b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/longbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/longbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/paramcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/paramcomment.lua
index 8b401f8..8b401f8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/paramcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/paramcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/shebang.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/shebang.lua
index f1c20a9..f1c20a9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/shebang.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/shebang.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortafter.lua
index 0fb745e..0fb745e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortbefore.lua
index f9f1496..f9f1496 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/comment/shortbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/5level.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/5level.lua
index b92bcc5..b92bcc5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/5level.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/5level.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/blankspace.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/blankspace.lua
index 10ac2fc..10ac2fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/blankspace.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/blankspace.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/firstline.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/firstline.lua
index e4a5198..e4a5198 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/firstline.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/firstline.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/geometry.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/geometry.lua
index 9acf9b7..9acf9b7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/geometry.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/geometry.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/indexparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/indexparam.lua
index 33ae429..33ae429 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/indexparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/indexparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/inlineblock.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/inlineblock.lua
index 71f4cda..71f4cda 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/inlineblock.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/inlineblock.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/module.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/module.lua
index 5a4526b..5a4526b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/module.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/module.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleFunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleFunction.lua
index bea8aa7..bea8aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleFunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleFunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleStatement.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleStatement.lua
index e42d007..e42d007 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleStatement.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleStatement.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleassignment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleassignment.lua
index a0c91b9..a0c91b9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleassignment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/mixed/complex/multipleassignment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/call.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/call.lua
index f6ad8ed..f6ad8ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/call.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/call.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/call2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/call2.lua
index c6366f1..c6366f1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/call2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/call2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/callindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/callindex.lua
index 4d78c6c..4d78c6c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/callindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/callindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/do.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/do.lua
index e185f0b..e185f0b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/do.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/do.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/doubledo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/doubledo.lua
index b3af7fa..b3af7fa 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/doubledo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/doubledo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/doublefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/doublefor.lua
index 7cabd08..7cabd08 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/doublefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/doublefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/for.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/for.lua
index ddabcd0..ddabcd0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/for.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/for.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/forin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/forin.lua
index 4d87eeb..4d87eeb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/forin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/forin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/function.lua
index 3832e82..3832e82 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/function2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/function2.lua
index 02d150a..02d150a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/function2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/function2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/if.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/if.lua
index 4ea988c..4ea988c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/if.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/if.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelse.lua
index 23030bc..23030bc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseif.lua
index 6e7328c..6e7328c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseifelse.lua
index 30fc866..30fc866 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/ifelseifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/index.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/index.lua
index e3173cb..e3173cb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/index.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/index.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke.lua
index 0527d11..0527d11 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke2.lua
index 0792994..0792994 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/invoke2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/local.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/local.lua
index c5082a5..c5082a5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/local.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/local.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction.lua
index 1c285e7..1c285e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction2.lua
index 09210cd..09210cd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/localfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longString.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longString.lua
index d59a7e7..d59a7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longString.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longString.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longString2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longString2.lua
index 4272aa7..4272aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longString2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longString2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring.lua
index d59a7e7..d59a7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring2.lua
index 4272aa7..4272aa7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/longstring2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall.lua
index b97fd8b..b97fd8b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall2.lua
index db322c1..db322c1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall3.lua
index 098f6cc..098f6cc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall4.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall4.lua
index 5a1d2e0..5a1d2e0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall4.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall4.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall5.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall5.lua
index cedee7f..cedee7f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall5.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall5.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall6.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall6.lua
index 2b708ae..2b708ae 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall6.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecall6.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecallindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecallindex.lua
index b615063..b615063 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecallindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinecallindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinefor.lua
index 588c796..588c796 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin.lua
index 3d216b2..3d216b2 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin2.lua
index 317dd71..317dd71 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineforin2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineif.lua
index 46bb55b..46bb55b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineindex.lua
index 9acf0d8..9acf0d8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineinvokeindex.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineinvokeindex.lua
index d461ba9..d461ba9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineinvokeindex.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineinvokeindex.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocal.lua
index 21032e8..21032e8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction.lua
index 575664e..575664e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction2.lua
index 117abbd..117abbd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinelocalfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinerepeat.lua
index 720c096..720c096 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinereturn.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinereturn.lua
index 8edd64c..8edd64c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinereturn.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinereturn.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineset.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineset.lua
index 2b20266..2b20266 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineset.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilineset.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinewhile.lua
index 59746de..59746de 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/multilinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinedo.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinedo.lua
index 6308301..6308301 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinedo.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinedo.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinefor.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinefor.lua
index 547d77d..547d77d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinefor.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinefor.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelineif.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelineif.lua
index d15ae53..d15ae53 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelineif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelineif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinelocal.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinelocal.lua
index 2be3ad0..2be3ad0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinelocal.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinelocal.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinerepeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinerepeat.lua
index 28f1494..28f1494 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinerepeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinerepeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinetable.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinetable.lua
index 08ada4f..08ada4f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinetable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinetable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinewhile.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinewhile.lua
index d951b76..d951b76 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinewhile.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/onelinewhile.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/repeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/repeat.lua
index 28bfa62..28bfa62 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/repeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/repeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/return.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/return.lua
index 0df9306..0df9306 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/return.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/return.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/set.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/set.lua
index 098a7e9..098a7e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/set.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/set.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/table.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/table.lua
index 45efe6f..45efe6f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/table.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/table.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/table2.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/table2.lua
index 1e4f416..1e4f416 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/table2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/table2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/table3.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/table3.lua
index 0f42ff6..0f42ff6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/table3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/table3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/while.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/while.lua
index 5db0491..5db0491 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/basic/while.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/basic/while.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/assignmentcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/assignmentcomment.lua
index ea1b7cc..ea1b7cc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/assignmentcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/assignmentcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/longafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/longafter.lua
index f58df14..f58df14 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/longafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/longafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/longbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/longbefore.lua
index 2092371..2092371 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/longbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/longbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/paramcomment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/paramcomment.lua
index c6366f1..c6366f1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/paramcomment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/paramcomment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/shebang.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/shebang.lua
index e9f5715..e9f5715 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/shebang.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/shebang.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/shortafter.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/shortafter.lua
index f606da4..f606da4 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/shortafter.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/shortafter.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/shortbefore.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/shortbefore.lua
index c1df5bc..c1df5bc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/comment/shortbefore.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/comment/shortbefore.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/5level.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/5level.lua
index bb668d5..bb668d5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/5level.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/5level.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/blankspace.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/blankspace.lua
index 10ac2fc..10ac2fc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/blankspace.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/blankspace.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/firstline.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/firstline.lua
index e4a5198..e4a5198 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/firstline.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/firstline.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/geometry.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/geometry.lua
index 7537fe6..7537fe6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/geometry.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/geometry.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/indexparam.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/indexparam.lua
index 739e693..739e693 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/indexparam.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/indexparam.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/inlineblock.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/inlineblock.lua
index 71f4cda..71f4cda 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/inlineblock.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/inlineblock.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/module.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/module.lua
index 8a5967f..8a5967f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/module.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/module.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleFunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleFunction.lua
index a6b8c0e..a6b8c0e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleFunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleFunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleStatement.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleStatement.lua
index aa555a9..aa555a9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleStatement.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleStatement.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleassignment.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleassignment.lua
index bbaa0cc..bbaa0cc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleassignment.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/reference/tab/complex/multipleassignment.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/test_4spaces.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/test_4spaces.lua
index 1a24cc6..1a24cc6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/test_4spaces.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/test_4spaces.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/test_mixed.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/test_mixed.lua
index 525be1a..525be1a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/test_mixed.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/test_mixed.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/test_tab.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatter/test_tab.lua
index 4c31560..4c31560 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatter/test_tab.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatter/test_tab.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/input/mac.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/input/mac.lua
index 6ce53b5..6ce53b5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/input/mac.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/input/mac.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/input/unix.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/input/unix.lua
index e9e5162..e9e5162 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/input/unix.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/input/unix.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/input/windows.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/input/windows.lua
index 6ce53b5..6ce53b5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/input/windows.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/input/windows.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/reference/mac.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/reference/mac.lua
index 4039050..4039050 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/reference/mac.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/reference/mac.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/reference/unix.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/reference/unix.lua
index 4933a12..4933a12 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/reference/unix.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/reference/unix.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/reference/windows.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/reference/windows.lua
index 9bbabe8..9bbabe8 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/reference/windows.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/reference/windows.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/test.lua b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/test.lua
index 2be842f..2be842f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/formatterlineendings/test.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/formatterlineendings/test.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/call.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/call.lua
index 8495486..8495486 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/call.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/call.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/global.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/global.lua
index b8d6459..b8d6459 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/global.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/global.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/identifier.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/identifier.lua
index 24b89f7..24b89f7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/identifier.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/identifier.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/index.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/index.lua
index 803a66a..803a66a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/index.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/index.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/invoke.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/invoke.lua
index 80a1b36..80a1b36 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/invoke.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/invoke.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/moduletyperef.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/moduletyperef.lua
index 5f98073..5f98073 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/basic/moduletyperef.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/basic/moduletyperef.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/do.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/do.lua
index f9298af..f9298af 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/do.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/do.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/forin.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/forin.lua
index a1f4733..a1f4733 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/forin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/forin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/fornum.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/fornum.lua
index 86e8233..86e8233 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/fornum.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/fornum.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/function.lua
index 617947e..617947e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/if.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/if.lua
index c2f890d..c2f890d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/if.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/if.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/ifelse.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/ifelse.lua
index fd702c5..fd702c5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/ifelse.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/ifelse.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/ifelseif.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/ifelseif.lua
index 9331a76..9331a76 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/ifelseif.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/ifelseif.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/repeat.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/repeat.lua
index 6d67215..6d67215 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/repeat.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/repeat.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/while.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/while.lua
index f53caa9..f53caa9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/block/while.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/block/while.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/list.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/list.lua
index 5a29c43..5a29c43 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/list.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/list.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/map.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/map.lua
index 6aaf80b..6aaf80b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/map.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/map.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/recursive.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/recursive.lua
index 4d4412d..4d4412d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/recursive.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/recursive.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/table.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/table.lua
index 007428f..007428f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/inlinetype/table.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/inlinetype/table.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/forin.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/forin.lua
index 1a63576..1a63576 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/forin.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/forin.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/fornum.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/fornum.lua
index 82e8942..82e8942 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/fornum.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/fornum.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/global.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/global.lua
index 20f8b2a..20f8b2a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/global.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/global.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/local.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/local.lua
index b348e54..b348e54 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/local.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/local.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/param.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/param.lua
index af0eadd..af0eadd 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/occurence/param.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/occurence/param.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/scope/for.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/scope/for.lua
index 0d06713..0d06713 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/scope/for.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/scope/for.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/scope/function.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/scope/function.lua
index 0897601..0897601 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/scope/function.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/scope/function.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectfunction1.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectfunction1.lua
index 5964182..5964182 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectfunction1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectfunction1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectfunction2.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectfunction2.lua
index 1526996..1526996 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectfunction2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectfunction2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectfunction3.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectfunction3.lua
index edacdba..edacdba 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectfunction3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectfunction3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype1.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype1.lua
index 9d87cee..9d87cee 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype2.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype2.lua
index faaf520..faaf520 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/affectprimitivetype2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/deepmap1.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/deepmap1.lua
index 342c7e7..342c7e7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/deepmap1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/deepmap1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/deepmap2.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/deepmap2.lua
index 5726b67..5726b67 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/deepmap2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/deepmap2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/deepmap3.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/deepmap3.lua
index aaa4ae7..aaa4ae7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/deepmap3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/deepmap3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/emptytable.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/emptytable.lua
index 8bc9768..8bc9768 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/emptytable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/emptytable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/list.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/list.lua
index efb1e11..efb1e11 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/list.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/list.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/map1.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/map1.lua
index c5ef6de..c5ef6de 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/map1.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/map1.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/map2.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/map2.lua
index ae59618..ae59618 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/map2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/map2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap.lua
index c3ec6eb..c3ec6eb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap2.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap2.lua
index 712b5bf..712b5bf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/mixedlistmap2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/recursivetable.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/recursivetable.lua
index c4949b6..c4949b6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/input/table/recursivetable.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/input/table/recursivetable.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/call.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/call.serialized.lua
index c59013a..c59013a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/call.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/call.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/global.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/global.serialized.lua
index bda7a1e..bda7a1e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/global.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/global.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/identifier.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/identifier.serialized.lua
index a37e0fb..a37e0fb 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/identifier.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/identifier.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/index.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/index.serialized.lua
index c48609a..c48609a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/index.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/index.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/invoke.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/invoke.serialized.lua
index 675dd3d..675dd3d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/invoke.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/invoke.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/moduletyperef.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/moduletyperef.serialized.lua
index 0a75226..0a75226 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/basic/moduletyperef.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/basic/moduletyperef.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/do.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/do.serialized.lua
index 0330295..0330295 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/do.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/do.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/forin.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/forin.serialized.lua
index 9affae3..9affae3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/forin.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/forin.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/fornum.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/fornum.serialized.lua
index 38e0a5d..38e0a5d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/fornum.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/fornum.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/function.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/function.serialized.lua
index 25858ab..25858ab 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/function.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/function.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/if.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/if.serialized.lua
index 39bd3b6..39bd3b6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/if.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/if.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/ifelse.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/ifelse.serialized.lua
index 6b89e72..6b89e72 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/ifelse.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/ifelse.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/ifelseif.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/ifelseif.serialized.lua
index db27ff6..db27ff6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/ifelseif.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/ifelseif.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/repeat.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/repeat.serialized.lua
index ce30b2b..ce30b2b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/repeat.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/repeat.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/while.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/while.serialized.lua
index 0ff2627..0ff2627 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/block/while.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/block/while.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/list.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/list.serialized.lua
index 78cc7b1..78cc7b1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/list.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/list.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/map.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/map.serialized.lua
index c84f0c6..c84f0c6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/map.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/map.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/recursive.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/recursive.serialized.lua
index 3c4ca1a..3c4ca1a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/recursive.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/recursive.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/table.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/table.serialized.lua
index e2ae672..e2ae672 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/inlinetype/table.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/inlinetype/table.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/forin.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/forin.serialized.lua
index bbc8023..bbc8023 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/forin.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/forin.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/fornum.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/fornum.serialized.lua
index c5de71e..c5de71e 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/fornum.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/fornum.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/global.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/global.serialized.lua
index c6dd6a1..c6dd6a1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/global.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/global.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/local.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/local.serialized.lua
index ba733ed..ba733ed 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/local.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/local.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/param.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/param.serialized.lua
index 6e06a60..6e06a60 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/occurence/param.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/occurence/param.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/scope/for.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/scope/for.serialized.lua
index eac1f6a..eac1f6a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/scope/for.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/scope/for.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/scope/function.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/scope/function.serialized.lua
index 9e3e498..9e3e498 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/scope/function.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/scope/function.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction1.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction1.serialized.lua
index 5734b4a..5734b4a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction1.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction1.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction2.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction2.serialized.lua
index 70fe9c7..70fe9c7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction2.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction2.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction3.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction3.serialized.lua
index fbe2b21..fbe2b21 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction3.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectfunction3.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype1.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype1.serialized.lua
index beb1999..beb1999 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype1.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype1.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype2.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype2.serialized.lua
index 28cc9a5..28cc9a5 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype2.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/affectprimitivetype2.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/deepmap1.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/deepmap1.serialized.lua
index 736ff23..736ff23 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/deepmap1.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/deepmap1.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/deepmap2.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/deepmap2.serialized.lua
index 0302015..0302015 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/deepmap2.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/deepmap2.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/deepmap3.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/deepmap3.serialized.lua
index 17ed9a6..17ed9a6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/deepmap3.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/deepmap3.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/emptytable.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/emptytable.serialized.lua
index 0873ffe..0873ffe 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/emptytable.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/emptytable.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/list.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/list.serialized.lua
index 05be39c..05be39c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/list.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/list.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/map1.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/map1.serialized.lua
index 8065826..8065826 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/map1.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/map1.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/map2.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/map2.serialized.lua
index 12e8ee7..12e8ee7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/map2.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/map2.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap.serialized.lua
index 6c5edfc..6c5edfc 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap2.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap2.serialized.lua
index 7e9097f..7e9097f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap2.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/mixedlistmap2.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/recursivetable.serialized.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/recursivetable.serialized.lua
index fefdee3..fefdee3 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/reference/table/recursivetable.serialized.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/reference/table/recursivetable.serialized.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/test.lua b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/test.lua
index 94f8510..94f8510 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/internalmodel/test.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/internalmodel/test.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfield.lua
index 3f58d73..3f58d73 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfieldverbose.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfieldverbose.lua
index 0dc66c7..0dc66c7 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfieldverbose.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfieldverbose.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfunction.lua
index e5fc38b..e5fc38b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalmodule.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalmodule.lua
index 5b2be03..5b2be03 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externalmodule.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externalmodule.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltype.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltype.lua
index 03eae25..03eae25 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltypewithdots.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltypewithdots.lua
index 5175b3c..5175b3c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltypewithdots.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/externaltypewithdots.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfield.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfield.lua
index 9da7409..9da7409 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfield.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfield.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfieldverbose.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfieldverbose.lua
index fbdf83a..fbdf83a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfieldverbose.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfieldverbose.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfunction.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfunction.lua
index 3d5c4e9..3d5c4e9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfunction.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internalfunction.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internaltype.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internaltype.lua
index 1f72b43..1f72b43 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/inlinelink/internaltype.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/inlinelink/internaltype.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/code.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/code.lua
index 4f121a6..4f121a6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/code.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/code.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/code2.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/code2.lua
index 366f87d..366f87d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/code2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/code2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/code3.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/code3.lua
index b23a01c..b23a01c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/code3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/code3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/emphasis.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/emphasis.lua
index 6299ac1..6299ac1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/emphasis.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/emphasis.lua
diff --git a/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/link.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/link.lua
new file mode 100644
index 0000000..0d7b190
--- /dev/null
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/link.lua
@@ -0,0 +1,8 @@
+---
+-- Module to process.
+--
+-- This is an [example link](http://eclipse.org/ldt).
+--
+-- @module link
+
+return nil
diff --git a/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/link2.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/link2.lua
new file mode 100644
index 0000000..373e1f6
--- /dev/null
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/link2.lua
@@ -0,0 +1,8 @@
+---
+-- Module to process.
+--
+-- This is an [example link](http://eclipse.org/ldt "link title").
+--
+-- @module link2
+
+return nil
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list.lua
index 3913a10..3913a10 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list2.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list2.lua
index 5269326..5269326 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list3.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list3.lua
index 6424b3a..6424b3a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list3.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list3.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list4.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list4.lua
index 77d94ec..77d94ec 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/list4.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/list4.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/paragraph.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/paragraph.lua
index d7a2e24..d7a2e24 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/paragraph.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/paragraph.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/quote.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/quote.lua
index 28ac636..28ac636 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/quote.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/quote.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/strong.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/strong.lua
index eb70983..eb70983 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/strong.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/strong.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/title.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/title.lua
index 0b22461..0b22461 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/title.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/title.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/title2.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/title2.lua
index 3438029..3438029 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/input/markdown/title2.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/input/markdown/title2.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/jmdtest.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/jmdtest.lua
index 6cb83e1..6cb83e1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/jmdtest.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/jmdtest.lua
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html
index 14c574c..14c574c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfieldverbose.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfieldverbose.html
index 14c574c..14c574c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfieldverbose.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfieldverbose.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html
index ddfc342..ddfc342 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html
index 92a6a53..92a6a53 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html
index 07e8856..07e8856 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltypewithdots.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltypewithdots.html
index 00752d9..00752d9 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltypewithdots.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltypewithdots.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html
index 2ac46b1..2ac46b1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfieldverbose.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfieldverbose.html
index 2ac46b1..2ac46b1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfieldverbose.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfieldverbose.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html
index 938531d..938531d 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html
index 2d029a0..2d029a0 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/code.html
index d98544a..d98544a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/code.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html
index f937b5a..f937b5a 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code3.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/code3.html
index be25c15..be25c15 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code3.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/code3.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html
index 6895da6..6895da6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/link.html
index 94a2712..bcf7c57 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/link.html
@@ -2,7 +2,7 @@
    <h1>Module <code>link</code></h1>
     <p>Module to process.</p>
     <p>
-    This is an <a href="http://eclipse.org/koneki/ldt">example link</a>.
+    This is an <a href="http://eclipse.org/ldt">example link</a>.
     </p>
 	
 	<h2><a id="#(link)">Type <code>link</code></a></h2>
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html
index 725c682..e317305 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html
@@ -2,7 +2,7 @@
    <h1>Module <code>link2</code></h1>
    <p>Module to process.</p>
     <p>    
-    This is an <a href="http://eclipse.org/koneki/ldt" title="link title">example link</a>.
+    This is an <a href="http://eclipse.org/ldt" title="link title">example link</a>.
     </p>
 	
 	<h2><a id="#(link2)">Type <code>link2</code></a></h2>
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list.html
index d83d0d6..d83d0d6 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html
index 509fc77..509fc77 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html
index 6f630b1..6f630b1 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html
index 5aa8d58..5aa8d58 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html
index c5e1894..c5e1894 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html
index 82d3649..82d3649 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html
index 7c68d23..7c68d23 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html
index f90d86c..f90d86c 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/title.html
index 840ef4f..840ef4f 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/title.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html
index e02719b..e02719b 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html
diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/test.lua b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/test.lua
index b4b23cf..b4b23cf 100644
--- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/test.lua
+++ b/tests/org.eclipse.ldt.lua.tests/tests/templateengine/test.lua
diff --git a/tests/org.eclipse.ldt.metalua.tests/.checkstyle b/tests/org.eclipse.ldt.metalua.tests/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/tests/org.eclipse.ldt.metalua.tests/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.classpath b/tests/org.eclipse.ldt.metalua.tests/.classpath
index ad32c83..ad32c83 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.classpath
+++ b/tests/org.eclipse.ldt.metalua.tests/.classpath
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.fbprefs b/tests/org.eclipse.ldt.metalua.tests/.fbprefs
index 968afbf..968afbf 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.fbprefs
+++ b/tests/org.eclipse.ldt.metalua.tests/.fbprefs
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.project b/tests/org.eclipse.ldt.metalua.tests/.project
index bdbb472..cc90874 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.project
+++ b/tests/org.eclipse.ldt.metalua.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.metalua.tests</name>
+	<name>org.eclipse.ldt.metalua.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.jdt.core.prefs
index 910ca67..910ca67 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.pde.core.prefs
+++ b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/.settings/org.eclipse.pde.prefs
+++ b/tests/org.eclipse.ldt.metalua.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ldt.metalua.tests/META-INF/MANIFEST.MF
index 36ba89c..360c0a1 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ldt.metalua.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.metalua.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.metalua.tests;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.5.0",
  org.eclipse.osgi;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.koneki.ldt.metalua;bundle-version="0.9.0",
+ org.eclipse.ldt.metalua;bundle-version="0.9.0",
  com.naef.jnlua;bundle-version="[0.9.1,1.0.0)"
-Export-Package: org.eclipse.koneki.ldt.metalua.tests,
- org.eclipse.koneki.ldt.metalua.tests.internal.cases;x-internal:=true
+Export-Package: org.eclipse.ldt.metalua.tests,
+ org.eclipse.ldt.metalua.tests.internal.cases;x-internal:=true
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.ldt.metalua.tests/OSGI-INF/l10n/bundle.properties
index e3d8584..fc11075 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/org.eclipse.ldt.metalua.tests/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.metalua.tests
+#Properties file for org.eclipse.ldt.metalua.tests
 Bundle-Name = Metalua Tests
-Bundle-Vendor = Eclipse Koneki
+Bundle-Vendor = Eclipse LDT
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/build.properties b/tests/org.eclipse.ldt.metalua.tests/build.properties
index 6087129..6087129 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/build.properties
+++ b/tests/org.eclipse.ldt.metalua.tests/build.properties
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/pom.xml b/tests/org.eclipse.ldt.metalua.tests/pom.xml
index 6ad2790..40b8db1 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/pom.xml
+++ b/tests/org.eclipse.ldt.metalua.tests/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.metalua.tests</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.metalua.tests</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/scripts/assignment.lua b/tests/org.eclipse.ldt.metalua.tests/scripts/assignment.lua
index 658f69c..658f69c 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/scripts/assignment.lua
+++ b/tests/org.eclipse.ldt.metalua.tests/scripts/assignment.lua
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/scripts/introspection.mlua b/tests/org.eclipse.ldt.metalua.tests/scripts/introspection.mlua
index cf26ea2..cf26ea2 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/scripts/introspection.mlua
+++ b/tests/org.eclipse.ldt.metalua.tests/scripts/introspection.mlua
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/src/org/eclipse/koneki/ldt/metalua/tests/AllMetaluaTests.java b/tests/org.eclipse.ldt.metalua.tests/src/org/eclipse/ldt/metalua/tests/AllMetaluaTests.java
index 6d5cfe3..a9b2751 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/src/org/eclipse/koneki/ldt/metalua/tests/AllMetaluaTests.java
+++ b/tests/org.eclipse.ldt.metalua.tests/src/org/eclipse/ldt/metalua/tests/AllMetaluaTests.java
@@ -8,10 +8,10 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.metalua.tests;

+package org.eclipse.ldt.metalua.tests;

 

-import org.eclipse.koneki.ldt.metalua.tests.internal.cases.TestMetalua;

-import org.eclipse.koneki.ldt.metalua.tests.internal.cases.TestMetaluaStateFactory;

+import org.eclipse.ldt.metalua.tests.internal.cases.TestMetalua;

+import org.eclipse.ldt.metalua.tests.internal.cases.TestMetaluaStateFactory;

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

@@ -20,6 +20,6 @@ import org.junit.runners.Suite.SuiteClasses;
 @RunWith(Suite.class)

 @SuiteClasses({ TestMetalua.class, TestMetaluaStateFactory.class })

 public class AllMetaluaTests {

-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.metalua.tests"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.ldt.metalua.tests"; //$NON-NLS-1$

 }

 // CHECKSTYLE:ON

diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/src/org/eclipse/koneki/ldt/metalua/tests/internal/cases/TestMetalua.java b/tests/org.eclipse.ldt.metalua.tests/src/org/eclipse/ldt/metalua/tests/internal/cases/TestMetalua.java
index fadd081..e61ff9f 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/src/org/eclipse/koneki/ldt/metalua/tests/internal/cases/TestMetalua.java
+++ b/tests/org.eclipse.ldt.metalua.tests/src/org/eclipse/ldt/metalua/tests/internal/cases/TestMetalua.java
@@ -9,7 +9,7 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.metalua.tests.internal.cases;
+package org.eclipse.ldt.metalua.tests.internal.cases;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,8 +20,8 @@ import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.koneki.ldt.metalua.internal.Metalua;
-import org.eclipse.koneki.ldt.metalua.tests.AllMetaluaTests;
+import org.eclipse.ldt.metalua.internal.Metalua;
+import org.eclipse.ldt.metalua.tests.AllMetaluaTests;
 import org.eclipse.osgi.util.NLS;
 import org.osgi.framework.Bundle;
 
diff --git a/tests/org.eclipse.koneki.ldt.metalua.tests/src/org/eclipse/koneki/ldt/metalua/tests/internal/cases/TestMetaluaStateFactory.java b/tests/org.eclipse.ldt.metalua.tests/src/org/eclipse/ldt/metalua/tests/internal/cases/TestMetaluaStateFactory.java
index 9e7ac99..06b6334 100644
--- a/tests/org.eclipse.koneki.ldt.metalua.tests/src/org/eclipse/koneki/ldt/metalua/tests/internal/cases/TestMetaluaStateFactory.java
+++ b/tests/org.eclipse.ldt.metalua.tests/src/org/eclipse/ldt/metalua/tests/internal/cases/TestMetaluaStateFactory.java
@@ -9,11 +9,11 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.metalua.tests.internal.cases;
+package org.eclipse.ldt.metalua.tests.internal.cases;
 
 import junit.framework.TestCase;
 
-import org.eclipse.koneki.ldt.metalua.internal.Metalua;
+import org.eclipse.ldt.metalua.internal.Metalua;
 
 import com.naef.jnlua.LuaException;
 import com.naef.jnlua.LuaState;
diff --git a/tests/org.eclipse.ldt.tests/.checkstyle b/tests/org.eclipse.ldt.tests/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/tests/org.eclipse.ldt.tests/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.tests/.classpath b/tests/org.eclipse.ldt.tests/.classpath
index ad32c83..ad32c83 100644
--- a/tests/org.eclipse.koneki.ldt.tests/.classpath
+++ b/tests/org.eclipse.ldt.tests/.classpath
diff --git a/tests/org.eclipse.koneki.ldt.tests/.fbprefs b/tests/org.eclipse.ldt.tests/.fbprefs
index 968afbf..968afbf 100644
--- a/tests/org.eclipse.koneki.ldt.tests/.fbprefs
+++ b/tests/org.eclipse.ldt.tests/.fbprefs
diff --git a/tests/org.eclipse.koneki.ldt.tests/.project b/tests/org.eclipse.ldt.tests/.project
index 55f9145..f0b0428 100644
--- a/tests/org.eclipse.koneki.ldt.tests/.project
+++ b/tests/org.eclipse.ldt.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.koneki.ldt.tests</name>
+	<name>org.eclipse.ldt.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.core.resources.prefs
index 71d26b9..71d26b9 100644
--- a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.jdt.core.prefs
index 910ca67..910ca67 100644
--- a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.ldt.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.pde.core.prefs
+++ b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/tests/org.eclipse.koneki.ldt.tests/.settings/org.eclipse.pde.prefs
+++ b/tests/org.eclipse.ldt.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.koneki.ldt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ldt.tests/META-INF/MANIFEST.MF
index ba8535d..f08ce08 100644
--- a/tests/org.eclipse.koneki.ldt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ldt.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.koneki.ldt.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.ldt.tests;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.5.0",
- org.eclipse.koneki.ldt.core.tests,
- org.eclipse.koneki.ldt.lua.tests,
- org.eclipse.koneki.ldt.metalua.tests,
- org.eclipse.koneki.ldt.ui.tests,
- org.eclipse.koneki.ldt.jnlua.tests
+ org.eclipse.ldt.core.tests,
+ org.eclipse.ldt.lua.tests,
+ org.eclipse.ldt.metalua.tests,
+ org.eclipse.ldt.ui.tests,
+ org.eclipse.ldt.jnlua.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.koneki.ldt.tests
+Export-Package: org.eclipse.ldt.tests
diff --git a/tests/org.eclipse.koneki.ldt.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.ldt.tests/OSGI-INF/l10n/bundle.properties
index 8f05329..1a3275e 100644
--- a/tests/org.eclipse.koneki.ldt.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/org.eclipse.ldt.tests/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Sierra Wireless - initial API and implementation
 ###############################################################################
-#Properties file for org.eclipse.koneki.ldt.tests
+#Properties file for org.eclipse.ldt.tests
 Bundle-Name = LDT All Test Suite
-Bundle-Vendor = Eclipse Koneki
+Bundle-Vendor = Eclipse LDT
diff --git a/tests/org.eclipse.koneki.ldt.tests/build.properties b/tests/org.eclipse.ldt.tests/build.properties
index 6087129..6087129 100644
--- a/tests/org.eclipse.koneki.ldt.tests/build.properties
+++ b/tests/org.eclipse.ldt.tests/build.properties
diff --git a/tests/org.eclipse.koneki.ldt.tests/pom.xml b/tests/org.eclipse.ldt.tests/pom.xml
index dfbedfc..bc52ede 100644
--- a/tests/org.eclipse.koneki.ldt.tests/pom.xml
+++ b/tests/org.eclipse.ldt.tests/pom.xml
@@ -14,11 +14,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests</artifactId>
-    <groupId>org.eclipse.koneki.ldt</groupId>
+    <groupId>org.eclipse.ldt</groupId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.koneki.ldt</groupId>
-  <artifactId>org.eclipse.koneki.ldt.tests</artifactId>
+  <groupId>org.eclipse.ldt</groupId>
+  <artifactId>org.eclipse.ldt.tests</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.koneki.ldt.tests/src/org/eclipse/koneki/ldt/tests/AllLDTTests.java b/tests/org.eclipse.ldt.tests/src/org/eclipse/ldt/tests/AllLDTTests.java
index cf4323d..6728d25 100644
--- a/tests/org.eclipse.koneki.ldt.tests/src/org/eclipse/koneki/ldt/tests/AllLDTTests.java
+++ b/tests/org.eclipse.ldt.tests/src/org/eclipse/ldt/tests/AllLDTTests.java
@@ -8,13 +8,13 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.tests;

+package org.eclipse.ldt.tests;

 

-import org.eclipse.koneki.ldt.core.tests.AllCoreTests;

-import org.eclipse.koneki.ldt.jnlua.tests.AllJNLuaTests;

-import org.eclipse.koneki.ldt.lua.tests.AllLuaTests;

-import org.eclipse.koneki.ldt.metalua.tests.AllMetaluaTests;

-import org.eclipse.koneki.ldt.ui.tests.AllUITests;

+import org.eclipse.ldt.core.tests.AllCoreTests;

+import org.eclipse.ldt.jnlua.tests.AllJNLuaTests;

+import org.eclipse.ldt.lua.tests.AllLuaTests;

+import org.eclipse.ldt.metalua.tests.AllMetaluaTests;

+import org.eclipse.ldt.ui.tests.AllUITests;

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

diff --git a/tests/org.eclipse.ldt.ui.tests/.checkstyle b/tests/org.eclipse.ldt.ui.tests/.checkstyle
new file mode 100644
index 0000000..a45d105
--- /dev/null
+++ b/tests/org.eclipse.ldt.ui.tests/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="LDT Coding Conventions" location="http://download.eclipse.org/ldt/releng/checkstyle.xml" type="remote" description="">
+    <additional-data name="cache-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="LDT Coding Conventions" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.classpath b/tests/org.eclipse.ldt.ui.tests/.classpath
index ad32c83..ad32c83 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.classpath
+++ b/tests/org.eclipse.ldt.ui.tests/.classpath
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.fbprefs b/tests/org.eclipse.ldt.ui.tests/.fbprefs
index 968afbf..968afbf 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.fbprefs
+++ b/tests/org.eclipse.ldt.ui.tests/.fbprefs
diff --git a/tests/org.eclipse.ldt.ui.tests/.project b/tests/org.eclipse.ldt.ui.tests/.project
new file mode 100644
index 0000000..3098b0a
--- /dev/null
+++ b/tests/org.eclipse.ldt.ui.tests/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.ldt.ui.tests</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

+	</natures>

+</projectDescription>

diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.core.resources.prefs
index ea51619..ea51619 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 910ca67..910ca67 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..cfb0178
--- /dev/null
+++ b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,58 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_LDT
+formatter_settings_version=11
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Comment this class\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.pde.core.prefs
index 73a765e..73a765e 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.pde.core.prefs
+++ b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.pde.core.prefs
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.pde.prefs
index 44bba9c..44bba9c 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/.settings/org.eclipse.pde.prefs
+++ b/tests/org.eclipse.ldt.ui.tests/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.ldt.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ldt.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..4a26e81
--- /dev/null
+++ b/tests/org.eclipse.ldt.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.ldt.ui.tests;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.junit;bundle-version="4.5.0",
+ org.eclipse.jface.text;bundle-version="3.6.0",
+ org.eclipse.dltk.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.dltk.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.ldt;bundle-version="0.9.0",
+ org.eclipse.ldt.ui;bundle-version="0.9.0",
+ org.apache.commons.io;bundle-version="1.4.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.ldt.ui.tests,
+ org.eclipse.ldt.ui.tests.internal;x-internal:=true,
+ org.eclipse.ldt.ui.tests.internal.autoedit;x-internal:=true,
+ org.eclipse.ldt.ui.tests.internal.rules;x-internal:=true,
+ org.eclipse.ldt.ui.tests.internal.scanners;x-internal:=true
+Bundle-Activator: org.eclipse.ldt.ui.tests.internal.Activator
diff --git a/tests/org.eclipse.ldt.ui.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.ldt.ui.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..047f0ff
--- /dev/null
+++ b/tests/org.eclipse.ldt.ui.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.ldt.ui.tests
+Bundle-Name = LDT UI Tests
+Bundle-Vendor = Eclipse LDT
\ No newline at end of file
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/build.properties b/tests/org.eclipse.ldt.ui.tests/build.properties
index 903970f..903970f 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/build.properties
+++ b/tests/org.eclipse.ldt.ui.tests/build.properties
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/pom.xml b/tests/org.eclipse.ldt.ui.tests/pom.xml
index 943b6d9..292548c 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/pom.xml
+++ b/tests/org.eclipse.ldt.ui.tests/pom.xml
@@ -10,11 +10,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>tests</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
-	<artifactId>org.eclipse.koneki.ldt.ui.tests</artifactId>
+	<groupId>org.eclipse.ldt</groupId>
+	<artifactId>org.eclipse.ldt.ui.tests</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
@@ -30,7 +30,7 @@
 					<dependencies>
 						<dependency>
 							<type>p2-installable-unit</type>
-							<artifactId>org.eclipse.koneki.ldt.feature.group</artifactId>
+							<artifactId>org.eclipse.ldt.feature.group</artifactId>
 						</dependency>
 					</dependencies>
 				</configuration>
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUIIntegrationTests.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/AllUIIntegrationTests.java
index 2cc7578..762ce10 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUIIntegrationTests.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/AllUIIntegrationTests.java
@@ -8,23 +8,23 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.tests;

+package org.eclipse.ldt.ui.tests;

 

 import junit.framework.JUnit4TestAdapter;

 import junit.framework.Test;

 import junit.framework.TestCase;

 import junit.framework.TestSuite;

 

-import org.eclipse.koneki.ldt.ui.tests.internal.LuaWordFinderTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.autoedit.LuaDocumentorCommentAutoEditStrategyTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaDocMultLineCommentTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaDocSingleCommentSeriesRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaMultLineCommentRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaMultLineStringRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaNumberRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.scanners.LuaCodeScannerTestSuite;

-import org.eclipse.koneki.ldt.ui.tests.internal.scanners.LuaDocumentorScannerTestSuite;

-import org.eclipse.koneki.ldt.ui.tests.internal.scanners.LuaPartitionScannerTestSuite;

+import org.eclipse.ldt.ui.tests.internal.LuaWordFinderTest;

+import org.eclipse.ldt.ui.tests.internal.autoedit.LuaDocumentorCommentAutoEditStrategyTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaDocMultLineCommentTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaDocSingleCommentSeriesRuleTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaMultLineCommentRuleTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaMultLineStringRuleTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaNumberRuleTest;

+import org.eclipse.ldt.ui.tests.internal.scanners.LuaCodeScannerTestSuite;

+import org.eclipse.ldt.ui.tests.internal.scanners.LuaDocumentorScannerTestSuite;

+import org.eclipse.ldt.ui.tests.internal.scanners.LuaPartitionScannerTestSuite;

 

 public class AllUIIntegrationTests extends TestCase {

 

diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/AllUITests.java
index 421eacd..2540bdb 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/AllUITests.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/AllUITests.java
@@ -8,23 +8,23 @@
  * Contributors:

  *     Sierra Wireless - initial API and implementation

  *******************************************************************************/

-package org.eclipse.koneki.ldt.ui.tests;

+package org.eclipse.ldt.ui.tests;

 

 import junit.framework.JUnit4TestAdapter;

 import junit.framework.Test;

 import junit.framework.TestCase;

 import junit.framework.TestSuite;

 

-import org.eclipse.koneki.ldt.ui.tests.internal.LuaWordFinderTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.autoedit.LuaDocumentorCommentAutoEditStrategyTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaDocMultLineCommentTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaDocSingleCommentSeriesRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaMultLineCommentRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaMultLineStringRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.rules.LuaNumberRuleTest;

-import org.eclipse.koneki.ldt.ui.tests.internal.scanners.LuaCodeScannerTestSuite;

-import org.eclipse.koneki.ldt.ui.tests.internal.scanners.LuaDocumentorScannerTestSuite;

-import org.eclipse.koneki.ldt.ui.tests.internal.scanners.LuaPartitionScannerTestSuite;

+import org.eclipse.ldt.ui.tests.internal.LuaWordFinderTest;

+import org.eclipse.ldt.ui.tests.internal.autoedit.LuaDocumentorCommentAutoEditStrategyTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaDocMultLineCommentTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaDocSingleCommentSeriesRuleTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaMultLineCommentRuleTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaMultLineStringRuleTest;

+import org.eclipse.ldt.ui.tests.internal.rules.LuaNumberRuleTest;

+import org.eclipse.ldt.ui.tests.internal.scanners.LuaCodeScannerTestSuite;

+import org.eclipse.ldt.ui.tests.internal.scanners.LuaDocumentorScannerTestSuite;

+import org.eclipse.ldt.ui.tests.internal.scanners.LuaPartitionScannerTestSuite;

 

 public class AllUITests extends TestCase {

 

diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/Activator.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/Activator.java
index 9355c9a..6bf3b07 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/Activator.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal;
+package org.eclipse.ldt.ui.tests.internal;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.koneki.ldt.ui"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.ldt.ui"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/LuaWordFinderTest.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/LuaWordFinderTest.java
index 4405c54..8eb8a9d 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/LuaWordFinderTest.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/LuaWordFinderTest.java
@@ -9,14 +9,14 @@
  *     Marc-Andre Laperle - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.tests.internal;
+package org.eclipse.ldt.ui.tests.internal;
 
 import junit.framework.TestCase;
 
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaWordFinder;
+import org.eclipse.ldt.ui.internal.editor.text.LuaWordFinder;
 import org.junit.Test;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/ScannerResult.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/ScannerResult.java
index 2fa0edb..3284ad0 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/ScannerResult.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/ScannerResult.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal;
+package org.eclipse.ldt.ui.tests.internal;
 
 import java.text.MessageFormat;
 
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/autoedit/LuaDocumentorCommentAutoEditStrategyTest.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/autoedit/LuaDocumentorCommentAutoEditStrategyTest.java
index 90c9d5c..efd0c2f 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/autoedit/LuaDocumentorCommentAutoEditStrategyTest.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/autoedit/LuaDocumentorCommentAutoEditStrategyTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.autoedit;
+package org.eclipse.ldt.ui.tests.internal.autoedit;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -23,10 +23,10 @@ import org.eclipse.jface.text.DocumentCommand;
 import org.eclipse.jface.text.IAutoEditStrategy;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
-import org.eclipse.koneki.ldt.ui.internal.Activator;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaDocumentorCommentAutoEditStrategy;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaTextTools;
+import org.eclipse.ldt.ui.internal.Activator;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.editor.text.LuaDocumentorCommentAutoEditStrategy;
+import org.eclipse.ldt.ui.internal.editor.text.LuaTextTools;
 
 /**
  * Tests for {@link LuaDocumentorCommentAutoEditStrategy}
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java
index e7d95a6..5eb371d 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/AbstractRuleTestCase.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.rules;
+package org.eclipse.ldt.ui.tests.internal.rules;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -23,7 +23,7 @@ import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.ITokenScanner;
 import org.eclipse.jface.text.rules.RuleBasedScanner;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.tests.internal.ScannerResult;
+import org.eclipse.ldt.ui.tests.internal.ScannerResult;
 
 /**
  * An abstract class to perform JUnit tests on rules
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaDocMultLineCommentTest.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaDocMultLineCommentTest.java
index e908984..6788923 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaDocMultLineCommentTest.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaDocMultLineCommentTest.java
@@ -9,13 +9,13 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.tests.internal.rules;
+package org.eclipse.ldt.ui.tests.internal.rules;
 
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaCodeScanner;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaDocMultLineCommentRule;
+import org.eclipse.ldt.ui.internal.editor.text.LuaCodeScanner;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaDocMultLineCommentRule;
 import org.junit.Test;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaDocSingleCommentSeriesRuleTest.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaDocSingleCommentSeriesRuleTest.java
index 6e57f54..a6dbfac 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaDocSingleCommentSeriesRuleTest.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaDocSingleCommentSeriesRuleTest.java
@@ -9,13 +9,13 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.tests.internal.rules;
+package org.eclipse.ldt.ui.tests.internal.rules;
 
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaCodeScanner;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaDocSingleCommentSeriesRule;
+import org.eclipse.ldt.ui.internal.editor.text.LuaCodeScanner;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaDocSingleCommentSeriesRule;
 import org.junit.Test;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaMultLineCommentRuleTest.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaMultLineCommentRuleTest.java
index bfc042c..bd373f2 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaMultLineCommentRuleTest.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaMultLineCommentRuleTest.java
@@ -9,13 +9,13 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.tests.internal.rules;
+package org.eclipse.ldt.ui.tests.internal.rules;
 
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaCodeScanner;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaMultLineCommentRule;
+import org.eclipse.ldt.ui.internal.editor.text.LuaCodeScanner;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaMultLineCommentRule;
 import org.junit.Test;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaMultLineStringRuleTest.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaMultLineStringRuleTest.java
index 70b0669..1d5f8d1 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaMultLineStringRuleTest.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaMultLineStringRuleTest.java
@@ -9,13 +9,13 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.tests.internal.rules;
+package org.eclipse.ldt.ui.tests.internal.rules;
 
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaCodeScanner;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.rules.LuaMultLineStringRule;
+import org.eclipse.ldt.ui.internal.editor.text.LuaCodeScanner;
+import org.eclipse.ldt.ui.internal.editor.text.rules.LuaMultLineStringRule;
 import org.junit.Test;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaNumberRuleTest.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaNumberRuleTest.java
index 3007989..40d04f5 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/rules/LuaNumberRuleTest.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/rules/LuaNumberRuleTest.java
@@ -9,11 +9,11 @@
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.koneki.ldt.ui.tests.internal.rules;
+package org.eclipse.ldt.ui.tests.internal.rules;
 
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaCodeScanner.LuaNumberRule;
+import org.eclipse.ldt.ui.internal.editor.text.LuaCodeScanner.LuaNumberRule;
 import org.junit.Test;
 
 public class LuaNumberRuleTest extends AbstractRuleTestCase {
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/AbstractScannerTestCase.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/AbstractScannerTestCase.java
index e5bc6bd..9cce33e 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/AbstractScannerTestCase.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/AbstractScannerTestCase.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,7 +23,7 @@ import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.ITokenScanner;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.tests.internal.ScannerResult;
+import org.eclipse.ldt.ui.tests.internal.ScannerResult;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/AbstractScannerTestSuite.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/AbstractScannerTestSuite.java
index 560cf6b..96a45c1 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/AbstractScannerTestSuite.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/AbstractScannerTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.koneki.ldt.ui.tests.internal.Activator;
+import org.eclipse.ldt.ui.tests.internal.Activator;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaCodeScannerTestCase.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaCodeScannerTestCase.java
index a72918c..9721542 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaCodeScannerTestCase.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaCodeScannerTestCase.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 
@@ -16,7 +16,7 @@ import org.eclipse.dltk.internal.ui.text.DLTKColorManager;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.ITokenScanner;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaCodeScanner;
+import org.eclipse.ldt.ui.internal.editor.text.LuaCodeScanner;
 import org.eclipse.ui.internal.editors.text.EditorsPlugin;
 
 @SuppressWarnings("restriction")
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaCodeScannerTestSuite.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaCodeScannerTestSuite.java
index 6328a5b..f0d98cf 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaCodeScannerTestSuite.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaCodeScannerTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestCase.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestCase.java
index ddd2cce..8c16881 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestCase.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestCase.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 
@@ -17,9 +17,9 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.ITokenScanner;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.koneki.ldt.ui.internal.editor.templates.SimpleLuaSourceViewerConfiguration;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.ILuaPartitions;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaDocumentorScanner;
+import org.eclipse.ldt.ui.internal.editor.templates.SimpleLuaSourceViewerConfiguration;
+import org.eclipse.ldt.ui.internal.editor.text.ILuaPartitions;
+import org.eclipse.ldt.ui.internal.editor.text.LuaDocumentorScanner;
 import org.eclipse.ui.internal.editors.text.EditorsPlugin;
 
 @SuppressWarnings("restriction")
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestSuite.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestSuite.java
index 88b6ae1..18c6560 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestSuite.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaDocumentorScannerTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestCase.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestCase.java
index ee48c45..b6ef57d 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestCase.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestCase.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 
 import org.eclipse.jface.text.rules.ITokenScanner;
-import org.eclipse.koneki.ldt.ui.internal.editor.text.LuaPartitionScanner;
+import org.eclipse.ldt.ui.internal.editor.text.LuaPartitionScanner;
 
 public class LuaPartitionScannerTestCase extends AbstractScannerTestCase {
 
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestSuite.java b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestSuite.java
index 6bd9368..4dc0dee 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/src/org/eclipse/koneki/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestSuite.java
+++ b/tests/org.eclipse.ldt.ui.tests/src/org/eclipse/ldt/ui/tests/internal/scanners/LuaPartitionScannerTestSuite.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.koneki.ldt.ui.tests.internal.scanners;
+package org.eclipse.ldt.ui.tests.internal.scanners;
 
 import java.io.File;
 
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/comment.lua b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/comment.lua
index 673a709..673a709 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/comment.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/comment.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/inline.lua b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/inline.lua
index 5375fee..5375fee 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/inline.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/inline.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/longluadoc.lua b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/longluadoc.lua
index 1d72bb1..1d72bb1 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/longluadoc.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/longluadoc.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/longstring.lua b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/longstring.lua
index 41a1a77..41a1a77 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/longstring.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/longstring.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/luadoc.lua b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/luadoc.lua
index 63ea0fd..63ea0fd 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/luadoc.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/luadoc.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/simple.lua b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/simple.lua
index 0db6610..0db6610 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/input/simple.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/input/simple.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/comment.txt b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/comment.txt
index f44aff2..f44aff2 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/comment.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/comment.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/inline.txt b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/inline.txt
index 5cc99ec..5cc99ec 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/inline.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/inline.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/longluadoc.txt b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/longluadoc.txt
index 7e5ed4c..7e5ed4c 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/longluadoc.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/longluadoc.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/longstring.txt b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/longstring.txt
index 364b84a..364b84a 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/longstring.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/longstring.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/luadoc.txt b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/luadoc.txt
index c021cd8..c021cd8 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/luadoc.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/luadoc.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/simple.txt b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/simple.txt
index 431726c..431726c 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codepartionner/reference/simple.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codepartionner/reference/simple.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/input/keyword.lua b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/input/keyword.lua
index e149995..e149995 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/input/keyword.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/input/keyword.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/input/number.lua b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/input/number.lua
index 9030c86..9030c86 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/input/number.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/input/number.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/input/simple.lua b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/input/simple.lua
index 91085aa..91085aa 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/input/simple.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/input/simple.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/reference/keyword.txt b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/reference/keyword.txt
index 79ebd46..79ebd46 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/reference/keyword.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/reference/keyword.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/reference/number.txt b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/reference/number.txt
index da0e631..da0e631 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/reference/number.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/reference/number.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/reference/simple.txt b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/reference/simple.txt
index 64e7cc7..64e7cc7 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/codescanner/reference/simple.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/codescanner/reference/simple.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/firstline.lua b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/firstline.lua
index 03cbe37..03cbe37 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/firstline.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/firstline.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/keyword.lua b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/keyword.lua
index f070620..f070620 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/keyword.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/keyword.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/longluadoc.lua b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/longluadoc.lua
index dd0a39f..dd0a39f 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/longluadoc.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/longluadoc.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/module.lua b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/module.lua
index 571e4df..571e4df 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/module.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/module.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/simple.lua b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/simple.lua
index c15c5f4..c15c5f4 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/input/simple.lua
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/input/simple.lua
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/firstline.txt b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/firstline.txt
index 16ee831..16ee831 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/firstline.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/firstline.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/keyword.txt b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/keyword.txt
index 4cb1649..4cb1649 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/keyword.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/keyword.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/longluadoc.txt b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/longluadoc.txt
index 7a3fb44..7a3fb44 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/longluadoc.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/longluadoc.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/module.txt b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/module.txt
index a19c41b..a19c41b 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/module.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/module.txt
diff --git a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/simple.txt b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/simple.txt
index d1e5a4b..d1e5a4b 100644
--- a/tests/org.eclipse.koneki.ldt.ui.tests/tests/luadocumentor/reference/simple.txt
+++ b/tests/org.eclipse.ldt.ui.tests/tests/luadocumentor/reference/simple.txt
diff --git a/tests/pom.xml b/tests/pom.xml
index 1161ef4..b9582f7 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -3,19 +3,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>aggregator</artifactId>
-		<groupId>org.eclipse.koneki.ldt</groupId>
+		<groupId>org.eclipse.ldt</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.koneki.ldt</groupId>
+	<groupId>org.eclipse.ldt</groupId>
 	<artifactId>tests</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
-		<module>org.eclipse.koneki.ldt.jnlua.tests</module>
-		<module>org.eclipse.koneki.ldt.metalua.tests</module>
-		<module>org.eclipse.koneki.ldt.lua.tests</module>
-		<module>org.eclipse.koneki.ldt.core.tests</module>
-		<module>org.eclipse.koneki.ldt.ui.tests</module>
+		<module>org.eclipse.ldt.jnlua.tests</module>
+		<module>org.eclipse.ldt.metalua.tests</module>
+		<module>org.eclipse.ldt.lua.tests</module>
+		<module>org.eclipse.ldt.core.tests</module>
+		<module>org.eclipse.ldt.ui.tests</module>
 		
 	</modules>
 	<build>
@@ -28,7 +28,7 @@
 					<dependencies>
 						<dependency>
 							<type>eclipse-feature</type>
-							<artifactId>org.eclipse.koneki.ldt</artifactId>
+							<artifactId>org.eclipse.ldt</artifactId>
 						</dependency>
 					</dependencies>
 				</configuration>