diff --git a/.gitignore b/.gitignore
index 5258b58a42d3f54ad540dcefa574c0c967e2a2f4..c925bebdd663046ca771431adb186d4d7a169b6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,20 +5,21 @@ test-class/
dist/
test-bin/
*/screenshots
-*/target/
+toolbox/*/target/
+tlatools/*/target
*.jar
-*/farsite/*.pdf
+toolbox/*/farsite/*.pdf
examples/DieHard/*.toolbox
org.lamport.tla.toolbox.uitest/farsite/DistributedSystemModule.toolbox/
-tlatools/TLA+ Tools
-tlatools/test-reports
-tlatools/ByteUtilsTest*.bin
-tlatools/states/
+tlatools/org.lamport.tlatools/TLA+ Tools
+tlatools/org.lamport.tlatools/test-reports
+tlatools/org.lamport.tlatools/ByteUtilsTest*.bin
+tlatools/org.lamport.tlatools/states/
*.csv
-org.lamport.tla.toolbox.product.product/plugin_customization.ini
+toolbox/org.lamport.tla.toolbox.product.product/plugin_customization.ini
examples/*/states/
general/performance/states/
-org.lamport.tla.toolbox.jnlp/files/dist-tlc.zip
+toolbox/org.lamport.tla.toolbox.jnlp/files/dist-tlc.zip
workspace/
states/
states
@@ -29,8 +30,8 @@ screenshots/
build
!**/gradle/wrapper/gradle-wrapper.jar
ajcore.*.txt
-tlatools/test-model/CodePlexBug08/checkpoint/
-tlatools/test-model/CallGotoUnlabeledTest.old
+tlatools/org.lamport.tlatools/test-model/CodePlexBug08/checkpoint/
+tlatools/org.lamport.tlatools/test-model/CallGotoUnlabeledTest.old
junit[0-9]*.properties
junitvmwatcher[0-9]*.properties
test.jfr
diff --git a/.jenkins.groovy b/.jenkins.groovy
index b90f4b0f60e65f82883d6b5e4e22f3c75d36015d..6234dba7ba207d982d877497c6c7994d50fb9f70 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -1,5 +1,6 @@
//def labels = ['windows', 'master', 'macos'] // labels for Jenkins node types we will build on
def labels = ['master', 'macos']
+def branch = "mku-subdir"
def builders = [:]
for (x in labels) {
def label = x // Need to bind the label variable before the closure - can't do 'for (label in labels)'
@@ -9,22 +10,22 @@ for (x in labels) {
node(label) {
stage('Preparation') { // for display purposes
// Get some code from a GitHub repository
- git url: 'https://github.com/tlaplus/tlaplus.git'
+ git branch: branch, url: 'https://github.com/tlaplus/tlaplus.git'
}
stage('Tools') {
withAnt(installation: 'apache ant', jdk: 'Java11') {
if (isUnix()) {
- sh "ant -f tlatools/customBuild.xml info compile compile-test dist test-dist"
+ sh "ant -f tlatools/org.lamport.tlatools/customBuild.xml info compile compile-test dist test-dist"
} else {
- bat "ant -f tlatools\\customBuild.xml info compile compile-test dist test-dist"
+ bat "ant -f tlatools\\org.lamport.tlatools\\customBuild.xml info compile compile-test dist test-dist"
}
}
}
stage ('RecordTestAndCoverageTools') {
- junit 'tlatools/target/surefire-reports/onJar/*.xml'
+ junit 'tlatools/org.lamport.tlatools/target/surefire-reports/onJar/*.xml'
// collect jacoco results for TLC
- jacoco classPattern: 'tlatools/class', exclusionPattern: '**/*Test*.class', execPattern: 'tlatools/target/code-coverage.exec', sourcePattern: 'tlatools/src'
+ jacoco classPattern: 'tlatools/org.lamport.tlatools/class', exclusionPattern: '**/*Test*.class', execPattern: 'tlatools/org.lamport.tlatools/target/code-coverage.exec', sourcePattern: 'tlatools/org.lamport.tlatools/src'
}
stage('Toolbox') {
@@ -45,7 +46,7 @@ for (x in labels) {
}
// the macosx zip on the master node to have it signed with the Apple certificate on macosx. However, only master
// has the lamport certificate to sign the individual toolbox bundles.
- stash includes: 'org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip', name: 'toolbox'
+ stash includes: 'toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip', name: 'toolbox'
} else {
withMaven(
// Maven installation declared in the Jenkins "Global Tool Configuration"
@@ -92,24 +93,24 @@ node ('master') {
wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
sh '''
rm -rf TLAToolbox-?.?.?-linux.gtk.x86_64.zip
- rm -rf toolbox/
+ rm -rf p2test/
## copy currently released Toolbox and extract it (We want to make sure that we can update from it to this build)
wget http://dl.tlapl.us/tlatoolbox/products/TLAToolbox-1.6.0-linux.gtk.x86_64.zip
- unzip -qq TLAToolbox*.zip
+ unzip -qq TLAToolbox*.zip -d p2test/
- cd toolbox/
+ cd p2test/toolbox/
## Update current Toolbox release to this version
./toolbox -nosplash -application org.eclipse.equinox.p2.director \
- -repository file://${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/repository \
+ -repository file://${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/repository \
-uninstallIU org.lamport.tla.toolbox.product.product \
-installIU org.lamport.tla.toolbox.product.product \
-profileProperties org.eclipse.update.install.features=true
## Use Toolbox's p2 director to install the test feature into the previuos toolbox release to verify the update above worked and didn't trash anything.
./toolbox -nosplash -application org.eclipse.equinox.p2.director \
- -repository file://${WORKSPACE}/org.lamport.tla.toolbox.p2repository/target/repository/ \
+ -repository file://${WORKSPACE}/toolbox/org.lamport.tla.toolbox.p2repository/target/repository/ \
-installIU org.lamport.tla.toolbox.feature.uitest.feature.group
## Run the SWTBot smoke tests to check product zips
@@ -131,12 +132,12 @@ node ('master') {
stage ('RecordTestP2UpdateManager') {
// Collect junit output for p2 smoke tests
- junit 'toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest.SmokeTests.xml'
+ junit 'p2test/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest.SmokeTests.xml'
}
stage('CreateRPMFile') {
sh '''
- cd org.lamport.tla.toolbox.product.product/target/
+ cd toolbox/org.lamport.tla.toolbox.product.product/target/
fakeroot alien --to-rpm --scripts TLAToolbox-?.?.?-linux.gtk.amd64.deb
cp TLA*.rpm products/
'''
@@ -144,9 +145,9 @@ node ('master') {
stage('CreateAPTRepo') {
sh '''
- chmod -x org.lamport.tla.toolbox.product.product/createAptRepo.sh
- cp org.lamport.tla.toolbox.product.product/target/*.deb org.lamport.tla.toolbox.product.product/target/repository/
- cd org.lamport.tla.toolbox.product.product/target/repository/
+ chmod -x toolbox/org.lamport.tla.toolbox.product.product/createAptRepo.sh
+ cp toolbox/org.lamport.tla.toolbox.product.product/target/*.deb toolbox/org.lamport.tla.toolbox.product.product/target/repository/
+ cd toolbox/org.lamport.tla.toolbox.product.product/target/repository/
bash -x ../../createAptRepo.sh .
'''
}
@@ -161,20 +162,20 @@ node ('macos') {
sh 'rm -rf *'
unstash 'toolbox'
sh 'ls -lah'
- sh 'unzip org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip'
+ sh 'unzip toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip'
sh 'codesign -f -s "Developer ID Application: M K (3PCM4M3RWK)" -v "TLA+ Toolbox.app" --deep'
sh 'ditto -ck --sequesterRsrc --keepParent "TLA+ Toolbox.app" TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip'
- sh 'mv TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip org.lamport.tla.toolbox.product.product/target/products/'
- stash includes: 'org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip', name: 'signed'
+ sh 'mv TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip toolbox/org.lamport.tla.toolbox.product.product/target/products/'
+ stash includes: 'toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip', name: 'signed'
}
}
node ('master') {
stage('Archive') {
unstash 'signed'
- fingerprint '**/org.lamport.tla.toolbox.product.product/target/repository/, **/org.lamport.tla.toolbox.product.product/target/products/*.zip, **/org.lamport.tla.toolbox.product.product/target/products/*.deb, **/tlatools/dist/, **/org.lamport.tla.toolbox.doc/html/'
+ fingerprint '**/org.lamport.tla.toolbox.product.product/target/repository/, **/org.lamport.tla.toolbox.product.product/target/products/*.zip, **/org.lamport.tla.toolbox.product.product/target/products/*.deb, **/tlatools/org.lamport.tlatools/dist/, **/org.lamport.tla.toolbox.doc/html/'
- archiveArtifacts '**/general/docs/changelogs/changelog.html, **/org.lamport.tla.toolbox.product.product/target/org.lamport.tla.toolbox.product.product-1.4.0-SNAPSHOT.zip, **/org.lamport.tla.toolbox.p2repository/target/repository/, **/org.lamport.tla.toolbox.product.product/target/repository/, **/org.lamport.tla.toolbox.product.product/target/products/*.zip, **/org.lamport.tla.toolbox.product.product/target/products/*.deb, **/org.lamport.tla.toolbox.product.product/target/products/*.rpm, **/org.lamport.tla.toolbox.product.product/target/products/32bit_x86/*, **/tlatools/dist/, **/org.lamport.tla.toolbox.doc/html/'
+ archiveArtifacts '**/general/docs/changelogs/changelog.html, **/org.lamport.tla.toolbox.product.product/target/org.lamport.tla.toolbox.product.product-1.4.0-SNAPSHOT.zip, **/org.lamport.tla.toolbox.p2repository/target/repository/, **/org.lamport.tla.toolbox.product.product/target/repository/, **/org.lamport.tla.toolbox.product.product/target/products/*.zip, **/org.lamport.tla.toolbox.product.product/target/products/*.deb, **/org.lamport.tla.toolbox.product.product/target/products/*.rpm, **/org.lamport.tla.toolbox.product.product/target/products/32bit_x86/*, **/tlatools/org.lamport.tlatools/dist/, **/org.lamport.tla.toolbox.doc/html/'
}
}
@@ -187,10 +188,10 @@ node ('master') {
cd ${WORKSPACE}/general/docs/changelogs
## Append sha1 sum to changelog (last line of changelog has the table header).
- echo "$(sha1sum ${WORKSPACE}/tlatools/dist/tla2tools.jar | cut -f 1 -d " ")|tla2tools.jar" >> ch1_6_1.md
- echo "$(sha1sum ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-win32.win32.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.6.1-win32.win32.x86_64.zip" >> ch1_6_1.md
- echo "$(sha1sum ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip" >> ch1_6_1.md
- echo "$(sha1sum ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-linux.gtk.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.6.1-linux.gtk.x86_64.zip" >> ch1_6_1.md
+ echo "$(sha1sum ${WORKSPACE}/tlatools/org.lamport.tlatools/dist/tla2tools.jar | cut -f 1 -d " ")|tla2tools.jar" >> ch1_6_1.md
+ echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-win32.win32.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.6.1-win32.win32.x86_64.zip" >> ch1_6_1.md
+ echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip" >> ch1_6_1.md
+ echo "$(sha1sum ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-linux.gtk.x86_64.zip | cut -f 1 -d " ")|TLAToolbox-1.6.1-linux.gtk.x86_64.zip" >> ch1_6_1.md
## Two above as one-liner without intermediate file.
$(jq -n --argjson changelog "$(cat ch1_6_1.md | jq --raw-input --slurp .)" -f gh-1_6_1.jq > gh-1_6_1.json)
@@ -211,19 +212,19 @@ node ('master') {
done
## p2 repository
- #curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=repository.zip --upload-file ${WORKSPACE}/org.lamport.tla.toolbox.p2repository/target/repository/repository.zip
+ #curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=repository.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.p2repository/target/repository/repository.zip
## tla2tools.jar
- curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=tla2tools.jar --upload-file ${WORKSPACE}/tlatools/dist/tla2tools.jar
+ curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=tla2tools.jar --upload-file ${WORKSPACE}/tlatools/org.lamport.tlatools/dist/tla2tools.jar
## macOS
- curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip --upload-file ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip
+ curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-macosx.cocoa.x86_64.zip
## win32
- curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-win32.win32.x86_64.zip --upload-file ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-win32.win32.x86_64.zip
+ curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-win32.win32.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-win32.win32.x86_64.zip
## Linux
- curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-linux.gtk.x86_64.zip --upload-file ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-linux.gtk.x86_64.zip
+ curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-linux.gtk.x86_64.zip --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLAToolbox-1.6.1-linux.gtk.x86_64.zip
## deb
- #curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-linux.gtk.amd64.deb --upload-file ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/repository/TLAToolbox-1.6.1-linux.gtk.amd64.deb
+ #curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-linux.gtk.amd64.deb --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/repository/TLAToolbox-1.6.1-linux.gtk.amd64.deb
## RPM
- #curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-linux.gtk.amd64.rpm --upload-file ${WORKSPACE}/org.lamport.tla.toolbox.product.product/target/products/TLA\\+Toolbox-1.6.1~*.x86_64.rpm
+ #curl -s -X POST -H "Content-Type: application/zip" -H "Authorization: token ${GITHUB_TOKEN}" https://uploads.github.com/repos/tlaplus/tlaplus/releases/$DRAFT_RELEASE/assets?name=TLAToolbox-1.6.1-linux.gtk.amd64.rpm --upload-file ${WORKSPACE}/toolbox/org.lamport.tla.toolbox.product.product/target/products/TLA\\+Toolbox-1.6.1~*.x86_64.rpm
'''
}
}
diff --git a/.travis.yml b/.travis.yml
index 15ba1acc6b4c9fde2d27bfe993dd0b33511df248..a1f330a3fa5cc3f8ae947c11cb1b76e960260ca0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@
# - mvn -B -V --settings .travis-settings.xml -Dmaven.test.halt=true verify
script:
- - ant -f tlatools/customBuild.xml -Dmaven.test.halt=true compile compile-test dist test-dist
+ - ant -f tlatools/org.lamport.tlatools/customBuild.xml -Dmaven.test.halt=true compile compile-test dist test-dist
after_failure:
- dmesg
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 5db18575eb41f80ab54107de493b16d0d6ed1f11..0000000000000000000000000000000000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Maven
-# Build your Java project and run tests with Apache Maven.
-# Add steps that analyze code, save build artifacts, deploy, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/java
-
-## https://docs.microsoft.com/en-us/azure/devops/pipelines/caching/?view=azure-devops#can-i-clear-a-cache
-variables:
- MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
- MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
-
-
-jobs:
-
-- job: Linux
- timeoutInMinutes: 0
-
- pool:
- vmImage: 'Ubuntu-16.04'
-
- steps:
- - task: Maven@3
- inputs:
- mavenPomFile: 'pom.xml'
- mavenOptions: '-Xmx3072m -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- options: '-fae -B'
- javaHomeOption: 'JDKVersion'
- jdkVersionOption: '1.11'
- jdkArchitectureOption: 'x64'
- publishJUnitResults: false
- testResultsFiles: '**/surefire-reports/TEST-*.xml'
- goals: 'verify'
-
-
-- job: Windows
- timeoutInMinutes: 0
-
- pool:
- vmImage: 'windows-2019'
-
- steps:
- - task: Maven@3
- inputs:
- mavenPomFile: 'pom.xml'
- mavenOptions: '-Xmx3072m -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- options: '-fae -B'
- javaHomeOption: 'JDKVersion'
- jdkVersionOption: '1.11'
- jdkArchitectureOption: 'x64'
- publishJUnitResults: false
- testResultsFiles: '**/surefire-reports/TEST-*.xml'
- goals: 'verify'
-
-
-- job: Mac
- timeoutInMinutes: 0
-
- pool:
- vmImage: 'macOS-10.14'
-
- steps:
- - task: Maven@3
- inputs:
- mavenPomFile: 'pom.xml'
- mavenOptions: '-Xmx3072m -Dtest.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- options: '-fae -B'
- javaHomeOption: 'JDKVersion'
- jdkVersionOption: '1.11'
- jdkArchitectureOption: 'x64'
- publishJUnitResults: false
- testResultsFiles: '**/surefire-reports/TEST-*.xml'
- goals: 'verify'
diff --git a/examples/README b/examples/README
deleted file mode 100644
index a123e42b5f553caa6b8de6bb34d9f342a10b1ede..0000000000000000000000000000000000000000
--- a/examples/README
+++ /dev/null
@@ -1,2 +0,0 @@
-All examples have been moved into a dedicated "Examples" repository. At the time of writing,
-this repository is located at https://github.com/tlaplus/Examples.
diff --git a/pom.xml b/pom.xml
index 86a1e7295614f3b1ba0258a8bd16e04c5648fc3c..bf549a4e62f26b483efd11c0bb9fe4bb50d860e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,58 +27,58 @@
<modules>
<!-- non-OSGi jars -->
- <module>tlatools</module>
+ <module>tlatools/org.lamport.tlatools</module>
<!-- OSGi based multi invocation worker (model check > 1 spec in a single runtime -->
- <module>org.lamport.tlatools.api</module>
- <module>org.lamport.tlatools.impl.distributed</module>
- <module>org.lamport.tlatools.consumer.distributed</module>
+ <module>tlatools/org.lamport.tlatools.api</module>
+ <module>tlatools/org.lamport.tlatools.impl.distributed</module>
+ <module>tlatools/org.lamport.tlatools.consumer.distributed</module>
<!-- bundles -->
- <module>org.lamport.tla.toolbox.rss</module>
- <module>org.lamport.tla.toolbox</module>
- <module>org.lamport.tla.toolbox.jclouds</module>
- <module>org.lamport.tla.toolbox.jnlp</module>
- <module>org.lamport.tla.toolbox.doc</module>
- <module>org.lamport.tla.toolbox.editor.basic</module>
- <module>org.lamport.tla.toolbox.tool.prover</module>
- <module>org.lamport.tla.toolbox.tool.tla2tex</module>
- <module>org.lamport.tla.toolbox.tool.tlc</module>
- <module>org.lamport.tla.toolbox.tool.tlc.ui</module>
- <module>org.lamport.tla.toolbox.product.standalone</module>
+ <module>toolbox/org.lamport.tla.toolbox.rss</module>
+ <module>toolbox/org.lamport.tla.toolbox</module>
+ <module>toolbox/org.lamport.tla.toolbox.jclouds</module>
+ <module>toolbox/org.lamport.tla.toolbox.jnlp</module>
+ <module>toolbox/org.lamport.tla.toolbox.doc</module>
+ <module>toolbox/org.lamport.tla.toolbox.editor.basic</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.prover</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.tla2tex</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.tlc</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.tlc.ui</module>
+ <module>toolbox/org.lamport.tla.toolbox.product.standalone</module>
<!-- Junit tests -->
- <module>org.lamport.tla.toolbox.test</module>
- <module>org.lamport.tla.toolbox.tool.tlc.test</module>
- <module>org.lamport.tla.toolbox.tool.tlc.ui.test</module>
+ <module>toolbox/org.lamport.tla.toolbox.test</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.tlc.test</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test</module>
<!-- SWTBot tests -->
- <module>org.lamport.tla.toolbox.uitest</module>
- <module>org.lamport.tla.toolbox.tool.tla2tex.uitest</module>
- <module>org.lamport.tla.toolbox.tool.tlc.ui.uitest</module>
+ <module>toolbox/org.lamport.tla.toolbox.uitest</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest</module>
+ <module>toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest</module>
<!-- features -->
- <module>org.lamport.tlatools.feature</module>
- <module>org.lamport.tla.toolbox.feature.base</module>
- <module>org.lamport.tla.toolbox.feature.editor</module>
- <module>org.lamport.tla.toolbox.feature.jnlp</module>
- <module>org.lamport.tla.toolbox.feature.jclouds</module>
- <module>org.lamport.tla.toolbox.feature.help</module>
- <module>org.lamport.tla.toolbox.feature.prover</module>
- <module>org.lamport.tla.toolbox.feature.tla2tex</module>
- <module>org.lamport.tla.toolbox.feature.tlc</module>
- <module>org.lamport.tla.toolbox.feature.uitest</module>
- <module>org.lamport.tla.toolbox.feature.branding</module>
- <module>org.lamport.tla.toolbox.feature.standalone</module>
+ <module>tlatools/org.lamport.tlatools.feature</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.base</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.editor</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.jnlp</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.jclouds</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.help</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.prover</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.tla2tex</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.tlc</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.uitest</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.branding</module>
+ <module>toolbox/org.lamport.tla.toolbox.feature.standalone</module>
<!-- p2 repository for updates -->
- <module>org.lamport.tla.toolbox.p2repository</module>
+ <module>toolbox/org.lamport.tla.toolbox.p2repository</module>
<!-- product related -->
- <module>org.lamport.tla.toolbox.product.product</module>
+ <module>toolbox/org.lamport.tla.toolbox.product.product</module>
<!-- Finally run UI tests on fully built product (AUT) -->
- <module>org.lamport.tla.toolbox.product.uitest</module>
+ <module>toolbox/org.lamport.tla.toolbox.product.uitest</module>
</modules>
<!-- tycho requires maven >= 3.0 -->
@@ -100,7 +100,7 @@
<!-- These properties define a dummy certificate store that is used unless the developer passes overwrites to maven -->
<!-- see http://stackoverflow.com/a/3620575 for how such an overwrite would look like. -->
- <keystore.path>${project.basedir}/../keystore</keystore.path>
+ <keystore.path>${project.basedir}/../../keystore</keystore.path>
<keystore.alias>msr</keystore.alias>
<keystore.store.password>secret</keystore.store.password>
<keystore.key.password>secret</keystore.key.password>
diff --git a/org.lamport.tla.toolbox.jnlp/.classpath b/tlatools/org.lamport.tlatools.api/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/.classpath
rename to tlatools/org.lamport.tlatools.api/.classpath
diff --git a/org.lamport.tlatools.api/.project b/tlatools/org.lamport.tlatools.api/.project
similarity index 100%
rename from org.lamport.tlatools.api/.project
rename to tlatools/org.lamport.tlatools.api/.project
diff --git a/org.lamport.tlatools.api/.settings/org.eclipse.jdt.core.prefs b/tlatools/org.lamport.tlatools.api/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tlatools.api/.settings/org.eclipse.jdt.core.prefs
rename to tlatools/org.lamport.tlatools.api/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tlatools.api/.settings/org.eclipse.pde.core.prefs b/tlatools/org.lamport.tlatools.api/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.lamport.tlatools.api/.settings/org.eclipse.pde.core.prefs
rename to tlatools/org.lamport.tlatools.api/.settings/org.eclipse.pde.core.prefs
diff --git a/org.lamport.tlatools.api/META-INF/MANIFEST.MF b/tlatools/org.lamport.tlatools.api/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tlatools.api/META-INF/MANIFEST.MF
rename to tlatools/org.lamport.tlatools.api/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.test/build.properties b/tlatools/org.lamport.tlatools.api/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.test/build.properties
rename to tlatools/org.lamport.tlatools.api/build.properties
diff --git a/org.lamport.tlatools.api/pom.xml b/tlatools/org.lamport.tlatools.api/pom.xml
similarity index 92%
rename from org.lamport.tlatools.api/pom.xml
rename to tlatools/org.lamport.tlatools.api/pom.xml
index a7c785fed9dad5807729025f1b22ae04d129f430..af17e9675b05578ee25ece4a18f52a7abd9b5788 100644
--- a/org.lamport.tlatools.api/pom.xml
+++ b/tlatools/org.lamport.tlatools.api/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tlatools.api</artifactId>
diff --git a/org.lamport.tlatools.api/src/tlc2/IDistributedFPSet.java b/tlatools/org.lamport.tlatools.api/src/tlc2/IDistributedFPSet.java
similarity index 100%
rename from org.lamport.tlatools.api/src/tlc2/IDistributedFPSet.java
rename to tlatools/org.lamport.tlatools.api/src/tlc2/IDistributedFPSet.java
diff --git a/org.lamport.tlatools.api/src/tlc2/ITLCWorker.java b/tlatools/org.lamport.tlatools.api/src/tlc2/ITLCWorker.java
similarity index 100%
rename from org.lamport.tlatools.api/src/tlc2/ITLCWorker.java
rename to tlatools/org.lamport.tlatools.api/src/tlc2/ITLCWorker.java
diff --git a/org.lamport.tla.toolbox.tool.prover/.classpath b/tlatools/org.lamport.tlatools.consumer.distributed/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/.classpath
rename to tlatools/org.lamport.tlatools.consumer.distributed/.classpath
diff --git a/org.lamport.tlatools.consumer.distributed/.project b/tlatools/org.lamport.tlatools.consumer.distributed/.project
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/.project
rename to tlatools/org.lamport.tlatools.consumer.distributed/.project
diff --git a/org.lamport.tlatools.consumer.distributed/.settings/org.eclipse.jdt.core.prefs b/tlatools/org.lamport.tlatools.consumer.distributed/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/.settings/org.eclipse.jdt.core.prefs
rename to tlatools/org.lamport.tlatools.consumer.distributed/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tlatools.consumer.distributed/META-INF/MANIFEST.MF b/tlatools/org.lamport.tlatools.consumer.distributed/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/META-INF/MANIFEST.MF
rename to tlatools/org.lamport.tlatools.consumer.distributed/META-INF/MANIFEST.MF
diff --git a/org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml b/tlatools/org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml
rename to tlatools/org.lamport.tlatools.consumer.distributed/OSGi-INF/fpsetConsumer.xml
diff --git a/org.lamport.tlatools.consumer.distributed/OSGi-INF/workerConsumer.xml b/tlatools/org.lamport.tlatools.consumer.distributed/OSGi-INF/workerConsumer.xml
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/OSGi-INF/workerConsumer.xml
rename to tlatools/org.lamport.tlatools.consumer.distributed/OSGi-INF/workerConsumer.xml
diff --git a/org.lamport.tlatools.consumer.distributed/build.properties b/tlatools/org.lamport.tlatools.consumer.distributed/build.properties
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/build.properties
rename to tlatools/org.lamport.tlatools.consumer.distributed/build.properties
diff --git a/org.lamport.tlatools.consumer.distributed/pom.xml b/tlatools/org.lamport.tlatools.consumer.distributed/pom.xml
similarity index 92%
rename from org.lamport.tlatools.consumer.distributed/pom.xml
rename to tlatools/org.lamport.tlatools.consumer.distributed/pom.xml
index e528def7d88fa0c353e82b001ff0dfde38bda5d9..7bfda770c2cfd8b7660929b524879e48776dd6e8 100644
--- a/org.lamport.tlatools.consumer.distributed/pom.xml
+++ b/tlatools/org.lamport.tlatools.consumer.distributed/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tlatools.consumer.distributed</artifactId>
diff --git a/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/DistributedFPSetConsumer.java b/tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/DistributedFPSetConsumer.java
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/DistributedFPSetConsumer.java
rename to tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/DistributedFPSetConsumer.java
diff --git a/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/TLCWorkerConsumer.java b/tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/TLCWorkerConsumer.java
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/TLCWorkerConsumer.java
rename to tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/TLCWorkerConsumer.java
diff --git a/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyConsumer.java b/tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyConsumer.java
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyConsumer.java
rename to tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyConsumer.java
diff --git a/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyDistributedFPSetConsumer.java b/tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyDistributedFPSetConsumer.java
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyDistributedFPSetConsumer.java
rename to tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyDistributedFPSetConsumer.java
diff --git a/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyTLCWorkerConsumer.java b/tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyTLCWorkerConsumer.java
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyTLCWorkerConsumer.java
rename to tlatools/org.lamport.tlatools.consumer.distributed/src/org/lamport/tla/distributed/consumer/faulty/FaultyTLCWorkerConsumer.java
diff --git a/org.lamport.tlatools.feature/.project b/tlatools/org.lamport.tlatools.feature/.project
similarity index 100%
rename from org.lamport.tlatools.feature/.project
rename to tlatools/org.lamport.tlatools.feature/.project
diff --git a/org.lamport.tla.toolbox.feature.base/build.properties b/tlatools/org.lamport.tlatools.feature/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.base/build.properties
rename to tlatools/org.lamport.tlatools.feature/build.properties
diff --git a/org.lamport.tlatools.feature/feature.xml b/tlatools/org.lamport.tlatools.feature/feature.xml
similarity index 100%
rename from org.lamport.tlatools.feature/feature.xml
rename to tlatools/org.lamport.tlatools.feature/feature.xml
diff --git a/org.lamport.tlatools.feature/pom.xml b/tlatools/org.lamport.tlatools.feature/pom.xml
similarity index 93%
rename from org.lamport.tlatools.feature/pom.xml
rename to tlatools/org.lamport.tlatools.feature/pom.xml
index 6451099583c108f3dbed75b7f406dad399a28b0a..196dcd1aaafb275ae86fd26534e779b27116af76 100644
--- a/org.lamport.tlatools.feature/pom.xml
+++ b/tlatools/org.lamport.tlatools.feature/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tlatools.feature</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/.classpath b/tlatools/org.lamport.tlatools.impl.distributed/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/.classpath
rename to tlatools/org.lamport.tlatools.impl.distributed/.classpath
diff --git a/org.lamport.tlatools.impl.distributed/.project b/tlatools/org.lamport.tlatools.impl.distributed/.project
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/.project
rename to tlatools/org.lamport.tlatools.impl.distributed/.project
diff --git a/org.lamport.tlatools.impl.distributed/.settings/org.eclipse.jdt.core.prefs b/tlatools/org.lamport.tlatools.impl.distributed/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/.settings/org.eclipse.jdt.core.prefs
rename to tlatools/org.lamport.tlatools.impl.distributed/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tlatools.impl.distributed/META-INF/MANIFEST.MF b/tlatools/org.lamport.tlatools.impl.distributed/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/META-INF/MANIFEST.MF
rename to tlatools/org.lamport.tlatools.impl.distributed/META-INF/MANIFEST.MF
diff --git a/org.lamport.tlatools.impl.distributed/OSGI-INF/fpset.xml b/tlatools/org.lamport.tlatools.impl.distributed/OSGI-INF/fpset.xml
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/OSGI-INF/fpset.xml
rename to tlatools/org.lamport.tlatools.impl.distributed/OSGI-INF/fpset.xml
diff --git a/org.lamport.tlatools.impl.distributed/OSGI-INF/worker.xml b/tlatools/org.lamport.tlatools.impl.distributed/OSGI-INF/worker.xml
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/OSGI-INF/worker.xml
rename to tlatools/org.lamport.tlatools.impl.distributed/OSGI-INF/worker.xml
diff --git a/org.lamport.tlatools.impl.distributed/build.properties b/tlatools/org.lamport.tlatools.impl.distributed/build.properties
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/build.properties
rename to tlatools/org.lamport.tlatools.impl.distributed/build.properties
diff --git a/org.lamport.tlatools.impl.distributed/pom.xml b/tlatools/org.lamport.tlatools.impl.distributed/pom.xml
similarity index 92%
rename from org.lamport.tlatools.impl.distributed/pom.xml
rename to tlatools/org.lamport.tlatools.impl.distributed/pom.xml
index f7cdaf3fdebcd6ad07e485d2c602f8ae170198f2..f7aad65c980d237b116b7c3e6fcbf09d017a5140 100644
--- a/org.lamport.tlatools.impl.distributed/pom.xml
+++ b/tlatools/org.lamport.tlatools.impl.distributed/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tlatools.impl.distributed</artifactId>
diff --git a/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/OSGiPrintStream.java b/tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/OSGiPrintStream.java
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/OSGiPrintStream.java
rename to tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/OSGiPrintStream.java
diff --git a/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCDistributedFPSetWrapper.java b/tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCDistributedFPSetWrapper.java
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCDistributedFPSetWrapper.java
rename to tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCDistributedFPSetWrapper.java
diff --git a/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWorkerWrapper.java b/tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWorkerWrapper.java
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWorkerWrapper.java
rename to tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWorkerWrapper.java
diff --git a/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWrapper.java b/tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWrapper.java
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWrapper.java
rename to tlatools/org.lamport.tlatools.impl.distributed/src/org/lamport/tlatools/impl/distributed/TLCWrapper.java
diff --git a/tlatools/.classpath b/tlatools/org.lamport.tlatools/.classpath
similarity index 100%
rename from tlatools/.classpath
rename to tlatools/org.lamport.tlatools/.classpath
diff --git a/tlatools/.factorypath b/tlatools/org.lamport.tlatools/.factorypath
similarity index 100%
rename from tlatools/.factorypath
rename to tlatools/org.lamport.tlatools/.factorypath
diff --git a/tlatools/.project b/tlatools/org.lamport.tlatools/.project
similarity index 100%
rename from tlatools/.project
rename to tlatools/org.lamport.tlatools/.project
diff --git a/tlatools/.settings/org.eclipse.jdt.apt.core.prefs b/tlatools/org.lamport.tlatools/.settings/org.eclipse.jdt.apt.core.prefs
similarity index 100%
rename from tlatools/.settings/org.eclipse.jdt.apt.core.prefs
rename to tlatools/org.lamport.tlatools/.settings/org.eclipse.jdt.apt.core.prefs
diff --git a/tlatools/.settings/org.eclipse.jdt.core.prefs b/tlatools/org.lamport.tlatools/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tlatools/.settings/org.eclipse.jdt.core.prefs
rename to tlatools/org.lamport.tlatools/.settings/org.eclipse.jdt.core.prefs
diff --git a/tlatools/META-INF/MANIFEST.MF b/tlatools/org.lamport.tlatools/META-INF/MANIFEST.MF
similarity index 100%
rename from tlatools/META-INF/MANIFEST.MF
rename to tlatools/org.lamport.tlatools/META-INF/MANIFEST.MF
diff --git a/tlatools/build.ajproperties b/tlatools/org.lamport.tlatools/build.ajproperties
similarity index 100%
rename from tlatools/build.ajproperties
rename to tlatools/org.lamport.tlatools/build.ajproperties
diff --git a/tlatools/build.gradle b/tlatools/org.lamport.tlatools/build.gradle
similarity index 100%
rename from tlatools/build.gradle
rename to tlatools/org.lamport.tlatools/build.gradle
diff --git a/tlatools/build.properties b/tlatools/org.lamport.tlatools/build.properties
similarity index 100%
rename from tlatools/build.properties
rename to tlatools/org.lamport.tlatools/build.properties
diff --git a/tlatools/build.xml.README b/tlatools/org.lamport.tlatools/build.xml.README
similarity index 100%
rename from tlatools/build.xml.README
rename to tlatools/org.lamport.tlatools/build.xml.README
diff --git a/tlatools/customBuild.xml b/tlatools/org.lamport.tlatools/customBuild.xml
similarity index 100%
rename from tlatools/customBuild.xml
rename to tlatools/org.lamport.tlatools/customBuild.xml
diff --git a/tlatools/doc/License.txt b/tlatools/org.lamport.tlatools/doc/License.txt
similarity index 100%
rename from tlatools/doc/License.txt
rename to tlatools/org.lamport.tlatools/doc/License.txt
diff --git a/tlatools/doc/README b/tlatools/org.lamport.tlatools/doc/README
similarity index 100%
rename from tlatools/doc/README
rename to tlatools/org.lamport.tlatools/doc/README
diff --git a/tlatools/doc/TraceExplorer_README.txt b/tlatools/org.lamport.tlatools/doc/TraceExplorer_README.txt
similarity index 100%
rename from tlatools/doc/TraceExplorer_README.txt
rename to tlatools/org.lamport.tlatools/doc/TraceExplorer_README.txt
diff --git a/tlatools/doc/environment.txt b/tlatools/org.lamport.tlatools/doc/environment.txt
similarity index 100%
rename from tlatools/doc/environment.txt
rename to tlatools/org.lamport.tlatools/doc/environment.txt
diff --git a/tlatools/gradle.properties.enc b/tlatools/org.lamport.tlatools/gradle.properties.enc
similarity index 100%
rename from tlatools/gradle.properties.enc
rename to tlatools/org.lamport.tlatools/gradle.properties.enc
diff --git a/tlatools/gradle/wrapper/gradle-wrapper.jar b/tlatools/org.lamport.tlatools/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from tlatools/gradle/wrapper/gradle-wrapper.jar
rename to tlatools/org.lamport.tlatools/gradle/wrapper/gradle-wrapper.jar
diff --git a/tlatools/gradle/wrapper/gradle-wrapper.properties b/tlatools/org.lamport.tlatools/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from tlatools/gradle/wrapper/gradle-wrapper.properties
rename to tlatools/org.lamport.tlatools/gradle/wrapper/gradle-wrapper.properties
diff --git a/tlatools/gradlew b/tlatools/org.lamport.tlatools/gradlew
similarity index 100%
rename from tlatools/gradlew
rename to tlatools/org.lamport.tlatools/gradlew
diff --git a/tlatools/gradlew.bat b/tlatools/org.lamport.tlatools/gradlew.bat
similarity index 100%
rename from tlatools/gradlew.bat
rename to tlatools/org.lamport.tlatools/gradlew.bat
diff --git a/tlatools/ide/RunAllTLCTests.launch b/tlatools/org.lamport.tlatools/ide/RunAllTLCTests.launch
similarity index 100%
rename from tlatools/ide/RunAllTLCTests.launch
rename to tlatools/org.lamport.tlatools/ide/RunAllTLCTests.launch
diff --git a/tlatools/javacc/ParseException.java b/tlatools/org.lamport.tlatools/javacc/ParseException.java
similarity index 100%
rename from tlatools/javacc/ParseException.java
rename to tlatools/org.lamport.tlatools/javacc/ParseException.java
diff --git a/tlatools/javacc/README/README.txt b/tlatools/org.lamport.tlatools/javacc/README/README.txt
similarity index 100%
rename from tlatools/javacc/README/README.txt
rename to tlatools/org.lamport.tlatools/javacc/README/README.txt
diff --git a/tlatools/javacc/README/javacc-4.0.zip b/tlatools/org.lamport.tlatools/javacc/README/javacc-4.0.zip
similarity index 100%
rename from tlatools/javacc/README/javacc-4.0.zip
rename to tlatools/org.lamport.tlatools/javacc/README/javacc-4.0.zip
diff --git a/tlatools/javacc/README/javacc-tutorial.pdf b/tlatools/org.lamport.tlatools/javacc/README/javacc-tutorial.pdf
similarity index 100%
rename from tlatools/javacc/README/javacc-tutorial.pdf
rename to tlatools/org.lamport.tlatools/javacc/README/javacc-tutorial.pdf
diff --git a/tlatools/javacc/README/methods-sany1.txt b/tlatools/org.lamport.tlatools/javacc/README/methods-sany1.txt
similarity index 100%
rename from tlatools/javacc/README/methods-sany1.txt
rename to tlatools/org.lamport.tlatools/javacc/README/methods-sany1.txt
diff --git a/tlatools/javacc/README/methods.txt b/tlatools/org.lamport.tlatools/javacc/README/methods.txt
similarity index 100%
rename from tlatools/javacc/README/methods.txt
rename to tlatools/org.lamport.tlatools/javacc/README/methods.txt
diff --git a/tlatools/javacc/SimpleCharStream.java b/tlatools/org.lamport.tlatools/javacc/SimpleCharStream.java
similarity index 100%
rename from tlatools/javacc/SimpleCharStream.java
rename to tlatools/org.lamport.tlatools/javacc/SimpleCharStream.java
diff --git a/tlatools/javacc/TLAplusParser.java b/tlatools/org.lamport.tlatools/javacc/TLAplusParser.java
similarity index 100%
rename from tlatools/javacc/TLAplusParser.java
rename to tlatools/org.lamport.tlatools/javacc/TLAplusParser.java
diff --git a/tlatools/javacc/TLAplusParserConstants.java b/tlatools/org.lamport.tlatools/javacc/TLAplusParserConstants.java
similarity index 100%
rename from tlatools/javacc/TLAplusParserConstants.java
rename to tlatools/org.lamport.tlatools/javacc/TLAplusParserConstants.java
diff --git a/tlatools/javacc/TLAplusParserTokenManager.java b/tlatools/org.lamport.tlatools/javacc/TLAplusParserTokenManager.java
similarity index 100%
rename from tlatools/javacc/TLAplusParserTokenManager.java
rename to tlatools/org.lamport.tlatools/javacc/TLAplusParserTokenManager.java
diff --git a/tlatools/javacc/Token.java b/tlatools/org.lamport.tlatools/javacc/Token.java
similarity index 100%
rename from tlatools/javacc/Token.java
rename to tlatools/org.lamport.tlatools/javacc/Token.java
diff --git a/tlatools/javacc/TokenMgrError.java b/tlatools/org.lamport.tlatools/javacc/TokenMgrError.java
similarity index 100%
rename from tlatools/javacc/TokenMgrError.java
rename to tlatools/org.lamport.tlatools/javacc/TokenMgrError.java
diff --git a/tlatools/javacc/config.html b/tlatools/org.lamport.tlatools/javacc/config.html
similarity index 100%
rename from tlatools/javacc/config.html
rename to tlatools/org.lamport.tlatools/javacc/config.html
diff --git a/tlatools/javacc/config.jj b/tlatools/org.lamport.tlatools/javacc/config.jj
similarity index 100%
rename from tlatools/javacc/config.jj
rename to tlatools/org.lamport.tlatools/javacc/config.jj
diff --git a/tlatools/javacc/tla+.09-09-17 b/tlatools/org.lamport.tlatools/javacc/tla+.09-09-17
similarity index 100%
rename from tlatools/javacc/tla+.09-09-17
rename to tlatools/org.lamport.tlatools/javacc/tla+.09-09-17
diff --git a/tlatools/javacc/tla+.11-02-10 b/tlatools/org.lamport.tlatools/javacc/tla+.11-02-10
similarity index 100%
rename from tlatools/javacc/tla+.11-02-10
rename to tlatools/org.lamport.tlatools/javacc/tla+.11-02-10
diff --git a/tlatools/javacc/tla+.html b/tlatools/org.lamport.tlatools/javacc/tla+.html
similarity index 100%
rename from tlatools/javacc/tla+.html
rename to tlatools/org.lamport.tlatools/javacc/tla+.html
diff --git a/tlatools/javacc/tla+.jj b/tlatools/org.lamport.tlatools/javacc/tla+.jj
similarity index 100%
rename from tlatools/javacc/tla+.jj
rename to tlatools/org.lamport.tlatools/javacc/tla+.jj
diff --git a/tlatools/jfr/Overview.jpg b/tlatools/org.lamport.tlatools/jfr/Overview.jpg
similarity index 100%
rename from tlatools/jfr/Overview.jpg
rename to tlatools/org.lamport.tlatools/jfr/Overview.jpg
diff --git a/tlatools/jfr/README.md b/tlatools/org.lamport.tlatools/jfr/README.md
similarity index 100%
rename from tlatools/jfr/README.md
rename to tlatools/org.lamport.tlatools/jfr/README.md
diff --git a/tlatools/jfr/jmx2jfr.jar b/tlatools/org.lamport.tlatools/jfr/jmx2jfr.jar
similarity index 100%
rename from tlatools/jfr/jmx2jfr.jar
rename to tlatools/org.lamport.tlatools/jfr/jmx2jfr.jar
diff --git a/tlatools/jfr/jmxprobes.xml b/tlatools/org.lamport.tlatools/jfr/jmxprobes.xml
similarity index 100%
rename from tlatools/jfr/jmxprobes.xml
rename to tlatools/org.lamport.tlatools/jfr/jmxprobes.xml
diff --git a/tlatools/jfr/tlc.jfc b/tlatools/org.lamport.tlatools/jfr/tlc.jfc
similarity index 100%
rename from tlatools/jfr/tlc.jfc
rename to tlatools/org.lamport.tlatools/jfr/tlc.jfc
diff --git a/tlatools/lib/aspectjrt-1.9.2.jar b/tlatools/org.lamport.tlatools/lib/aspectjrt-1.9.2.jar
similarity index 100%
rename from tlatools/lib/aspectjrt-1.9.2.jar
rename to tlatools/org.lamport.tlatools/lib/aspectjrt-1.9.2.jar
diff --git a/tlatools/lib/aspectjtools-1.9.2.jar b/tlatools/org.lamport.tlatools/lib/aspectjtools-1.9.2.jar
similarity index 100%
rename from tlatools/lib/aspectjtools-1.9.2.jar
rename to tlatools/org.lamport.tlatools/lib/aspectjtools-1.9.2.jar
diff --git a/tlatools/lib/aspectjweaver-1.9.2.jar b/tlatools/org.lamport.tlatools/lib/aspectjweaver-1.9.2.jar
similarity index 100%
rename from tlatools/lib/aspectjweaver-1.9.2.jar
rename to tlatools/org.lamport.tlatools/lib/aspectjweaver-1.9.2.jar
diff --git a/tlatools/lib/cglib-nodep-3.1.jar b/tlatools/org.lamport.tlatools/lib/cglib-nodep-3.1.jar
similarity index 100%
rename from tlatools/lib/cglib-nodep-3.1.jar
rename to tlatools/org.lamport.tlatools/lib/cglib-nodep-3.1.jar
diff --git a/tlatools/lib/easymock-3.3.1.jar b/tlatools/org.lamport.tlatools/lib/easymock-3.3.1.jar
similarity index 100%
rename from tlatools/lib/easymock-3.3.1.jar
rename to tlatools/org.lamport.tlatools/lib/easymock-3.3.1.jar
diff --git a/tlatools/lib/hamcrest-core-1.3.jar b/tlatools/org.lamport.tlatools/lib/hamcrest-core-1.3.jar
similarity index 100%
rename from tlatools/lib/hamcrest-core-1.3.jar
rename to tlatools/org.lamport.tlatools/lib/hamcrest-core-1.3.jar
diff --git a/tlatools/lib/jacocoant.jar b/tlatools/org.lamport.tlatools/lib/jacocoant.jar
similarity index 100%
rename from tlatools/lib/jacocoant.jar
rename to tlatools/org.lamport.tlatools/lib/jacocoant.jar
diff --git a/tlatools/lib/javax.mail/javax.activation_1.1.0.v201211130549.jar b/tlatools/org.lamport.tlatools/lib/javax.mail/javax.activation_1.1.0.v201211130549.jar
similarity index 100%
rename from tlatools/lib/javax.mail/javax.activation_1.1.0.v201211130549.jar
rename to tlatools/org.lamport.tlatools/lib/javax.mail/javax.activation_1.1.0.v201211130549.jar
diff --git a/tlatools/lib/javax.mail/mailapi-1.6.3.jar b/tlatools/org.lamport.tlatools/lib/javax.mail/mailapi-1.6.3.jar
similarity index 100%
rename from tlatools/lib/javax.mail/mailapi-1.6.3.jar
rename to tlatools/org.lamport.tlatools/lib/javax.mail/mailapi-1.6.3.jar
diff --git a/tlatools/lib/javax.mail/smtp-1.6.3.jar b/tlatools/org.lamport.tlatools/lib/javax.mail/smtp-1.6.3.jar
similarity index 100%
rename from tlatools/lib/javax.mail/smtp-1.6.3.jar
rename to tlatools/org.lamport.tlatools/lib/javax.mail/smtp-1.6.3.jar
diff --git a/tlatools/lib/jgit-buildnumber-ant-task-1.2.10.jar b/tlatools/org.lamport.tlatools/lib/jgit-buildnumber-ant-task-1.2.10.jar
similarity index 100%
rename from tlatools/lib/jgit-buildnumber-ant-task-1.2.10.jar
rename to tlatools/org.lamport.tlatools/lib/jgit-buildnumber-ant-task-1.2.10.jar
diff --git a/tlatools/lib/jmh/commons-math3-3.2.jar b/tlatools/org.lamport.tlatools/lib/jmh/commons-math3-3.2.jar
similarity index 100%
rename from tlatools/lib/jmh/commons-math3-3.2.jar
rename to tlatools/org.lamport.tlatools/lib/jmh/commons-math3-3.2.jar
diff --git a/tlatools/lib/jmh/jmh-core-1.21.jar b/tlatools/org.lamport.tlatools/lib/jmh/jmh-core-1.21.jar
similarity index 100%
rename from tlatools/lib/jmh/jmh-core-1.21.jar
rename to tlatools/org.lamport.tlatools/lib/jmh/jmh-core-1.21.jar
diff --git a/tlatools/lib/jmh/jmh-generator-annprocess-1.21.jar b/tlatools/org.lamport.tlatools/lib/jmh/jmh-generator-annprocess-1.21.jar
similarity index 100%
rename from tlatools/lib/jmh/jmh-generator-annprocess-1.21.jar
rename to tlatools/org.lamport.tlatools/lib/jmh/jmh-generator-annprocess-1.21.jar
diff --git a/tlatools/lib/jmh/jopt-simple-4.6.jar b/tlatools/org.lamport.tlatools/lib/jmh/jopt-simple-4.6.jar
similarity index 100%
rename from tlatools/lib/jmh/jopt-simple-4.6.jar
rename to tlatools/org.lamport.tlatools/lib/jmh/jopt-simple-4.6.jar
diff --git a/tlatools/lib/jpf-classes.jar b/tlatools/org.lamport.tlatools/lib/jpf-classes.jar
similarity index 100%
rename from tlatools/lib/jpf-classes.jar
rename to tlatools/org.lamport.tlatools/lib/jpf-classes.jar
diff --git a/tlatools/lib/jpf.jar b/tlatools/org.lamport.tlatools/lib/jpf.jar
similarity index 100%
rename from tlatools/lib/jpf.jar
rename to tlatools/org.lamport.tlatools/lib/jpf.jar
diff --git a/tlatools/lib/jpf/jgraphx.jar b/tlatools/org.lamport.tlatools/lib/jpf/jgraphx.jar
similarity index 100%
rename from tlatools/lib/jpf/jgraphx.jar
rename to tlatools/org.lamport.tlatools/lib/jpf/jgraphx.jar
diff --git a/tlatools/lib/jpf/jpf-shell.jar b/tlatools/org.lamport.tlatools/lib/jpf/jpf-shell.jar
similarity index 100%
rename from tlatools/lib/jpf/jpf-shell.jar
rename to tlatools/org.lamport.tlatools/lib/jpf/jpf-shell.jar
diff --git a/tlatools/lib/jpf/jpf-visual.jar b/tlatools/org.lamport.tlatools/lib/jpf/jpf-visual.jar
similarity index 100%
rename from tlatools/lib/jpf/jpf-visual.jar
rename to tlatools/org.lamport.tlatools/lib/jpf/jpf-visual.jar
diff --git a/tlatools/lib/junit-4.12.jar b/tlatools/org.lamport.tlatools/lib/junit-4.12.jar
similarity index 100%
rename from tlatools/lib/junit-4.12.jar
rename to tlatools/org.lamport.tlatools/lib/junit-4.12.jar
diff --git a/tlatools/lib/objenesis-2.1.jar b/tlatools/org.lamport.tlatools/lib/objenesis-2.1.jar
similarity index 100%
rename from tlatools/lib/objenesis-2.1.jar
rename to tlatools/org.lamport.tlatools/lib/objenesis-2.1.jar
diff --git a/tlatools/lib/org.eclipse.jgit-2.3.1.201302201838-r.jar b/tlatools/org.lamport.tlatools/lib/org.eclipse.jgit-2.3.1.201302201838-r.jar
similarity index 100%
rename from tlatools/lib/org.eclipse.jgit-2.3.1.201302201838-r.jar
rename to tlatools/org.lamport.tlatools/lib/org.eclipse.jgit-2.3.1.201302201838-r.jar
diff --git a/tlatools/logging.properties b/tlatools/org.lamport.tlatools/logging.properties
similarity index 100%
rename from tlatools/logging.properties
rename to tlatools/org.lamport.tlatools/logging.properties
diff --git a/tlatools/ossrh.xml b/tlatools/org.lamport.tlatools/ossrh.xml
similarity index 100%
rename from tlatools/ossrh.xml
rename to tlatools/org.lamport.tlatools/ossrh.xml
diff --git a/tlatools/ossrh.xml.README b/tlatools/org.lamport.tlatools/ossrh.xml.README
similarity index 100%
rename from tlatools/ossrh.xml.README
rename to tlatools/org.lamport.tlatools/ossrh.xml.README
diff --git a/tlatools/pom.xml b/tlatools/org.lamport.tlatools/pom.xml
similarity index 99%
rename from tlatools/pom.xml
rename to tlatools/org.lamport.tlatools/pom.xml
index c1506b64c3b0c0c1eb731feecd9e842bec85d77d..f2c1f1eaddacb99f31077d6a5243ea87aa269821 100644
--- a/tlatools/pom.xml
+++ b/tlatools/org.lamport.tlatools/pom.xml
@@ -8,7 +8,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tlatools</artifactId>
diff --git a/tlatools/project.properties b/tlatools/org.lamport.tlatools/project.properties
similarity index 100%
rename from tlatools/project.properties
rename to tlatools/org.lamport.tlatools/project.properties
diff --git a/tlatools/pubring.gpg.enc b/tlatools/org.lamport.tlatools/pubring.gpg.enc
similarity index 100%
rename from tlatools/pubring.gpg.enc
rename to tlatools/org.lamport.tlatools/pubring.gpg.enc
diff --git a/tlatools/secring.gpg.enc b/tlatools/org.lamport.tlatools/secring.gpg.enc
similarity index 100%
rename from tlatools/secring.gpg.enc
rename to tlatools/org.lamport.tlatools/secring.gpg.enc
diff --git a/tlatools/src-aj/META-INF/aop-ajc.xml b/tlatools/org.lamport.tlatools/src-aj/META-INF/aop-ajc.xml
similarity index 100%
rename from tlatools/src-aj/META-INF/aop-ajc.xml
rename to tlatools/org.lamport.tlatools/src-aj/META-INF/aop-ajc.xml
diff --git a/tlatools/src-aj/META-INF/aop.xml b/tlatools/org.lamport.tlatools/src-aj/META-INF/aop.xml
similarity index 100%
rename from tlatools/src-aj/META-INF/aop.xml
rename to tlatools/org.lamport.tlatools/src-aj/META-INF/aop.xml
diff --git a/tlatools/src-aj/tlc2/tool/CostModelAspect.aj b/tlatools/org.lamport.tlatools/src-aj/tlc2/tool/CostModelAspect.aj
similarity index 100%
rename from tlatools/src-aj/tlc2/tool/CostModelAspect.aj
rename to tlatools/org.lamport.tlatools/src-aj/tlc2/tool/CostModelAspect.aj
diff --git a/tlatools/src-aj/tlc2/tool/WorkerMonitor.java b/tlatools/org.lamport.tlatools/src-aj/tlc2/tool/WorkerMonitor.java
similarity index 100%
rename from tlatools/src-aj/tlc2/tool/WorkerMonitor.java
rename to tlatools/org.lamport.tlatools/src-aj/tlc2/tool/WorkerMonitor.java
diff --git a/tlatools/src-aj/tlc2/tool/WorkerMonitorAspect.aj b/tlatools/org.lamport.tlatools/src-aj/tlc2/tool/WorkerMonitorAspect.aj
similarity index 100%
rename from tlatools/src-aj/tlc2/tool/WorkerMonitorAspect.aj
rename to tlatools/org.lamport.tlatools/src-aj/tlc2/tool/WorkerMonitorAspect.aj
diff --git a/tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitor.java b/tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitor.java
similarity index 100%
rename from tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitor.java
rename to tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitor.java
diff --git a/tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitorAspect.aj b/tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitorAspect.aj
similarity index 100%
rename from tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitorAspect.aj
rename to tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/RMIMethodMonitorAspect.aj
diff --git a/tlatools/src-aj/tlc2/tool/distributed/TLCServerMonitorAspect.aj b/tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/TLCServerMonitorAspect.aj
similarity index 100%
rename from tlatools/src-aj/tlc2/tool/distributed/TLCServerMonitorAspect.aj
rename to tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/TLCServerMonitorAspect.aj
diff --git a/tlatools/src-aj/tlc2/tool/distributed/TLCStatistics.java b/tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/TLCStatistics.java
similarity index 100%
rename from tlatools/src-aj/tlc2/tool/distributed/TLCStatistics.java
rename to tlatools/org.lamport.tlatools/src-aj/tlc2/tool/distributed/TLCStatistics.java
diff --git a/tlatools/src/model/.gitignore b/tlatools/org.lamport.tlatools/src/model/.gitignore
similarity index 100%
rename from tlatools/src/model/.gitignore
rename to tlatools/org.lamport.tlatools/src/model/.gitignore
diff --git a/tlatools/src/model/InJarFilenameToStream.java b/tlatools/org.lamport.tlatools/src/model/InJarFilenameToStream.java
similarity index 100%
rename from tlatools/src/model/InJarFilenameToStream.java
rename to tlatools/org.lamport.tlatools/src/model/InJarFilenameToStream.java
diff --git a/tlatools/src/model/ModelInJar.java b/tlatools/org.lamport.tlatools/src/model/ModelInJar.java
similarity index 100%
rename from tlatools/src/model/ModelInJar.java
rename to tlatools/org.lamport.tlatools/src/model/ModelInJar.java
diff --git a/tlatools/src/model/README.txt b/tlatools/org.lamport.tlatools/src/model/README.txt
similarity index 100%
rename from tlatools/src/model/README.txt
rename to tlatools/org.lamport.tlatools/src/model/README.txt
diff --git a/tlatools/src/pcal/AST.java b/tlatools/org.lamport.tlatools/src/pcal/AST.java
similarity index 100%
rename from tlatools/src/pcal/AST.java
rename to tlatools/org.lamport.tlatools/src/pcal/AST.java
diff --git a/tlatools/src/pcal/AST.tla b/tlatools/org.lamport.tlatools/src/pcal/AST.tla
similarity index 100%
rename from tlatools/src/pcal/AST.tla
rename to tlatools/org.lamport.tlatools/src/pcal/AST.tla
diff --git a/tlatools/src/pcal/Changed.java b/tlatools/org.lamport.tlatools/src/pcal/Changed.java
similarity index 100%
rename from tlatools/src/pcal/Changed.java
rename to tlatools/org.lamport.tlatools/src/pcal/Changed.java
diff --git a/tlatools/src/pcal/IntPair.java b/tlatools/org.lamport.tlatools/src/pcal/IntPair.java
similarity index 100%
rename from tlatools/src/pcal/IntPair.java
rename to tlatools/org.lamport.tlatools/src/pcal/IntPair.java
diff --git a/tlatools/src/pcal/MappingObject.java b/tlatools/org.lamport.tlatools/src/pcal/MappingObject.java
similarity index 100%
rename from tlatools/src/pcal/MappingObject.java
rename to tlatools/org.lamport.tlatools/src/pcal/MappingObject.java
diff --git a/tlatools/src/pcal/OldPlusCal.cfg b/tlatools/org.lamport.tlatools/src/pcal/OldPlusCal.cfg
similarity index 100%
rename from tlatools/src/pcal/OldPlusCal.cfg
rename to tlatools/org.lamport.tlatools/src/pcal/OldPlusCal.cfg
diff --git a/tlatools/src/pcal/OldPlusCal.tla b/tlatools/org.lamport.tlatools/src/pcal/OldPlusCal.tla
similarity index 100%
rename from tlatools/src/pcal/OldPlusCal.tla
rename to tlatools/org.lamport.tlatools/src/pcal/OldPlusCal.tla
diff --git a/tlatools/src/pcal/PCalLocation.java b/tlatools/org.lamport.tlatools/src/pcal/PCalLocation.java
similarity index 100%
rename from tlatools/src/pcal/PCalLocation.java
rename to tlatools/org.lamport.tlatools/src/pcal/PCalLocation.java
diff --git a/tlatools/src/pcal/PCalTLAGenerator.java b/tlatools/org.lamport.tlatools/src/pcal/PCalTLAGenerator.java
similarity index 100%
rename from tlatools/src/pcal/PCalTLAGenerator.java
rename to tlatools/org.lamport.tlatools/src/pcal/PCalTLAGenerator.java
diff --git a/tlatools/src/pcal/PCalUnrecoverableErrorRuntimeException.java b/tlatools/org.lamport.tlatools/src/pcal/PCalUnrecoverableErrorRuntimeException.java
similarity index 100%
rename from tlatools/src/pcal/PCalUnrecoverableErrorRuntimeException.java
rename to tlatools/org.lamport.tlatools/src/pcal/PCalUnrecoverableErrorRuntimeException.java
diff --git a/tlatools/src/pcal/ParseAlgorithm.java b/tlatools/org.lamport.tlatools/src/pcal/ParseAlgorithm.java
similarity index 100%
rename from tlatools/src/pcal/ParseAlgorithm.java
rename to tlatools/org.lamport.tlatools/src/pcal/ParseAlgorithm.java
diff --git a/tlatools/src/pcal/Pcal.tla b/tlatools/org.lamport.tlatools/src/pcal/Pcal.tla
similarity index 100%
rename from tlatools/src/pcal/Pcal.tla
rename to tlatools/org.lamport.tlatools/src/pcal/Pcal.tla
diff --git a/tlatools/src/pcal/PcalBuiltInSymbols.java b/tlatools/org.lamport.tlatools/src/pcal/PcalBuiltInSymbols.java
similarity index 100%
rename from tlatools/src/pcal/PcalBuiltInSymbols.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalBuiltInSymbols.java
diff --git a/tlatools/src/pcal/PcalCharReader.java b/tlatools/org.lamport.tlatools/src/pcal/PcalCharReader.java
similarity index 100%
rename from tlatools/src/pcal/PcalCharReader.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalCharReader.java
diff --git a/tlatools/src/pcal/PcalDebug.java b/tlatools/org.lamport.tlatools/src/pcal/PcalDebug.java
similarity index 100%
rename from tlatools/src/pcal/PcalDebug.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalDebug.java
diff --git a/tlatools/src/pcal/PcalFixIDs.java b/tlatools/org.lamport.tlatools/src/pcal/PcalFixIDs.java
similarity index 100%
rename from tlatools/src/pcal/PcalFixIDs.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalFixIDs.java
diff --git a/tlatools/src/pcal/PcalParams.java b/tlatools/org.lamport.tlatools/src/pcal/PcalParams.java
similarity index 100%
rename from tlatools/src/pcal/PcalParams.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalParams.java
diff --git a/tlatools/src/pcal/PcalResourceFileReader.java b/tlatools/org.lamport.tlatools/src/pcal/PcalResourceFileReader.java
similarity index 100%
rename from tlatools/src/pcal/PcalResourceFileReader.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalResourceFileReader.java
diff --git a/tlatools/src/pcal/PcalSymTab.java b/tlatools/org.lamport.tlatools/src/pcal/PcalSymTab.java
similarity index 100%
rename from tlatools/src/pcal/PcalSymTab.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalSymTab.java
diff --git a/tlatools/src/pcal/PcalTLAGen.java b/tlatools/org.lamport.tlatools/src/pcal/PcalTLAGen.java
similarity index 100%
rename from tlatools/src/pcal/PcalTLAGen.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalTLAGen.java
diff --git a/tlatools/src/pcal/PcalTranslate.java b/tlatools/org.lamport.tlatools/src/pcal/PcalTranslate.java
similarity index 100%
rename from tlatools/src/pcal/PcalTranslate.java
rename to tlatools/org.lamport.tlatools/src/pcal/PcalTranslate.java
diff --git a/tlatools/src/pcal/PlusCal.cfg b/tlatools/org.lamport.tlatools/src/pcal/PlusCal.cfg
similarity index 100%
rename from tlatools/src/pcal/PlusCal.cfg
rename to tlatools/org.lamport.tlatools/src/pcal/PlusCal.cfg
diff --git a/tlatools/src/pcal/PlusCal.tla b/tlatools/org.lamport.tlatools/src/pcal/PlusCal.tla
similarity index 100%
rename from tlatools/src/pcal/PlusCal.tla
rename to tlatools/org.lamport.tlatools/src/pcal/PlusCal.tla
diff --git a/tlatools/src/pcal/PlusCal2.cfg b/tlatools/org.lamport.tlatools/src/pcal/PlusCal2.cfg
similarity index 100%
rename from tlatools/src/pcal/PlusCal2.cfg
rename to tlatools/org.lamport.tlatools/src/pcal/PlusCal2.cfg
diff --git a/tlatools/src/pcal/PlusCal2.tla b/tlatools/org.lamport.tlatools/src/pcal/PlusCal2.tla
similarity index 100%
rename from tlatools/src/pcal/PlusCal2.tla
rename to tlatools/org.lamport.tlatools/src/pcal/PlusCal2.tla
diff --git a/tlatools/src/pcal/Region.java b/tlatools/org.lamport.tlatools/src/pcal/Region.java
similarity index 100%
rename from tlatools/src/pcal/Region.java
rename to tlatools/org.lamport.tlatools/src/pcal/Region.java
diff --git a/tlatools/src/pcal/TLAExpr.java b/tlatools/org.lamport.tlatools/src/pcal/TLAExpr.java
similarity index 100%
rename from tlatools/src/pcal/TLAExpr.java
rename to tlatools/org.lamport.tlatools/src/pcal/TLAExpr.java
diff --git a/tlatools/src/pcal/TLAToken.java b/tlatools/org.lamport.tlatools/src/pcal/TLAToken.java
similarity index 100%
rename from tlatools/src/pcal/TLAToken.java
rename to tlatools/org.lamport.tlatools/src/pcal/TLAToken.java
diff --git a/tlatools/src/pcal/TLAtoPCalMapping.java b/tlatools/org.lamport.tlatools/src/pcal/TLAtoPCalMapping.java
similarity index 100%
rename from tlatools/src/pcal/TLAtoPCalMapping.java
rename to tlatools/org.lamport.tlatools/src/pcal/TLAtoPCalMapping.java
diff --git a/tlatools/src/pcal/Test.java b/tlatools/org.lamport.tlatools/src/pcal/Test.java
similarity index 100%
rename from tlatools/src/pcal/Test.java
rename to tlatools/org.lamport.tlatools/src/pcal/Test.java
diff --git a/tlatools/src/pcal/Tokenize.java b/tlatools/org.lamport.tlatools/src/pcal/Tokenize.java
similarity index 100%
rename from tlatools/src/pcal/Tokenize.java
rename to tlatools/org.lamport.tlatools/src/pcal/Tokenize.java
diff --git a/tlatools/src/pcal/Translator.java b/tlatools/org.lamport.tlatools/src/pcal/Translator.java
similarity index 100%
rename from tlatools/src/pcal/Translator.java
rename to tlatools/org.lamport.tlatools/src/pcal/Translator.java
diff --git a/tlatools/src/pcal/Validator.java b/tlatools/org.lamport.tlatools/src/pcal/Validator.java
similarity index 100%
rename from tlatools/src/pcal/Validator.java
rename to tlatools/org.lamport.tlatools/src/pcal/Validator.java
diff --git a/tlatools/src/pcal/XPlusCal.cfg b/tlatools/org.lamport.tlatools/src/pcal/XPlusCal.cfg
similarity index 100%
rename from tlatools/src/pcal/XPlusCal.cfg
rename to tlatools/org.lamport.tlatools/src/pcal/XPlusCal.cfg
diff --git a/tlatools/src/pcal/XPlusCal.tla b/tlatools/org.lamport.tlatools/src/pcal/XPlusCal.tla
similarity index 100%
rename from tlatools/src/pcal/XPlusCal.tla
rename to tlatools/org.lamport.tlatools/src/pcal/XPlusCal.tla
diff --git a/tlatools/src/pcal/exception/FileToStringVectorException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/FileToStringVectorException.java
similarity index 100%
rename from tlatools/src/pcal/exception/FileToStringVectorException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/FileToStringVectorException.java
diff --git a/tlatools/src/pcal/exception/ParseAlgorithmException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/ParseAlgorithmException.java
similarity index 100%
rename from tlatools/src/pcal/exception/ParseAlgorithmException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/ParseAlgorithmException.java
diff --git a/tlatools/src/pcal/exception/PcalFixIDException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/PcalFixIDException.java
similarity index 100%
rename from tlatools/src/pcal/exception/PcalFixIDException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/PcalFixIDException.java
diff --git a/tlatools/src/pcal/exception/PcalResourceFileReaderException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/PcalResourceFileReaderException.java
similarity index 100%
rename from tlatools/src/pcal/exception/PcalResourceFileReaderException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/PcalResourceFileReaderException.java
diff --git a/tlatools/src/pcal/exception/PcalSymTabException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/PcalSymTabException.java
similarity index 100%
rename from tlatools/src/pcal/exception/PcalSymTabException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/PcalSymTabException.java
diff --git a/tlatools/src/pcal/exception/PcalTLAGenException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/PcalTLAGenException.java
similarity index 100%
rename from tlatools/src/pcal/exception/PcalTLAGenException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/PcalTLAGenException.java
diff --git a/tlatools/src/pcal/exception/PcalTranslateException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/PcalTranslateException.java
similarity index 100%
rename from tlatools/src/pcal/exception/PcalTranslateException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/PcalTranslateException.java
diff --git a/tlatools/src/pcal/exception/RemoveNameConflictsException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/RemoveNameConflictsException.java
similarity index 100%
rename from tlatools/src/pcal/exception/RemoveNameConflictsException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/RemoveNameConflictsException.java
diff --git a/tlatools/src/pcal/exception/StringVectorToFileException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/StringVectorToFileException.java
similarity index 100%
rename from tlatools/src/pcal/exception/StringVectorToFileException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/StringVectorToFileException.java
diff --git a/tlatools/src/pcal/exception/TLAExprException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/TLAExprException.java
similarity index 100%
rename from tlatools/src/pcal/exception/TLAExprException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/TLAExprException.java
diff --git a/tlatools/src/pcal/exception/TLCTranslationException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/TLCTranslationException.java
similarity index 100%
rename from tlatools/src/pcal/exception/TLCTranslationException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/TLCTranslationException.java
diff --git a/tlatools/src/pcal/exception/TokenizerException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/TokenizerException.java
similarity index 100%
rename from tlatools/src/pcal/exception/TokenizerException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/TokenizerException.java
diff --git a/tlatools/src/pcal/exception/UnrecoverableException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/UnrecoverableException.java
similarity index 100%
rename from tlatools/src/pcal/exception/UnrecoverableException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/UnrecoverableException.java
diff --git a/tlatools/src/pcal/exception/UnrecoverablePositionedException.java b/tlatools/org.lamport.tlatools/src/pcal/exception/UnrecoverablePositionedException.java
similarity index 100%
rename from tlatools/src/pcal/exception/UnrecoverablePositionedException.java
rename to tlatools/org.lamport.tlatools/src/pcal/exception/UnrecoverablePositionedException.java
diff --git a/tlatools/src/pcal/help.txt b/tlatools/org.lamport.tlatools/src/pcal/help.txt
similarity index 100%
rename from tlatools/src/pcal/help.txt
rename to tlatools/org.lamport.tlatools/src/pcal/help.txt
diff --git a/tlatools/src/pcal/trans.java b/tlatools/org.lamport.tlatools/src/pcal/trans.java
similarity index 100%
rename from tlatools/src/pcal/trans.java
rename to tlatools/org.lamport.tlatools/src/pcal/trans.java
diff --git a/tlatools/src/tla2sany/README b/tlatools/org.lamport.tlatools/src/tla2sany/README
similarity index 100%
rename from tlatools/src/tla2sany/README
rename to tlatools/org.lamport.tlatools/src/tla2sany/README
diff --git a/tlatools/src/tla2sany/SANY.java b/tlatools/org.lamport.tlatools/src/tla2sany/SANY.java
similarity index 100%
rename from tlatools/src/tla2sany/SANY.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/SANY.java
diff --git a/tlatools/src/tla2sany/StandardModules/Bags.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Bags.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/Bags.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Bags.tla
diff --git a/tlatools/src/tla2sany/StandardModules/FiniteSets.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/FiniteSets.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/FiniteSets.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/FiniteSets.tla
diff --git a/tlatools/src/tla2sany/StandardModules/Integers.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Integers.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/Integers.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Integers.tla
diff --git a/tlatools/src/tla2sany/StandardModules/Naturals.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Naturals.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/Naturals.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Naturals.tla
diff --git a/tlatools/src/tla2sany/StandardModules/Randomization.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Randomization.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/Randomization.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Randomization.tla
diff --git a/tlatools/src/tla2sany/StandardModules/RealTime.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/RealTime.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/RealTime.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/RealTime.tla
diff --git a/tlatools/src/tla2sany/StandardModules/Reals.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Reals.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/Reals.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Reals.tla
diff --git a/tlatools/src/tla2sany/StandardModules/Sequences.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Sequences.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/Sequences.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Sequences.tla
diff --git a/tlatools/src/tla2sany/StandardModules/TLC.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/TLC.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/TLC.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/TLC.tla
diff --git a/tlatools/src/tla2sany/StandardModules/Toolbox.tla b/tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Toolbox.tla
similarity index 100%
rename from tlatools/src/tla2sany/StandardModules/Toolbox.tla
rename to tlatools/org.lamport.tlatools/src/tla2sany/StandardModules/Toolbox.tla
diff --git a/tlatools/src/tla2sany/configuration/ASCII_CharStream.java b/tlatools/org.lamport.tlatools/src/tla2sany/configuration/ASCII_CharStream.java
similarity index 100%
rename from tlatools/src/tla2sany/configuration/ASCII_CharStream.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/configuration/ASCII_CharStream.java
diff --git a/tlatools/src/tla2sany/configuration/ConfigConstants.java b/tlatools/org.lamport.tlatools/src/tla2sany/configuration/ConfigConstants.java
similarity index 100%
rename from tlatools/src/tla2sany/configuration/ConfigConstants.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/configuration/ConfigConstants.java
diff --git a/tlatools/src/tla2sany/configuration/Configuration.java b/tlatools/org.lamport.tlatools/src/tla2sany/configuration/Configuration.java
similarity index 100%
rename from tlatools/src/tla2sany/configuration/Configuration.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/configuration/Configuration.java
diff --git a/tlatools/src/tla2sany/configuration/ConfigurationTokenManager.java b/tlatools/org.lamport.tlatools/src/tla2sany/configuration/ConfigurationTokenManager.java
similarity index 100%
rename from tlatools/src/tla2sany/configuration/ConfigurationTokenManager.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/configuration/ConfigurationTokenManager.java
diff --git a/tlatools/src/tla2sany/configuration/ParseException.java b/tlatools/org.lamport.tlatools/src/tla2sany/configuration/ParseException.java
similarity index 100%
rename from tlatools/src/tla2sany/configuration/ParseException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/configuration/ParseException.java
diff --git a/tlatools/src/tla2sany/configuration/Token.java b/tlatools/org.lamport.tlatools/src/tla2sany/configuration/Token.java
similarity index 100%
rename from tlatools/src/tla2sany/configuration/Token.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/configuration/Token.java
diff --git a/tlatools/src/tla2sany/configuration/TokenMgrError.java b/tlatools/org.lamport.tlatools/src/tla2sany/configuration/TokenMgrError.java
similarity index 100%
rename from tlatools/src/tla2sany/configuration/TokenMgrError.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/configuration/TokenMgrError.java
diff --git a/tlatools/src/tla2sany/drivers/FrontEndException.java b/tlatools/org.lamport.tlatools/src/tla2sany/drivers/FrontEndException.java
similarity index 100%
rename from tlatools/src/tla2sany/drivers/FrontEndException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/drivers/FrontEndException.java
diff --git a/tlatools/src/tla2sany/drivers/InitException.java b/tlatools/org.lamport.tlatools/src/tla2sany/drivers/InitException.java
similarity index 100%
rename from tlatools/src/tla2sany/drivers/InitException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/drivers/InitException.java
diff --git a/tlatools/src/tla2sany/drivers/SANY.java b/tlatools/org.lamport.tlatools/src/tla2sany/drivers/SANY.java
similarity index 100%
rename from tlatools/src/tla2sany/drivers/SANY.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/drivers/SANY.java
diff --git a/tlatools/src/tla2sany/drivers/SemanticException.java b/tlatools/org.lamport.tlatools/src/tla2sany/drivers/SemanticException.java
similarity index 100%
rename from tlatools/src/tla2sany/drivers/SemanticException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/drivers/SemanticException.java
diff --git a/tlatools/src/tla2sany/drivers/drivers - Shortcut.lnk b/tlatools/org.lamport.tlatools/src/tla2sany/drivers/drivers - Shortcut.lnk
similarity index 100%
rename from tlatools/src/tla2sany/drivers/drivers - Shortcut.lnk
rename to tlatools/org.lamport.tlatools/src/tla2sany/drivers/drivers - Shortcut.lnk
diff --git a/tlatools/src/tla2sany/explorer/DotExplorerVisitor.java b/tlatools/org.lamport.tlatools/src/tla2sany/explorer/DotExplorerVisitor.java
similarity index 100%
rename from tlatools/src/tla2sany/explorer/DotExplorerVisitor.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/explorer/DotExplorerVisitor.java
diff --git a/tlatools/src/tla2sany/explorer/ExploreNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/explorer/ExploreNode.java
similarity index 100%
rename from tlatools/src/tla2sany/explorer/ExploreNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/explorer/ExploreNode.java
diff --git a/tlatools/src/tla2sany/explorer/Explorer.java b/tlatools/org.lamport.tlatools/src/tla2sany/explorer/Explorer.java
similarity index 100%
rename from tlatools/src/tla2sany/explorer/Explorer.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/explorer/Explorer.java
diff --git a/tlatools/src/tla2sany/explorer/ExplorerQuitException.java b/tlatools/org.lamport.tlatools/src/tla2sany/explorer/ExplorerQuitException.java
similarity index 100%
rename from tlatools/src/tla2sany/explorer/ExplorerQuitException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/explorer/ExplorerQuitException.java
diff --git a/tlatools/src/tla2sany/explorer/ExplorerVisitor.java b/tlatools/org.lamport.tlatools/src/tla2sany/explorer/ExplorerVisitor.java
similarity index 100%
rename from tlatools/src/tla2sany/explorer/ExplorerVisitor.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/explorer/ExplorerVisitor.java
diff --git a/tlatools/src/tla2sany/modanalyzer/ModuleContext.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModuleContext.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/ModuleContext.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModuleContext.java
diff --git a/tlatools/src/tla2sany/modanalyzer/ModulePointer.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModulePointer.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/ModulePointer.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModulePointer.java
diff --git a/tlatools/src/tla2sany/modanalyzer/ModuleRelationships.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModuleRelationships.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/ModuleRelationships.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModuleRelationships.java
diff --git a/tlatools/src/tla2sany/modanalyzer/ModuleRelatives.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModuleRelatives.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/ModuleRelatives.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ModuleRelatives.java
diff --git a/tlatools/src/tla2sany/modanalyzer/ParseUnit.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ParseUnit.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/ParseUnit.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ParseUnit.java
diff --git a/tlatools/src/tla2sany/modanalyzer/ParseUnitRelatives.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ParseUnitRelatives.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/ParseUnitRelatives.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ParseUnitRelatives.java
diff --git a/tlatools/src/tla2sany/modanalyzer/ParseUnitsTable.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ParseUnitsTable.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/ParseUnitsTable.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/ParseUnitsTable.java
diff --git a/tlatools/src/tla2sany/modanalyzer/SpecObj.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/SpecObj.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/SpecObj.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/SpecObj.java
diff --git a/tlatools/src/tla2sany/modanalyzer/SyntaxTreePrinter.java b/tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/SyntaxTreePrinter.java
similarity index 100%
rename from tlatools/src/tla2sany/modanalyzer/SyntaxTreePrinter.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/modanalyzer/SyntaxTreePrinter.java
diff --git a/tlatools/src/tla2sany/parser/BracketStack.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/BracketStack.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/BracketStack.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/BracketStack.java
diff --git a/tlatools/src/tla2sany/parser/OSelement.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/OSelement.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/OSelement.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/OSelement.java
diff --git a/tlatools/src/tla2sany/parser/Operator.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/Operator.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/Operator.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/Operator.java
diff --git a/tlatools/src/tla2sany/parser/OperatorStack.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/OperatorStack.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/OperatorStack.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/OperatorStack.java
diff --git a/tlatools/src/tla2sany/parser/Operators.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/Operators.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/Operators.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/Operators.java
diff --git a/tlatools/src/tla2sany/parser/ParseError.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseError.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/ParseError.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseError.java
diff --git a/tlatools/src/tla2sany/parser/ParseErrors.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseErrors.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/ParseErrors.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseErrors.java
diff --git a/tlatools/src/tla2sany/parser/ParseException.09-09-07 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseException.09-09-07
similarity index 100%
rename from tlatools/src/tla2sany/parser/ParseException.09-09-07
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseException.09-09-07
diff --git a/tlatools/src/tla2sany/parser/ParseException.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseException.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/ParseException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/ParseException.java
diff --git a/tlatools/src/tla2sany/parser/SimpleCharStream.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/SimpleCharStream.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/SimpleCharStream.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/SimpleCharStream.java
diff --git a/tlatools/src/tla2sany/parser/StackElement.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/StackElement.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/StackElement.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/StackElement.java
diff --git a/tlatools/src/tla2sany/parser/SyntaxTreeNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/SyntaxTreeNode.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/SyntaxTreeNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/SyntaxTreeNode.java
diff --git a/tlatools/src/tla2sany/parser/TLAplusParser.09-07-02 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParser.09-07-02
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParser.09-07-02
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParser.09-07-02
diff --git a/tlatools/src/tla2sany/parser/TLAplusParser.11-02-10 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParser.11-02-10
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParser.11-02-10
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParser.11-02-10
diff --git a/tlatools/src/tla2sany/parser/TLAplusParser.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParser.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParser.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParser.java
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserConstants.09-07-02 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.09-07-02
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserConstants.09-07-02
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.09-07-02
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserConstants.09-09-07 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.09-09-07
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserConstants.09-09-07
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.09-09-07
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserConstants.11-02-10 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.11-02-10
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserConstants.11-02-10
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.11-02-10
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserConstants.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserConstants.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserConstants.java
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-07-02 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-07-02
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-07-02
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-07-02
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-09-07 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-09-07
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-09-07
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.09-09-07
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserTokenManager.11-02-10 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.11-02-10
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserTokenManager.11-02-10
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.11-02-10
diff --git a/tlatools/src/tla2sany/parser/TLAplusParserTokenManager.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/TLAplusParserTokenManager.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TLAplusParserTokenManager.java
diff --git a/tlatools/src/tla2sany/parser/Token.09-09-07 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/Token.09-09-07
similarity index 100%
rename from tlatools/src/tla2sany/parser/Token.09-09-07
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/Token.09-09-07
diff --git a/tlatools/src/tla2sany/parser/Token.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/Token.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/Token.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/Token.java
diff --git a/tlatools/src/tla2sany/parser/TokenMgrError.09-09-07 b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TokenMgrError.09-09-07
similarity index 100%
rename from tlatools/src/tla2sany/parser/TokenMgrError.09-09-07
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TokenMgrError.09-09-07
diff --git a/tlatools/src/tla2sany/parser/TokenMgrError.java b/tlatools/org.lamport.tlatools/src/tla2sany/parser/TokenMgrError.java
similarity index 100%
rename from tlatools/src/tla2sany/parser/TokenMgrError.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/parser/TokenMgrError.java
diff --git a/tlatools/src/tla2sany/semantic/APSubstInNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/APSubstInNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/APSubstInNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/APSubstInNode.java
diff --git a/tlatools/src/tla2sany/semantic/ASTConstants.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ASTConstants.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ASTConstants.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ASTConstants.java
diff --git a/tlatools/src/tla2sany/semantic/AbortException.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/AbortException.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/AbortException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/AbortException.java
diff --git a/tlatools/src/tla2sany/semantic/AnyDefNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/AnyDefNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/AnyDefNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/AnyDefNode.java
diff --git a/tlatools/src/tla2sany/semantic/ArgLevelParam.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ArgLevelParam.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ArgLevelParam.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ArgLevelParam.java
diff --git a/tlatools/src/tla2sany/semantic/AssumeNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/AssumeNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/AssumeNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/AssumeNode.java
diff --git a/tlatools/src/tla2sany/semantic/AssumeProveNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/AssumeProveNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/AssumeProveNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/AssumeProveNode.java
diff --git a/tlatools/src/tla2sany/semantic/AtNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/AtNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/AtNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/AtNode.java
diff --git a/tlatools/src/tla2sany/semantic/BuiltInLevel.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/BuiltInLevel.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/BuiltInLevel.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/BuiltInLevel.java
diff --git a/tlatools/src/tla2sany/semantic/Context.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/Context.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/Context.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/Context.java
diff --git a/tlatools/src/tla2sany/semantic/DecimalNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/DecimalNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/DecimalNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/DecimalNode.java
diff --git a/tlatools/src/tla2sany/semantic/DefStepNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/DefStepNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/DefStepNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/DefStepNode.java
diff --git a/tlatools/src/tla2sany/semantic/Errors.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/Errors.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/Errors.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/Errors.java
diff --git a/tlatools/src/tla2sany/semantic/ExprNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ExprNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ExprNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ExprNode.java
diff --git a/tlatools/src/tla2sany/semantic/ExprOrOpArgNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ExprOrOpArgNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ExprOrOpArgNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ExprOrOpArgNode.java
diff --git a/tlatools/src/tla2sany/semantic/ExternalModuleTable.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ExternalModuleTable.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ExternalModuleTable.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ExternalModuleTable.java
diff --git a/tlatools/src/tla2sany/semantic/FormalParamNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/FormalParamNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/FormalParamNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/FormalParamNode.java
diff --git a/tlatools/src/tla2sany/semantic/FrontEnd.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/FrontEnd.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/FrontEnd.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/FrontEnd.java
diff --git a/tlatools/src/tla2sany/semantic/Generator.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/Generator.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/Generator.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/Generator.java
diff --git a/tlatools/src/tla2sany/semantic/InstanceNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/InstanceNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/InstanceNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/InstanceNode.java
diff --git a/tlatools/src/tla2sany/semantic/LabelNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/LabelNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/LabelNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/LabelNode.java
diff --git a/tlatools/src/tla2sany/semantic/LeafProofNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/LeafProofNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/LeafProofNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/LeafProofNode.java
diff --git a/tlatools/src/tla2sany/semantic/LetInNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/LetInNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/LetInNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/LetInNode.java
diff --git a/tlatools/src/tla2sany/semantic/LevelConstants.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/LevelConstants.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/LevelConstants.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/LevelConstants.java
diff --git a/tlatools/src/tla2sany/semantic/LevelException.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/LevelException.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/LevelException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/LevelException.java
diff --git a/tlatools/src/tla2sany/semantic/LevelNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/LevelNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/LevelNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/LevelNode.java
diff --git a/tlatools/src/tla2sany/semantic/ModuleNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ModuleNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ModuleNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ModuleNode.java
diff --git a/tlatools/src/tla2sany/semantic/NewSymbNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/NewSymbNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/NewSymbNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/NewSymbNode.java
diff --git a/tlatools/src/tla2sany/semantic/NonLeafProofNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/NonLeafProofNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/NonLeafProofNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/NonLeafProofNode.java
diff --git a/tlatools/src/tla2sany/semantic/NumeralNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/NumeralNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/NumeralNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/NumeralNode.java
diff --git a/tlatools/src/tla2sany/semantic/OpApplNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpApplNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/OpApplNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpApplNode.java
diff --git a/tlatools/src/tla2sany/semantic/OpArgNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpArgNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/OpArgNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpArgNode.java
diff --git a/tlatools/src/tla2sany/semantic/OpDeclNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDeclNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/OpDeclNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDeclNode.java
diff --git a/tlatools/src/tla2sany/semantic/OpDefNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDefNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/OpDefNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDefNode.java
diff --git a/tlatools/src/tla2sany/semantic/OpDefOrDeclNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDefOrDeclNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/OpDefOrDeclNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDefOrDeclNode.java
diff --git a/tlatools/src/tla2sany/semantic/OpDefOrLabelNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDefOrLabelNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/OpDefOrLabelNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/OpDefOrLabelNode.java
diff --git a/tlatools/src/tla2sany/semantic/ParamAndPosition.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ParamAndPosition.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ParamAndPosition.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ParamAndPosition.java
diff --git a/tlatools/src/tla2sany/semantic/ProofNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ProofNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ProofNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ProofNode.java
diff --git a/tlatools/src/tla2sany/semantic/SemanticNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SemanticNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SemanticNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SemanticNode.java
diff --git a/tlatools/src/tla2sany/semantic/SemanticsException.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SemanticsException.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SemanticsException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SemanticsException.java
diff --git a/tlatools/src/tla2sany/semantic/SetOfArgLevelConstraints.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SetOfArgLevelConstraints.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SetOfArgLevelConstraints.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SetOfArgLevelConstraints.java
diff --git a/tlatools/src/tla2sany/semantic/SetOfLevelConstraints.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SetOfLevelConstraints.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SetOfLevelConstraints.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SetOfLevelConstraints.java
diff --git a/tlatools/src/tla2sany/semantic/StandardModules.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/StandardModules.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/StandardModules.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/StandardModules.java
diff --git a/tlatools/src/tla2sany/semantic/StringNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/StringNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/StringNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/StringNode.java
diff --git a/tlatools/src/tla2sany/semantic/Subst.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/Subst.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/Subst.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/Subst.java
diff --git a/tlatools/src/tla2sany/semantic/SubstInNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SubstInNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SubstInNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SubstInNode.java
diff --git a/tlatools/src/tla2sany/semantic/SymbolMatcher.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SymbolMatcher.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SymbolMatcher.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SymbolMatcher.java
diff --git a/tlatools/src/tla2sany/semantic/SymbolNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SymbolNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SymbolNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SymbolNode.java
diff --git a/tlatools/src/tla2sany/semantic/SymbolTable.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/SymbolTable.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/SymbolTable.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/SymbolTable.java
diff --git a/tlatools/src/tla2sany/semantic/TheoremNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/TheoremNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/TheoremNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/TheoremNode.java
diff --git a/tlatools/src/tla2sany/semantic/ThmOrAssumpDefNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/ThmOrAssumpDefNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/ThmOrAssumpDefNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/ThmOrAssumpDefNode.java
diff --git a/tlatools/src/tla2sany/semantic/UseOrHideNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/semantic/UseOrHideNode.java
similarity index 100%
rename from tlatools/src/tla2sany/semantic/UseOrHideNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/semantic/UseOrHideNode.java
diff --git a/tlatools/src/tla2sany/st/Location.java b/tlatools/org.lamport.tlatools/src/tla2sany/st/Location.java
similarity index 100%
rename from tlatools/src/tla2sany/st/Location.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/st/Location.java
diff --git a/tlatools/src/tla2sany/st/ParseError.java b/tlatools/org.lamport.tlatools/src/tla2sany/st/ParseError.java
similarity index 100%
rename from tlatools/src/tla2sany/st/ParseError.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/st/ParseError.java
diff --git a/tlatools/src/tla2sany/st/ParseErrors.java b/tlatools/org.lamport.tlatools/src/tla2sany/st/ParseErrors.java
similarity index 100%
rename from tlatools/src/tla2sany/st/ParseErrors.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/st/ParseErrors.java
diff --git a/tlatools/src/tla2sany/st/ParseTree.java b/tlatools/org.lamport.tlatools/src/tla2sany/st/ParseTree.java
similarity index 100%
rename from tlatools/src/tla2sany/st/ParseTree.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/st/ParseTree.java
diff --git a/tlatools/src/tla2sany/st/SyntaxTreeConstants.java b/tlatools/org.lamport.tlatools/src/tla2sany/st/SyntaxTreeConstants.java
similarity index 100%
rename from tlatools/src/tla2sany/st/SyntaxTreeConstants.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/st/SyntaxTreeConstants.java
diff --git a/tlatools/src/tla2sany/st/TreeNode.java b/tlatools/org.lamport.tlatools/src/tla2sany/st/TreeNode.java
similarity index 100%
rename from tlatools/src/tla2sany/st/TreeNode.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/st/TreeNode.java
diff --git a/tlatools/src/tla2sany/utilities/Assert.java b/tlatools/org.lamport.tlatools/src/tla2sany/utilities/Assert.java
similarity index 100%
rename from tlatools/src/tla2sany/utilities/Assert.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/utilities/Assert.java
diff --git a/tlatools/src/tla2sany/utilities/IntWrapper.java b/tlatools/org.lamport.tlatools/src/tla2sany/utilities/IntWrapper.java
similarity index 100%
rename from tlatools/src/tla2sany/utilities/IntWrapper.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/utilities/IntWrapper.java
diff --git a/tlatools/src/tla2sany/utilities/Stack.java b/tlatools/org.lamport.tlatools/src/tla2sany/utilities/Stack.java
similarity index 100%
rename from tlatools/src/tla2sany/utilities/Stack.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/utilities/Stack.java
diff --git a/tlatools/src/tla2sany/utilities/Strings.java b/tlatools/org.lamport.tlatools/src/tla2sany/utilities/Strings.java
similarity index 100%
rename from tlatools/src/tla2sany/utilities/Strings.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/utilities/Strings.java
diff --git a/tlatools/src/tla2sany/utilities/Vector.java b/tlatools/org.lamport.tlatools/src/tla2sany/utilities/Vector.java
similarity index 100%
rename from tlatools/src/tla2sany/utilities/Vector.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/utilities/Vector.java
diff --git a/tlatools/src/tla2sany/utilities/VectorEnumeration.java b/tlatools/org.lamport.tlatools/src/tla2sany/utilities/VectorEnumeration.java
similarity index 100%
rename from tlatools/src/tla2sany/utilities/VectorEnumeration.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/utilities/VectorEnumeration.java
diff --git a/tlatools/src/tla2sany/xml/SymbolContext.java b/tlatools/org.lamport.tlatools/src/tla2sany/xml/SymbolContext.java
similarity index 100%
rename from tlatools/src/tla2sany/xml/SymbolContext.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/xml/SymbolContext.java
diff --git a/tlatools/src/tla2sany/xml/XMLExportable.java b/tlatools/org.lamport.tlatools/src/tla2sany/xml/XMLExportable.java
similarity index 100%
rename from tlatools/src/tla2sany/xml/XMLExportable.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/xml/XMLExportable.java
diff --git a/tlatools/src/tla2sany/xml/XMLExporter.java b/tlatools/org.lamport.tlatools/src/tla2sany/xml/XMLExporter.java
similarity index 100%
rename from tlatools/src/tla2sany/xml/XMLExporter.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/xml/XMLExporter.java
diff --git a/tlatools/src/tla2sany/xml/XMLExportingException.java b/tlatools/org.lamport.tlatools/src/tla2sany/xml/XMLExportingException.java
similarity index 100%
rename from tlatools/src/tla2sany/xml/XMLExportingException.java
rename to tlatools/org.lamport.tlatools/src/tla2sany/xml/XMLExportingException.java
diff --git a/tlatools/src/tla2sany/xml/sany.xsd b/tlatools/org.lamport.tlatools/src/tla2sany/xml/sany.xsd
similarity index 100%
rename from tlatools/src/tla2sany/xml/sany.xsd
rename to tlatools/org.lamport.tlatools/src/tla2sany/xml/sany.xsd
diff --git a/tlatools/src/tla2tex/BuiltInSymbols.java b/tlatools/org.lamport.tlatools/src/tla2tex/BuiltInSymbols.java
similarity index 100%
rename from tlatools/src/tla2tex/BuiltInSymbols.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/BuiltInSymbols.java
diff --git a/tlatools/src/tla2tex/CToken.java b/tlatools/org.lamport.tlatools/src/tla2tex/CToken.java
similarity index 100%
rename from tlatools/src/tla2tex/CToken.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/CToken.java
diff --git a/tlatools/src/tla2tex/CharReader.java b/tlatools/org.lamport.tlatools/src/tla2tex/CharReader.java
similarity index 100%
rename from tlatools/src/tla2tex/CharReader.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/CharReader.java
diff --git a/tlatools/src/tla2tex/CommentToken.java b/tlatools/org.lamport.tlatools/src/tla2tex/CommentToken.java
similarity index 100%
rename from tlatools/src/tla2tex/CommentToken.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/CommentToken.java
diff --git a/tlatools/src/tla2tex/Debug.java b/tlatools/org.lamport.tlatools/src/tla2tex/Debug.java
similarity index 100%
rename from tlatools/src/tla2tex/Debug.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/Debug.java
diff --git a/tlatools/src/tla2tex/ExecuteCommand.java b/tlatools/org.lamport.tlatools/src/tla2tex/ExecuteCommand.java
similarity index 100%
rename from tlatools/src/tla2tex/ExecuteCommand.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/ExecuteCommand.java
diff --git a/tlatools/src/tla2tex/FileCharReader.java b/tlatools/org.lamport.tlatools/src/tla2tex/FileCharReader.java
similarity index 100%
rename from tlatools/src/tla2tex/FileCharReader.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/FileCharReader.java
diff --git a/tlatools/src/tla2tex/FindAlignments.java b/tlatools/org.lamport.tlatools/src/tla2tex/FindAlignments.java
similarity index 100%
rename from tlatools/src/tla2tex/FindAlignments.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/FindAlignments.java
diff --git a/tlatools/src/tla2tex/FormatComments.java b/tlatools/org.lamport.tlatools/src/tla2tex/FormatComments.java
similarity index 100%
rename from tlatools/src/tla2tex/FormatComments.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/FormatComments.java
diff --git a/tlatools/src/tla2tex/GobbleOutput.java b/tlatools/org.lamport.tlatools/src/tla2tex/GobbleOutput.java
similarity index 100%
rename from tlatools/src/tla2tex/GobbleOutput.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/GobbleOutput.java
diff --git a/tlatools/src/tla2tex/LaTeXOutput.java b/tlatools/org.lamport.tlatools/src/tla2tex/LaTeXOutput.java
similarity index 100%
rename from tlatools/src/tla2tex/LaTeXOutput.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/LaTeXOutput.java
diff --git a/tlatools/src/tla2tex/Misc.java b/tlatools/org.lamport.tlatools/src/tla2tex/Misc.java
similarity index 100%
rename from tlatools/src/tla2tex/Misc.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/Misc.java
diff --git a/tlatools/src/tla2tex/OutputFileWriter.java b/tlatools/org.lamport.tlatools/src/tla2tex/OutputFileWriter.java
similarity index 100%
rename from tlatools/src/tla2tex/OutputFileWriter.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/OutputFileWriter.java
diff --git a/tlatools/src/tla2tex/Parameters.java b/tlatools/org.lamport.tlatools/src/tla2tex/Parameters.java
similarity index 100%
rename from tlatools/src/tla2tex/Parameters.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/Parameters.java
diff --git a/tlatools/src/tla2tex/PosAndCol.java b/tlatools/org.lamport.tlatools/src/tla2tex/PosAndCol.java
similarity index 100%
rename from tlatools/src/tla2tex/PosAndCol.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/PosAndCol.java
diff --git a/tlatools/src/tla2tex/Position.java b/tlatools/org.lamport.tlatools/src/tla2tex/Position.java
similarity index 100%
rename from tlatools/src/tla2tex/Position.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/Position.java
diff --git a/tlatools/src/tla2tex/README b/tlatools/org.lamport.tlatools/src/tla2tex/README
similarity index 100%
rename from tlatools/src/tla2tex/README
rename to tlatools/org.lamport.tlatools/src/tla2tex/README
diff --git a/tlatools/src/tla2tex/ResourceFileReader.java b/tlatools/org.lamport.tlatools/src/tla2tex/ResourceFileReader.java
similarity index 100%
rename from tlatools/src/tla2tex/ResourceFileReader.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/ResourceFileReader.java
diff --git a/tlatools/src/tla2tex/Symbol.java b/tlatools/org.lamport.tlatools/src/tla2tex/Symbol.java
similarity index 100%
rename from tlatools/src/tla2tex/Symbol.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/Symbol.java
diff --git a/tlatools/src/tla2tex/TLA.java b/tlatools/org.lamport.tlatools/src/tla2tex/TLA.java
similarity index 100%
rename from tlatools/src/tla2tex/TLA.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/TLA.java
diff --git a/tlatools/src/tla2tex/TLA2TexException.java b/tlatools/org.lamport.tlatools/src/tla2tex/TLA2TexException.java
similarity index 100%
rename from tlatools/src/tla2tex/TLA2TexException.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/TLA2TexException.java
diff --git a/tlatools/src/tla2tex/TeX.java b/tlatools/org.lamport.tlatools/src/tla2tex/TeX.java
similarity index 100%
rename from tlatools/src/tla2tex/TeX.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/TeX.java
diff --git a/tlatools/src/tla2tex/Token.java b/tlatools/org.lamport.tlatools/src/tla2tex/Token.java
similarity index 100%
rename from tlatools/src/tla2tex/Token.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/Token.java
diff --git a/tlatools/src/tla2tex/TokenizeComment.java b/tlatools/org.lamport.tlatools/src/tla2tex/TokenizeComment.java
similarity index 100%
rename from tlatools/src/tla2tex/TokenizeComment.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/TokenizeComment.java
diff --git a/tlatools/src/tla2tex/TokenizeSpec.java b/tlatools/org.lamport.tlatools/src/tla2tex/TokenizeSpec.java
similarity index 100%
rename from tlatools/src/tla2tex/TokenizeSpec.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/TokenizeSpec.java
diff --git a/tlatools/src/tla2tex/VectorCharReader.java b/tlatools/org.lamport.tlatools/src/tla2tex/VectorCharReader.java
similarity index 100%
rename from tlatools/src/tla2tex/VectorCharReader.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/VectorCharReader.java
diff --git a/tlatools/src/tla2tex/WriteTLAFile.java b/tlatools/org.lamport.tlatools/src/tla2tex/WriteTLAFile.java
similarity index 100%
rename from tlatools/src/tla2tex/WriteTLAFile.java
rename to tlatools/org.lamport.tlatools/src/tla2tex/WriteTLAFile.java
diff --git a/tlatools/src/tla2tex/help.txt b/tlatools/org.lamport.tlatools/src/tla2tex/help.txt
similarity index 100%
rename from tlatools/src/tla2tex/help.txt
rename to tlatools/org.lamport.tlatools/src/tla2tex/help.txt
diff --git a/tlatools/src/tla2tex/info.txt b/tlatools/org.lamport.tlatools/src/tla2tex/info.txt
similarity index 100%
rename from tlatools/src/tla2tex/info.txt
rename to tlatools/org.lamport.tlatools/src/tla2tex/info.txt
diff --git a/tlatools/src/tla2tex/texhelp.txt b/tlatools/org.lamport.tlatools/src/tla2tex/texhelp.txt
similarity index 100%
rename from tlatools/src/tla2tex/texhelp.txt
rename to tlatools/org.lamport.tlatools/src/tla2tex/texhelp.txt
diff --git a/tlatools/src/tla2tex/texinfo.txt b/tlatools/org.lamport.tlatools/src/tla2tex/texinfo.txt
similarity index 100%
rename from tlatools/src/tla2tex/texinfo.txt
rename to tlatools/org.lamport.tlatools/src/tla2tex/texinfo.txt
diff --git a/tlatools/src/tla2tex/tlatex.sty b/tlatools/org.lamport.tlatools/src/tla2tex/tlatex.sty
similarity index 100%
rename from tlatools/src/tla2tex/tlatex.sty
rename to tlatools/org.lamport.tlatools/src/tla2tex/tlatex.sty
diff --git a/tlatools/src/tla2tex/words.all b/tlatools/org.lamport.tlatools/src/tla2tex/words.all
similarity index 100%
rename from tlatools/src/tla2tex/words.all
rename to tlatools/org.lamport.tlatools/src/tla2tex/words.all
diff --git a/tlatools/src/tlc2/REPLSpecWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/REPLSpecWriter.java
similarity index 100%
rename from tlatools/src/tlc2/REPLSpecWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/REPLSpecWriter.java
diff --git a/tlatools/src/tlc2/TLC.java b/tlatools/org.lamport.tlatools/src/tlc2/TLC.java
similarity index 100%
rename from tlatools/src/tlc2/TLC.java
rename to tlatools/org.lamport.tlatools/src/tlc2/TLC.java
diff --git a/tlatools/src/tlc2/TLCGlobals.java b/tlatools/org.lamport.tlatools/src/tlc2/TLCGlobals.java
similarity index 100%
rename from tlatools/src/tlc2/TLCGlobals.java
rename to tlatools/org.lamport.tlatools/src/tlc2/TLCGlobals.java
diff --git a/tlatools/src/tlc2/TLCRunner.java b/tlatools/org.lamport.tlatools/src/tlc2/TLCRunner.java
similarity index 100%
rename from tlatools/src/tlc2/TLCRunner.java
rename to tlatools/org.lamport.tlatools/src/tlc2/TLCRunner.java
diff --git a/tlatools/src/tlc2/TraceExplorer.java b/tlatools/org.lamport.tlatools/src/tlc2/TraceExplorer.java
similarity index 100%
rename from tlatools/src/tlc2/TraceExplorer.java
rename to tlatools/org.lamport.tlatools/src/tlc2/TraceExplorer.java
diff --git a/tlatools/src/tlc2/TraceExpressionExplorerSpecWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/TraceExpressionExplorerSpecWriter.java
similarity index 100%
rename from tlatools/src/tlc2/TraceExpressionExplorerSpecWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/TraceExpressionExplorerSpecWriter.java
diff --git a/tlatools/src/tlc2/input/AbstractMCOutputConsumer.java b/tlatools/org.lamport.tlatools/src/tlc2/input/AbstractMCOutputConsumer.java
similarity index 100%
rename from tlatools/src/tlc2/input/AbstractMCOutputConsumer.java
rename to tlatools/org.lamport.tlatools/src/tlc2/input/AbstractMCOutputConsumer.java
diff --git a/tlatools/src/tlc2/input/MCOutputMessage.java b/tlatools/org.lamport.tlatools/src/tlc2/input/MCOutputMessage.java
similarity index 100%
rename from tlatools/src/tlc2/input/MCOutputMessage.java
rename to tlatools/org.lamport.tlatools/src/tlc2/input/MCOutputMessage.java
diff --git a/tlatools/src/tlc2/input/MCOutputParser.java b/tlatools/org.lamport.tlatools/src/tlc2/input/MCOutputParser.java
similarity index 100%
rename from tlatools/src/tlc2/input/MCOutputParser.java
rename to tlatools/org.lamport.tlatools/src/tlc2/input/MCOutputParser.java
diff --git a/tlatools/src/tlc2/input/MCOutputPipeConsumer.java b/tlatools/org.lamport.tlatools/src/tlc2/input/MCOutputPipeConsumer.java
similarity index 100%
rename from tlatools/src/tlc2/input/MCOutputPipeConsumer.java
rename to tlatools/org.lamport.tlatools/src/tlc2/input/MCOutputPipeConsumer.java
diff --git a/tlatools/src/tlc2/input/MCParser.java b/tlatools/org.lamport.tlatools/src/tlc2/input/MCParser.java
similarity index 100%
rename from tlatools/src/tlc2/input/MCParser.java
rename to tlatools/org.lamport.tlatools/src/tlc2/input/MCParser.java
diff --git a/tlatools/src/tlc2/input/MCParserResults.java b/tlatools/org.lamport.tlatools/src/tlc2/input/MCParserResults.java
similarity index 100%
rename from tlatools/src/tlc2/input/MCParserResults.java
rename to tlatools/org.lamport.tlatools/src/tlc2/input/MCParserResults.java
diff --git a/tlatools/src/tlc2/model/Assignment.java b/tlatools/org.lamport.tlatools/src/tlc2/model/Assignment.java
similarity index 100%
rename from tlatools/src/tlc2/model/Assignment.java
rename to tlatools/org.lamport.tlatools/src/tlc2/model/Assignment.java
diff --git a/tlatools/src/tlc2/model/Formula.java b/tlatools/org.lamport.tlatools/src/tlc2/model/Formula.java
similarity index 100%
rename from tlatools/src/tlc2/model/Formula.java
rename to tlatools/org.lamport.tlatools/src/tlc2/model/Formula.java
diff --git a/tlatools/src/tlc2/model/MCError.java b/tlatools/org.lamport.tlatools/src/tlc2/model/MCError.java
similarity index 100%
rename from tlatools/src/tlc2/model/MCError.java
rename to tlatools/org.lamport.tlatools/src/tlc2/model/MCError.java
diff --git a/tlatools/src/tlc2/model/MCState.java b/tlatools/org.lamport.tlatools/src/tlc2/model/MCState.java
similarity index 100%
rename from tlatools/src/tlc2/model/MCState.java
rename to tlatools/org.lamport.tlatools/src/tlc2/model/MCState.java
diff --git a/tlatools/src/tlc2/model/MCVariable.java b/tlatools/org.lamport.tlatools/src/tlc2/model/MCVariable.java
similarity index 100%
rename from tlatools/src/tlc2/model/MCVariable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/model/MCVariable.java
diff --git a/tlatools/src/tlc2/model/TraceExpressionInformationHolder.java b/tlatools/org.lamport.tlatools/src/tlc2/model/TraceExpressionInformationHolder.java
similarity index 100%
rename from tlatools/src/tlc2/model/TraceExpressionInformationHolder.java
rename to tlatools/org.lamport.tlatools/src/tlc2/model/TraceExpressionInformationHolder.java
diff --git a/tlatools/src/tlc2/model/TypedSet.java b/tlatools/org.lamport.tlatools/src/tlc2/model/TypedSet.java
similarity index 100%
rename from tlatools/src/tlc2/model/TypedSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/model/TypedSet.java
diff --git a/tlatools/src/tlc2/module/AnySet.java b/tlatools/org.lamport.tlatools/src/tlc2/module/AnySet.java
similarity index 100%
rename from tlatools/src/tlc2/module/AnySet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/AnySet.java
diff --git a/tlatools/src/tlc2/module/Bags.java b/tlatools/org.lamport.tlatools/src/tlc2/module/Bags.java
similarity index 100%
rename from tlatools/src/tlc2/module/Bags.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/Bags.java
diff --git a/tlatools/src/tlc2/module/BuiltInModuleHelper.java b/tlatools/org.lamport.tlatools/src/tlc2/module/BuiltInModuleHelper.java
similarity index 100%
rename from tlatools/src/tlc2/module/BuiltInModuleHelper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/BuiltInModuleHelper.java
diff --git a/tlatools/src/tlc2/module/FiniteSets.java b/tlatools/org.lamport.tlatools/src/tlc2/module/FiniteSets.java
similarity index 100%
rename from tlatools/src/tlc2/module/FiniteSets.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/FiniteSets.java
diff --git a/tlatools/src/tlc2/module/Integers.java b/tlatools/org.lamport.tlatools/src/tlc2/module/Integers.java
similarity index 100%
rename from tlatools/src/tlc2/module/Integers.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/Integers.java
diff --git a/tlatools/src/tlc2/module/Naturals.java b/tlatools/org.lamport.tlatools/src/tlc2/module/Naturals.java
similarity index 100%
rename from tlatools/src/tlc2/module/Naturals.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/Naturals.java
diff --git a/tlatools/src/tlc2/module/Randomization.java b/tlatools/org.lamport.tlatools/src/tlc2/module/Randomization.java
similarity index 100%
rename from tlatools/src/tlc2/module/Randomization.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/Randomization.java
diff --git a/tlatools/src/tlc2/module/Sequences.java b/tlatools/org.lamport.tlatools/src/tlc2/module/Sequences.java
similarity index 100%
rename from tlatools/src/tlc2/module/Sequences.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/Sequences.java
diff --git a/tlatools/src/tlc2/module/Strings.java b/tlatools/org.lamport.tlatools/src/tlc2/module/Strings.java
similarity index 100%
rename from tlatools/src/tlc2/module/Strings.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/Strings.java
diff --git a/tlatools/src/tlc2/module/TLC.java b/tlatools/org.lamport.tlatools/src/tlc2/module/TLC.java
similarity index 100%
rename from tlatools/src/tlc2/module/TLC.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/TLC.java
diff --git a/tlatools/src/tlc2/module/TransitiveClosure.java b/tlatools/org.lamport.tlatools/src/tlc2/module/TransitiveClosure.java
similarity index 100%
rename from tlatools/src/tlc2/module/TransitiveClosure.java
rename to tlatools/org.lamport.tlatools/src/tlc2/module/TransitiveClosure.java
diff --git a/tlatools/src/tlc2/output/AbstractCopier.java b/tlatools/org.lamport.tlatools/src/tlc2/output/AbstractCopier.java
similarity index 100%
rename from tlatools/src/tlc2/output/AbstractCopier.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/AbstractCopier.java
diff --git a/tlatools/src/tlc2/output/AbstractSpecWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/output/AbstractSpecWriter.java
similarity index 100%
rename from tlatools/src/tlc2/output/AbstractSpecWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/AbstractSpecWriter.java
diff --git a/tlatools/src/tlc2/output/AbstractTLACopier.java b/tlatools/org.lamport.tlatools/src/tlc2/output/AbstractTLACopier.java
similarity index 100%
rename from tlatools/src/tlc2/output/AbstractTLACopier.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/AbstractTLACopier.java
diff --git a/tlatools/src/tlc2/output/CFGCopier.java b/tlatools/org.lamport.tlatools/src/tlc2/output/CFGCopier.java
similarity index 100%
rename from tlatools/src/tlc2/output/CFGCopier.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/CFGCopier.java
diff --git a/tlatools/src/tlc2/output/EC.java b/tlatools/org.lamport.tlatools/src/tlc2/output/EC.java
similarity index 100%
rename from tlatools/src/tlc2/output/EC.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/EC.java
diff --git a/tlatools/src/tlc2/output/MP.java b/tlatools/org.lamport.tlatools/src/tlc2/output/MP.java
similarity index 100%
rename from tlatools/src/tlc2/output/MP.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/MP.java
diff --git a/tlatools/src/tlc2/output/MPRecorder.java b/tlatools/org.lamport.tlatools/src/tlc2/output/MPRecorder.java
similarity index 100%
rename from tlatools/src/tlc2/output/MPRecorder.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/MPRecorder.java
diff --git a/tlatools/src/tlc2/output/Message.java b/tlatools/org.lamport.tlatools/src/tlc2/output/Message.java
similarity index 100%
rename from tlatools/src/tlc2/output/Message.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/Message.java
diff --git a/tlatools/src/tlc2/output/Messages.java b/tlatools/org.lamport.tlatools/src/tlc2/output/Messages.java
similarity index 100%
rename from tlatools/src/tlc2/output/Messages.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/Messages.java
diff --git a/tlatools/src/tlc2/output/OutputCollector.java b/tlatools/org.lamport.tlatools/src/tlc2/output/OutputCollector.java
similarity index 100%
rename from tlatools/src/tlc2/output/OutputCollector.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/OutputCollector.java
diff --git a/tlatools/src/tlc2/output/SpecTraceExpressionWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/output/SpecTraceExpressionWriter.java
similarity index 100%
rename from tlatools/src/tlc2/output/SpecTraceExpressionWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/SpecTraceExpressionWriter.java
diff --git a/tlatools/src/tlc2/output/SpecWriterUtilities.java b/tlatools/org.lamport.tlatools/src/tlc2/output/SpecWriterUtilities.java
similarity index 100%
rename from tlatools/src/tlc2/output/SpecWriterUtilities.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/SpecWriterUtilities.java
diff --git a/tlatools/src/tlc2/output/StatePrinter.java b/tlatools/org.lamport.tlatools/src/tlc2/output/StatePrinter.java
similarity index 100%
rename from tlatools/src/tlc2/output/StatePrinter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/StatePrinter.java
diff --git a/tlatools/src/tlc2/output/TLACopier.java b/tlatools/org.lamport.tlatools/src/tlc2/output/TLACopier.java
similarity index 100%
rename from tlatools/src/tlc2/output/TLACopier.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/TLACopier.java
diff --git a/tlatools/src/tlc2/output/TLAMonolithCreator.java b/tlatools/org.lamport.tlatools/src/tlc2/output/TLAMonolithCreator.java
similarity index 100%
rename from tlatools/src/tlc2/output/TLAMonolithCreator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/TLAMonolithCreator.java
diff --git a/tlatools/src/tlc2/output/TeeOutputStream.java b/tlatools/org.lamport.tlatools/src/tlc2/output/TeeOutputStream.java
similarity index 100%
rename from tlatools/src/tlc2/output/TeeOutputStream.java
rename to tlatools/org.lamport.tlatools/src/tlc2/output/TeeOutputStream.java
diff --git a/tlatools/src/tlc2/output/messages.properties b/tlatools/org.lamport.tlatools/src/tlc2/output/messages.properties
similarity index 100%
rename from tlatools/src/tlc2/output/messages.properties
rename to tlatools/org.lamport.tlatools/src/tlc2/output/messages.properties
diff --git a/tlatools/src/tlc2/overrides/Evaluation.java b/tlatools/org.lamport.tlatools/src/tlc2/overrides/Evaluation.java
similarity index 100%
rename from tlatools/src/tlc2/overrides/Evaluation.java
rename to tlatools/org.lamport.tlatools/src/tlc2/overrides/Evaluation.java
diff --git a/tlatools/src/tlc2/overrides/ITLCOverrides.java b/tlatools/org.lamport.tlatools/src/tlc2/overrides/ITLCOverrides.java
similarity index 100%
rename from tlatools/src/tlc2/overrides/ITLCOverrides.java
rename to tlatools/org.lamport.tlatools/src/tlc2/overrides/ITLCOverrides.java
diff --git a/tlatools/src/tlc2/overrides/TLAPlusOperator.java b/tlatools/org.lamport.tlatools/src/tlc2/overrides/TLAPlusOperator.java
similarity index 100%
rename from tlatools/src/tlc2/overrides/TLAPlusOperator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/overrides/TLAPlusOperator.java
diff --git a/tlatools/src/tlc2/pprint/Format.java b/tlatools/org.lamport.tlatools/src/tlc2/pprint/Format.java
similarity index 100%
rename from tlatools/src/tlc2/pprint/Format.java
rename to tlatools/org.lamport.tlatools/src/tlc2/pprint/Format.java
diff --git a/tlatools/src/tlc2/pprint/FormatException.java b/tlatools/org.lamport.tlatools/src/tlc2/pprint/FormatException.java
similarity index 100%
rename from tlatools/src/tlc2/pprint/FormatException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/pprint/FormatException.java
diff --git a/tlatools/src/tlc2/pprint/Node.java b/tlatools/org.lamport.tlatools/src/tlc2/pprint/Node.java
similarity index 100%
rename from tlatools/src/tlc2/pprint/Node.java
rename to tlatools/org.lamport.tlatools/src/tlc2/pprint/Node.java
diff --git a/tlatools/src/tlc2/pprint/Parse.java b/tlatools/org.lamport.tlatools/src/tlc2/pprint/Parse.java
similarity index 100%
rename from tlatools/src/tlc2/pprint/Parse.java
rename to tlatools/org.lamport.tlatools/src/tlc2/pprint/Parse.java
diff --git a/tlatools/src/tlc2/pprint/ParseException.java b/tlatools/org.lamport.tlatools/src/tlc2/pprint/ParseException.java
similarity index 100%
rename from tlatools/src/tlc2/pprint/ParseException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/pprint/ParseException.java
diff --git a/tlatools/src/tlc2/pprint/PrettyPrint.java b/tlatools/org.lamport.tlatools/src/tlc2/pprint/PrettyPrint.java
similarity index 100%
rename from tlatools/src/tlc2/pprint/PrettyPrint.java
rename to tlatools/org.lamport.tlatools/src/tlc2/pprint/PrettyPrint.java
diff --git a/tlatools/src/tlc2/tool/AbstractChecker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/AbstractChecker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/AbstractChecker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/AbstractChecker.java
diff --git a/tlatools/src/tlc2/tool/Action.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/Action.java
similarity index 100%
rename from tlatools/src/tlc2/tool/Action.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/Action.java
diff --git a/tlatools/src/tlc2/tool/BuiltInOPs.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/BuiltInOPs.java
similarity index 100%
rename from tlatools/src/tlc2/tool/BuiltInOPs.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/BuiltInOPs.java
diff --git a/tlatools/src/tlc2/tool/CallStack.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/CallStack.java
similarity index 100%
rename from tlatools/src/tlc2/tool/CallStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/CallStack.java
diff --git a/tlatools/src/tlc2/tool/CheckImpl.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/CheckImpl.java
similarity index 100%
rename from tlatools/src/tlc2/tool/CheckImpl.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/CheckImpl.java
diff --git a/tlatools/src/tlc2/tool/CheckImplFile.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/CheckImplFile.java
similarity index 100%
rename from tlatools/src/tlc2/tool/CheckImplFile.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/CheckImplFile.java
diff --git a/tlatools/src/tlc2/tool/ConcurrentTLCTrace.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/ConcurrentTLCTrace.java
similarity index 100%
rename from tlatools/src/tlc2/tool/ConcurrentTLCTrace.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/ConcurrentTLCTrace.java
diff --git a/tlatools/src/tlc2/tool/ConfigFileException.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/ConfigFileException.java
similarity index 100%
rename from tlatools/src/tlc2/tool/ConfigFileException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/ConfigFileException.java
diff --git a/tlatools/src/tlc2/tool/DFIDModelChecker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/DFIDModelChecker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/DFIDModelChecker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/DFIDModelChecker.java
diff --git a/tlatools/src/tlc2/tool/DFIDWorker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/DFIDWorker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/DFIDWorker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/DFIDWorker.java
diff --git a/tlatools/src/tlc2/tool/Defns.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/Defns.java
similarity index 100%
rename from tlatools/src/tlc2/tool/Defns.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/Defns.java
diff --git a/tlatools/src/tlc2/tool/EvalControl.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/EvalControl.java
similarity index 100%
rename from tlatools/src/tlc2/tool/EvalControl.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/EvalControl.java
diff --git a/tlatools/src/tlc2/tool/EvalException.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/EvalException.java
similarity index 100%
rename from tlatools/src/tlc2/tool/EvalException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/EvalException.java
diff --git a/tlatools/src/tlc2/tool/FingerprintException.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/FingerprintException.java
similarity index 100%
rename from tlatools/src/tlc2/tool/FingerprintException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/FingerprintException.java
diff --git a/tlatools/src/tlc2/tool/IActionItemList.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/IActionItemList.java
similarity index 100%
rename from tlatools/src/tlc2/tool/IActionItemList.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/IActionItemList.java
diff --git a/tlatools/src/tlc2/tool/IContextEnumerator.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/IContextEnumerator.java
similarity index 100%
rename from tlatools/src/tlc2/tool/IContextEnumerator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/IContextEnumerator.java
diff --git a/tlatools/src/tlc2/tool/INextStateFunctor.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/INextStateFunctor.java
similarity index 100%
rename from tlatools/src/tlc2/tool/INextStateFunctor.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/INextStateFunctor.java
diff --git a/tlatools/src/tlc2/tool/IStateFunctor.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/IStateFunctor.java
similarity index 100%
rename from tlatools/src/tlc2/tool/IStateFunctor.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/IStateFunctor.java
diff --git a/tlatools/src/tlc2/tool/ITool.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/ITool.java
similarity index 100%
rename from tlatools/src/tlc2/tool/ITool.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/ITool.java
diff --git a/tlatools/src/tlc2/tool/IWorker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/IWorker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/IWorker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/IWorker.java
diff --git a/tlatools/src/tlc2/tool/ModelChecker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/ModelChecker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/ModelChecker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/ModelChecker.java
diff --git a/tlatools/src/tlc2/tool/SimulationWorker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/SimulationWorker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/SimulationWorker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/SimulationWorker.java
diff --git a/tlatools/src/tlc2/tool/Simulator.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/Simulator.java
similarity index 100%
rename from tlatools/src/tlc2/tool/Simulator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/Simulator.java
diff --git a/tlatools/src/tlc2/tool/Specs.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/Specs.java
similarity index 100%
rename from tlatools/src/tlc2/tool/Specs.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/Specs.java
diff --git a/tlatools/src/tlc2/tool/StateVec.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/StateVec.java
similarity index 100%
rename from tlatools/src/tlc2/tool/StateVec.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/StateVec.java
diff --git a/tlatools/src/tlc2/tool/TLCState.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TLCState.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TLCState.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TLCState.java
diff --git a/tlatools/src/tlc2/tool/TLCStateFun.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateFun.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TLCStateFun.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateFun.java
diff --git a/tlatools/src/tlc2/tool/TLCStateInfo.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateInfo.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TLCStateInfo.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateInfo.java
diff --git a/tlatools/src/tlc2/tool/TLCStateMut.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateMut.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TLCStateMut.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateMut.java
diff --git a/tlatools/src/tlc2/tool/TLCStateMutSource.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateMutSource.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TLCStateMutSource.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateMutSource.java
diff --git a/tlatools/src/tlc2/tool/TLCStateVec.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateVec.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TLCStateVec.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TLCStateVec.java
diff --git a/tlatools/src/tlc2/tool/TLCTrace.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TLCTrace.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TLCTrace.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TLCTrace.java
diff --git a/tlatools/src/tlc2/tool/ToolGlobals.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/ToolGlobals.java
similarity index 100%
rename from tlatools/src/tlc2/tool/ToolGlobals.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/ToolGlobals.java
diff --git a/tlatools/src/tlc2/tool/TraceApp.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/TraceApp.java
similarity index 100%
rename from tlatools/src/tlc2/tool/TraceApp.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/TraceApp.java
diff --git a/tlatools/src/tlc2/tool/Worker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/Worker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/Worker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/Worker.java
diff --git a/tlatools/src/tlc2/tool/WorkerException.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/WorkerException.java
similarity index 100%
rename from tlatools/src/tlc2/tool/WorkerException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/WorkerException.java
diff --git a/tlatools/src/tlc2/tool/coverage/ActionWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/ActionWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/ActionWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/ActionWrapper.java
diff --git a/tlatools/src/tlc2/tool/coverage/CostModel.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CostModel.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/CostModel.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CostModel.java
diff --git a/tlatools/src/tlc2/tool/coverage/CostModelCreator.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CostModelCreator.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/CostModelCreator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CostModelCreator.java
diff --git a/tlatools/src/tlc2/tool/coverage/CostModelNode.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CostModelNode.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/CostModelNode.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CostModelNode.java
diff --git a/tlatools/src/tlc2/tool/coverage/CoverageHashTable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CoverageHashTable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/CoverageHashTable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/CoverageHashTable.java
diff --git a/tlatools/src/tlc2/tool/coverage/OpApplNodeWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/OpApplNodeWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/OpApplNodeWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/OpApplNodeWrapper.java
diff --git a/tlatools/src/tlc2/tool/coverage/RecursiveOpApplNodeWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/RecursiveOpApplNodeWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/RecursiveOpApplNodeWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/RecursiveOpApplNodeWrapper.java
diff --git a/tlatools/src/tlc2/tool/coverage/UnchangedOpApplNodeWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/UnchangedOpApplNodeWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/coverage/UnchangedOpApplNodeWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/coverage/UnchangedOpApplNodeWrapper.java
diff --git a/tlatools/src/tlc2/tool/distributed/DistApp.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/DistApp.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/DistApp.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/DistApp.java
diff --git a/tlatools/src/tlc2/tool/distributed/DistributedFPSetTLCServer.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/DistributedFPSetTLCServer.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/DistributedFPSetTLCServer.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/DistributedFPSetTLCServer.java
diff --git a/tlatools/src/tlc2/tool/distributed/InternRMI.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/InternRMI.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/InternRMI.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/InternRMI.java
diff --git a/tlatools/src/tlc2/tool/distributed/NextStateResult.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/NextStateResult.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/NextStateResult.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/NextStateResult.java
diff --git a/tlatools/src/tlc2/tool/distributed/RMIFilenameToStreamResolver.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/RMIFilenameToStreamResolver.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/RMIFilenameToStreamResolver.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/RMIFilenameToStreamResolver.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCApp.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCApp.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCApp.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCApp.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCServer.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCServer.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCServer.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCServer.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCServerRMI.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCServerRMI.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCServerRMI.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCServerRMI.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCServerThread.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCServerThread.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCServerThread.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCServerThread.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCTimerTask.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCTimerTask.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCTimerTask.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCTimerTask.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCWorker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCWorker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCWorker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCWorker.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCWorkerRMI.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCWorkerRMI.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCWorkerRMI.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCWorkerRMI.java
diff --git a/tlatools/src/tlc2/tool/distributed/TLCWorkerSmartProxy.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCWorkerSmartProxy.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/TLCWorkerSmartProxy.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/TLCWorkerSmartProxy.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/DistributedFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/DistributedFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/DistributedFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/DistributedFPSet.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/DynamicFPSetManager.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/DynamicFPSetManager.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/DynamicFPSetManager.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/DynamicFPSetManager.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/FPSetManager.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/FPSetManager.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/FPSetManager.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/FPSetManager.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/FPSetManagerException.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/FPSetManagerException.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/FPSetManagerException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/FPSetManagerException.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/FPSetRMI.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/FPSetRMI.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/FPSetRMI.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/FPSetRMI.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/IFPSetManager.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/IFPSetManager.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/IFPSetManager.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/IFPSetManager.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/NonDistributedFPSetManager.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/NonDistributedFPSetManager.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/NonDistributedFPSetManager.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/NonDistributedFPSetManager.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/TLCWorkerAndFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/TLCWorkerAndFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/TLCWorkerAndFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/TLCWorkerAndFPSet.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/callable/BitVectorWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/BitVectorWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/callable/BitVectorWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/BitVectorWrapper.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/callable/CheckFPsCallable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/CheckFPsCallable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/callable/CheckFPsCallable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/CheckFPsCallable.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/callable/CheckInvariantCallable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/CheckInvariantCallable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/callable/CheckInvariantCallable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/CheckInvariantCallable.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/callable/ContainsBlockCallable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/ContainsBlockCallable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/callable/ContainsBlockCallable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/ContainsBlockCallable.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/callable/FPSetManagerCallable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/FPSetManagerCallable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/callable/FPSetManagerCallable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/FPSetManagerCallable.java
diff --git a/tlatools/src/tlc2/tool/distributed/fp/callable/PutBlockCallable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/PutBlockCallable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/fp/callable/PutBlockCallable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/fp/callable/PutBlockCallable.java
diff --git a/tlatools/src/tlc2/tool/distributed/management/TLCServerMXWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/management/TLCServerMXWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/management/TLCServerMXWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/management/TLCServerMXWrapper.java
diff --git a/tlatools/src/tlc2/tool/distributed/management/TLCStatisticsMXBean.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/management/TLCStatisticsMXBean.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/management/TLCStatisticsMXBean.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/management/TLCStatisticsMXBean.java
diff --git a/tlatools/src/tlc2/tool/distributed/selector/BlockSelector.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/BlockSelector.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/selector/BlockSelector.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/BlockSelector.java
diff --git a/tlatools/src/tlc2/tool/distributed/selector/BlockSelectorFactory.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/BlockSelectorFactory.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/selector/BlockSelectorFactory.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/BlockSelectorFactory.java
diff --git a/tlatools/src/tlc2/tool/distributed/selector/IBlockSelector.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/IBlockSelector.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/selector/IBlockSelector.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/IBlockSelector.java
diff --git a/tlatools/src/tlc2/tool/distributed/selector/LimitingBlockSelector.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/LimitingBlockSelector.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/selector/LimitingBlockSelector.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/LimitingBlockSelector.java
diff --git a/tlatools/src/tlc2/tool/distributed/selector/StaticBlockSelector.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/StaticBlockSelector.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/selector/StaticBlockSelector.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/StaticBlockSelector.java
diff --git a/tlatools/src/tlc2/tool/distributed/selector/StatisticalBlockSelector.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/StatisticalBlockSelector.java
similarity index 100%
rename from tlatools/src/tlc2/tool/distributed/selector/StatisticalBlockSelector.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/distributed/selector/StatisticalBlockSelector.java
diff --git a/tlatools/src/tlc2/tool/fp/DiskFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/DiskFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/DiskFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/DiskFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/FPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/FPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/FPSetConfiguration.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetConfiguration.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/FPSetConfiguration.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetConfiguration.java
diff --git a/tlatools/src/tlc2/tool/fp/FPSetFactory.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetFactory.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/FPSetFactory.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetFactory.java
diff --git a/tlatools/src/tlc2/tool/fp/FPSetStatistic.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetStatistic.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/FPSetStatistic.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetStatistic.java
diff --git a/tlatools/src/tlc2/tool/fp/FPSetsIdxCalculationBits.jpg b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetsIdxCalculationBits.jpg
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/FPSetsIdxCalculationBits.jpg
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/FPSetsIdxCalculationBits.jpg
diff --git a/tlatools/src/tlc2/tool/fp/HeapBasedDiskFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/HeapBasedDiskFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/HeapBasedDiskFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/HeapBasedDiskFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/LSBDiskFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/LSBDiskFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/LSBDiskFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/LSBDiskFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/LongArray.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/LongArray.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/LongArray.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/LongArray.java
diff --git a/tlatools/src/tlc2/tool/fp/LongArrays.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/LongArrays.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/LongArrays.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/LongArrays.java
diff --git a/tlatools/src/tlc2/tool/fp/MSBDiskFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MSBDiskFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/MSBDiskFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MSBDiskFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/MemFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MemFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/MemFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MemFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/MemFPSet1.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MemFPSet1.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/MemFPSet1.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MemFPSet1.java
diff --git a/tlatools/src/tlc2/tool/fp/MemFPSet2.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MemFPSet2.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/MemFPSet2.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MemFPSet2.java
diff --git a/tlatools/src/tlc2/tool/fp/MultiFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MultiFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/MultiFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MultiFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/MultiFPSetConfiguration.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MultiFPSetConfiguration.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/MultiFPSetConfiguration.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/MultiFPSetConfiguration.java
diff --git a/tlatools/src/tlc2/tool/fp/NonCheckpointableDiskFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/NonCheckpointableDiskFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/NonCheckpointableDiskFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/NonCheckpointableDiskFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/NoopFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/NoopFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/NoopFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/NoopFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/OffHeapDiskFPSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/OffHeapDiskFPSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/OffHeapDiskFPSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/OffHeapDiskFPSet.java
diff --git a/tlatools/src/tlc2/tool/fp/OpenAddressing.ConcurrentFlusher.tla b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/OpenAddressing.ConcurrentFlusher.tla
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/OpenAddressing.ConcurrentFlusher.tla
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/OpenAddressing.ConcurrentFlusher.tla
diff --git a/tlatools/src/tlc2/tool/fp/OpenAddressing.tla b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/OpenAddressing.tla
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/OpenAddressing.tla
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/OpenAddressing.tla
diff --git a/tlatools/src/tlc2/tool/fp/dfid/FPIntSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/dfid/FPIntSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/dfid/FPIntSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/dfid/FPIntSet.java
diff --git a/tlatools/src/tlc2/tool/fp/dfid/MemFPIntSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/dfid/MemFPIntSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/dfid/MemFPIntSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/dfid/MemFPIntSet.java
diff --git a/tlatools/src/tlc2/tool/fp/dfid/MultiFPIntSet.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/dfid/MultiFPIntSet.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/dfid/MultiFPIntSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/dfid/MultiFPIntSet.java
diff --git a/tlatools/src/tlc2/tool/fp/management/DiskFPSetMXBean.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/management/DiskFPSetMXBean.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/management/DiskFPSetMXBean.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/management/DiskFPSetMXBean.java
diff --git a/tlatools/src/tlc2/tool/fp/management/DiskFPSetMXWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/fp/management/DiskFPSetMXWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/fp/management/DiskFPSetMXWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/fp/management/DiskFPSetMXWrapper.java
diff --git a/tlatools/src/tlc2/tool/impl/ActionItemList.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/ActionItemList.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/ActionItemList.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/ActionItemList.java
diff --git a/tlatools/src/tlc2/tool/impl/CallStackTool.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/CallStackTool.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/CallStackTool.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/CallStackTool.java
diff --git a/tlatools/src/tlc2/tool/impl/ContextEnumerator.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/ContextEnumerator.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/ContextEnumerator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/ContextEnumerator.java
diff --git a/tlatools/src/tlc2/tool/impl/Evaluator.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/Evaluator.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/Evaluator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/Evaluator.java
diff --git a/tlatools/src/tlc2/tool/impl/FastTool.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/FastTool.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/FastTool.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/FastTool.java
diff --git a/tlatools/src/tlc2/tool/impl/ModelConfig.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/ModelConfig.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/ModelConfig.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/ModelConfig.java
diff --git a/tlatools/src/tlc2/tool/impl/OpDefEvaluator.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/OpDefEvaluator.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/OpDefEvaluator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/OpDefEvaluator.java
diff --git a/tlatools/src/tlc2/tool/impl/Spec.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/Spec.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/Spec.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/Spec.java
diff --git a/tlatools/src/tlc2/tool/impl/SpecProcessor.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/SpecProcessor.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/SpecProcessor.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/SpecProcessor.java
diff --git a/tlatools/src/tlc2/tool/impl/SymbolNodeValueLookupProvider.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/SymbolNodeValueLookupProvider.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/SymbolNodeValueLookupProvider.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/SymbolNodeValueLookupProvider.java
diff --git a/tlatools/src/tlc2/tool/impl/TLAClass.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/TLAClass.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/TLAClass.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/TLAClass.java
diff --git a/tlatools/src/tlc2/tool/impl/TLARegistry.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/TLARegistry.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/TLARegistry.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/TLARegistry.java
diff --git a/tlatools/src/tlc2/tool/impl/Tool.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/Tool.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/Tool.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/Tool.java
diff --git a/tlatools/src/tlc2/tool/impl/WorkerValue.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/impl/WorkerValue.java
similarity index 100%
rename from tlatools/src/tlc2/tool/impl/WorkerValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/impl/WorkerValue.java
diff --git a/tlatools/src/tlc2/tool/liveness/AbstractDiskGraph.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/AbstractDiskGraph.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/AbstractDiskGraph.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/AbstractDiskGraph.java
diff --git a/tlatools/src/tlc2/tool/liveness/AbstractGraphNode.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/AbstractGraphNode.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/AbstractGraphNode.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/AbstractGraphNode.java
diff --git a/tlatools/src/tlc2/tool/liveness/AddAndCheckLiveCheck.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/AddAndCheckLiveCheck.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/AddAndCheckLiveCheck.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/AddAndCheckLiveCheck.java
diff --git a/tlatools/src/tlc2/tool/liveness/BEGraph.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/BEGraph.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/BEGraph.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/BEGraph.java
diff --git a/tlatools/src/tlc2/tool/liveness/BEGraphNode.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/BEGraphNode.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/BEGraphNode.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/BEGraphNode.java
diff --git a/tlatools/src/tlc2/tool/liveness/BTGraphNode.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/BTGraphNode.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/BTGraphNode.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/BTGraphNode.java
diff --git a/tlatools/src/tlc2/tool/liveness/DiskGraph.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/DiskGraph.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/DiskGraph.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/DiskGraph.java
diff --git a/tlatools/src/tlc2/tool/liveness/DotLivenessStateWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/DotLivenessStateWriter.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/DotLivenessStateWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/DotLivenessStateWriter.java
diff --git a/tlatools/src/tlc2/tool/liveness/GraphNode.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/GraphNode.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/GraphNode.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/GraphNode.java
diff --git a/tlatools/src/tlc2/tool/liveness/ILiveCheck.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/ILiveCheck.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/ILiveCheck.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/ILiveCheck.java
diff --git a/tlatools/src/tlc2/tool/liveness/ILiveChecker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/ILiveChecker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/ILiveChecker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/ILiveChecker.java
diff --git a/tlatools/src/tlc2/tool/liveness/ILivenessStateWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/ILivenessStateWriter.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/ILivenessStateWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/ILivenessStateWriter.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNAction.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNAction.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNAction.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNAction.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNAll.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNAll.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNAll.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNAll.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNBool.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNBool.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNBool.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNBool.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNConj.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNConj.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNConj.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNConj.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNDisj.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNDisj.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNDisj.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNDisj.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNEven.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNEven.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNEven.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNEven.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNNeg.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNNeg.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNNeg.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNNeg.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNNext.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNNext.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNNext.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNNext.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNState.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNState.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNState.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNState.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNStateAST.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNStateAST.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNStateAST.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNStateAST.java
diff --git a/tlatools/src/tlc2/tool/liveness/LNStateEnabled.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNStateEnabled.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LNStateEnabled.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LNStateEnabled.java
diff --git a/tlatools/src/tlc2/tool/liveness/LiveCheck.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveCheck.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LiveCheck.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveCheck.java
diff --git a/tlatools/src/tlc2/tool/liveness/LiveCheck1.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveCheck1.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LiveCheck1.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveCheck1.java
diff --git a/tlatools/src/tlc2/tool/liveness/LiveException.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveException.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LiveException.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveException.java
diff --git a/tlatools/src/tlc2/tool/liveness/LiveExprNode.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveExprNode.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LiveExprNode.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveExprNode.java
diff --git a/tlatools/src/tlc2/tool/liveness/LiveWorker.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveWorker.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/LiveWorker.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/LiveWorker.java
diff --git a/tlatools/src/tlc2/tool/liveness/Liveness.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/Liveness.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/Liveness.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/Liveness.java
diff --git a/tlatools/src/tlc2/tool/liveness/NoOpLiveCheck.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NoOpLiveCheck.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/NoOpLiveCheck.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NoOpLiveCheck.java
diff --git a/tlatools/src/tlc2/tool/liveness/NodePtrTable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NodePtrTable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/NodePtrTable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NodePtrTable.java
diff --git a/tlatools/src/tlc2/tool/liveness/NodeTable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NodeTable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/NodeTable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NodeTable.java
diff --git a/tlatools/src/tlc2/tool/liveness/NoopLivenessStateWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NoopLivenessStateWriter.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/NoopLivenessStateWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/NoopLivenessStateWriter.java
diff --git a/tlatools/src/tlc2/tool/liveness/OrderOfSolution.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/OrderOfSolution.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/OrderOfSolution.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/OrderOfSolution.java
diff --git a/tlatools/src/tlc2/tool/liveness/PossibleErrorModel.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/PossibleErrorModel.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/PossibleErrorModel.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/PossibleErrorModel.java
diff --git a/tlatools/src/tlc2/tool/liveness/TBGraph.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBGraph.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/TBGraph.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBGraph.java
diff --git a/tlatools/src/tlc2/tool/liveness/TBGraphNode.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBGraphNode.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/TBGraphNode.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBGraphNode.java
diff --git a/tlatools/src/tlc2/tool/liveness/TBPar.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBPar.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/TBPar.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBPar.java
diff --git a/tlatools/src/tlc2/tool/liveness/TBParVec.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBParVec.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/TBParVec.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBParVec.java
diff --git a/tlatools/src/tlc2/tool/liveness/TBTriple.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBTriple.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/TBTriple.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TBTriple.java
diff --git a/tlatools/src/tlc2/tool/liveness/TableauDiskGraph.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TableauDiskGraph.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/TableauDiskGraph.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TableauDiskGraph.java
diff --git a/tlatools/src/tlc2/tool/liveness/TableauNodePtrTable.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TableauNodePtrTable.java
similarity index 100%
rename from tlatools/src/tlc2/tool/liveness/TableauNodePtrTable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/liveness/TableauNodePtrTable.java
diff --git a/tlatools/src/tlc2/tool/management/ModelCheckerMXWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/management/ModelCheckerMXWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/tool/management/ModelCheckerMXWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/management/ModelCheckerMXWrapper.java
diff --git a/tlatools/src/tlc2/tool/management/TLCStandardMBean.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/management/TLCStandardMBean.java
similarity index 100%
rename from tlatools/src/tlc2/tool/management/TLCStandardMBean.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/management/TLCStandardMBean.java
diff --git a/tlatools/src/tlc2/tool/queue/ByteArrayQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/queue/ByteArrayQueue.java
similarity index 100%
rename from tlatools/src/tlc2/tool/queue/ByteArrayQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/queue/ByteArrayQueue.java
diff --git a/tlatools/src/tlc2/tool/queue/DiskByteArrayQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/queue/DiskByteArrayQueue.java
similarity index 100%
rename from tlatools/src/tlc2/tool/queue/DiskByteArrayQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/queue/DiskByteArrayQueue.java
diff --git a/tlatools/src/tlc2/tool/queue/DiskStateQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/queue/DiskStateQueue.java
similarity index 100%
rename from tlatools/src/tlc2/tool/queue/DiskStateQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/queue/DiskStateQueue.java
diff --git a/tlatools/src/tlc2/tool/queue/IStateQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/queue/IStateQueue.java
similarity index 100%
rename from tlatools/src/tlc2/tool/queue/IStateQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/queue/IStateQueue.java
diff --git a/tlatools/src/tlc2/tool/queue/MemStateQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/queue/MemStateQueue.java
similarity index 100%
rename from tlatools/src/tlc2/tool/queue/MemStateQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/queue/MemStateQueue.java
diff --git a/tlatools/src/tlc2/tool/queue/StateQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/tool/queue/StateQueue.java
similarity index 100%
rename from tlatools/src/tlc2/tool/queue/StateQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/tool/queue/StateQueue.java
diff --git a/tlatools/src/tlc2/util/BigInt.java b/tlatools/org.lamport.tlatools/src/tlc2/util/BigInt.java
similarity index 100%
rename from tlatools/src/tlc2/util/BigInt.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/BigInt.java
diff --git a/tlatools/src/tlc2/util/BigSet.java b/tlatools/org.lamport.tlatools/src/tlc2/util/BigSet.java
similarity index 100%
rename from tlatools/src/tlc2/util/BigSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/BigSet.java
diff --git a/tlatools/src/tlc2/util/BitVector.java b/tlatools/org.lamport.tlatools/src/tlc2/util/BitVector.java
similarity index 100%
rename from tlatools/src/tlc2/util/BitVector.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/BitVector.java
diff --git a/tlatools/src/tlc2/util/BufferedRandomAccessFile.java b/tlatools/org.lamport.tlatools/src/tlc2/util/BufferedRandomAccessFile.java
similarity index 100%
rename from tlatools/src/tlc2/util/BufferedRandomAccessFile.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/BufferedRandomAccessFile.java
diff --git a/tlatools/src/tlc2/util/ByteUtils.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ByteUtils.java
similarity index 100%
rename from tlatools/src/tlc2/util/ByteUtils.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ByteUtils.java
diff --git a/tlatools/src/tlc2/util/Cache.java b/tlatools/org.lamport.tlatools/src/tlc2/util/Cache.java
similarity index 100%
rename from tlatools/src/tlc2/util/Cache.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/Cache.java
diff --git a/tlatools/src/tlc2/util/Combinatorics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/Combinatorics.java
similarity index 100%
rename from tlatools/src/tlc2/util/Combinatorics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/Combinatorics.java
diff --git a/tlatools/src/tlc2/util/Context.java b/tlatools/org.lamport.tlatools/src/tlc2/util/Context.java
similarity index 100%
rename from tlatools/src/tlc2/util/Context.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/Context.java
diff --git a/tlatools/src/tlc2/util/DiskIntStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/DiskIntStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/DiskIntStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/DiskIntStack.java
diff --git a/tlatools/src/tlc2/util/DiskObjectStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/DiskObjectStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/DiskObjectStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/DiskObjectStack.java
diff --git a/tlatools/src/tlc2/util/DotStateWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/util/DotStateWriter.java
similarity index 100%
rename from tlatools/src/tlc2/util/DotStateWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/DotStateWriter.java
diff --git a/tlatools/src/tlc2/util/ExSortUtils.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ExSortUtils.java
similarity index 100%
rename from tlatools/src/tlc2/util/ExSortUtils.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ExSortUtils.java
diff --git a/tlatools/src/tlc2/util/ExpectInlined.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ExpectInlined.java
similarity index 100%
rename from tlatools/src/tlc2/util/ExpectInlined.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ExpectInlined.java
diff --git a/tlatools/src/tlc2/util/ExternalSortable.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ExternalSortable.java
similarity index 100%
rename from tlatools/src/tlc2/util/ExternalSortable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ExternalSortable.java
diff --git a/tlatools/src/tlc2/util/FP64.java b/tlatools/org.lamport.tlatools/src/tlc2/util/FP64.java
similarity index 100%
rename from tlatools/src/tlc2/util/FP64.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/FP64.java
diff --git a/tlatools/src/tlc2/util/IStateWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/util/IStateWriter.java
similarity index 100%
rename from tlatools/src/tlc2/util/IStateWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/IStateWriter.java
diff --git a/tlatools/src/tlc2/util/IdThread.java b/tlatools/org.lamport.tlatools/src/tlc2/util/IdThread.java
similarity index 100%
rename from tlatools/src/tlc2/util/IdThread.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/IdThread.java
diff --git a/tlatools/src/tlc2/util/IntStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/IntStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/IntStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/IntStack.java
diff --git a/tlatools/src/tlc2/util/List.java b/tlatools/org.lamport.tlatools/src/tlc2/util/List.java
similarity index 100%
rename from tlatools/src/tlc2/util/List.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/List.java
diff --git a/tlatools/src/tlc2/util/LongObjTable.java b/tlatools/org.lamport.tlatools/src/tlc2/util/LongObjTable.java
similarity index 100%
rename from tlatools/src/tlc2/util/LongObjTable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/LongObjTable.java
diff --git a/tlatools/src/tlc2/util/LongVec.java b/tlatools/org.lamport.tlatools/src/tlc2/util/LongVec.java
similarity index 100%
rename from tlatools/src/tlc2/util/LongVec.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/LongVec.java
diff --git a/tlatools/src/tlc2/util/MemBasedSet.java b/tlatools/org.lamport.tlatools/src/tlc2/util/MemBasedSet.java
similarity index 100%
rename from tlatools/src/tlc2/util/MemBasedSet.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/MemBasedSet.java
diff --git a/tlatools/src/tlc2/util/MemIntQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/util/MemIntQueue.java
similarity index 100%
rename from tlatools/src/tlc2/util/MemIntQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/MemIntQueue.java
diff --git a/tlatools/src/tlc2/util/MemIntStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/MemIntStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/MemIntStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/MemIntStack.java
diff --git a/tlatools/src/tlc2/util/MemObjectQueue.java b/tlatools/org.lamport.tlatools/src/tlc2/util/MemObjectQueue.java
similarity index 100%
rename from tlatools/src/tlc2/util/MemObjectQueue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/MemObjectQueue.java
diff --git a/tlatools/src/tlc2/util/MemObjectStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/MemObjectStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/MemObjectStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/MemObjectStack.java
diff --git a/tlatools/src/tlc2/util/NoopStateWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/util/NoopStateWriter.java
similarity index 100%
rename from tlatools/src/tlc2/util/NoopStateWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/NoopStateWriter.java
diff --git a/tlatools/src/tlc2/util/ObjLongTable.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ObjLongTable.java
similarity index 100%
rename from tlatools/src/tlc2/util/ObjLongTable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ObjLongTable.java
diff --git a/tlatools/src/tlc2/util/ObjectPoolStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ObjectPoolStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/ObjectPoolStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ObjectPoolStack.java
diff --git a/tlatools/src/tlc2/util/ObjectStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ObjectStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/ObjectStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ObjectStack.java
diff --git a/tlatools/src/tlc2/util/RandomAccessFile.java b/tlatools/org.lamport.tlatools/src/tlc2/util/RandomAccessFile.java
similarity index 100%
rename from tlatools/src/tlc2/util/RandomAccessFile.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/RandomAccessFile.java
diff --git a/tlatools/src/tlc2/util/RandomGenerator.java b/tlatools/org.lamport.tlatools/src/tlc2/util/RandomGenerator.java
similarity index 100%
rename from tlatools/src/tlc2/util/RandomGenerator.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/RandomGenerator.java
diff --git a/tlatools/src/tlc2/util/ReadersWriterLock.java b/tlatools/org.lamport.tlatools/src/tlc2/util/ReadersWriterLock.java
similarity index 100%
rename from tlatools/src/tlc2/util/ReadersWriterLock.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/ReadersWriterLock.java
diff --git a/tlatools/src/tlc2/util/SetOfLong.java b/tlatools/org.lamport.tlatools/src/tlc2/util/SetOfLong.java
similarity index 100%
rename from tlatools/src/tlc2/util/SetOfLong.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/SetOfLong.java
diff --git a/tlatools/src/tlc2/util/SetOfStates.java b/tlatools/org.lamport.tlatools/src/tlc2/util/SetOfStates.java
similarity index 100%
rename from tlatools/src/tlc2/util/SetOfStates.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/SetOfStates.java
diff --git a/tlatools/src/tlc2/util/SimpUtil.java b/tlatools/org.lamport.tlatools/src/tlc2/util/SimpUtil.java
similarity index 100%
rename from tlatools/src/tlc2/util/SimpUtil.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/SimpUtil.java
diff --git a/tlatools/src/tlc2/util/SimpleCache.java b/tlatools/org.lamport.tlatools/src/tlc2/util/SimpleCache.java
similarity index 100%
rename from tlatools/src/tlc2/util/SimpleCache.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/SimpleCache.java
diff --git a/tlatools/src/tlc2/util/SingleThreadedReadersWriterLock.java b/tlatools/org.lamport.tlatools/src/tlc2/util/SingleThreadedReadersWriterLock.java
similarity index 100%
rename from tlatools/src/tlc2/util/SingleThreadedReadersWriterLock.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/SingleThreadedReadersWriterLock.java
diff --git a/tlatools/src/tlc2/util/StatePoolReader.java b/tlatools/org.lamport.tlatools/src/tlc2/util/StatePoolReader.java
similarity index 100%
rename from tlatools/src/tlc2/util/StatePoolReader.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/StatePoolReader.java
diff --git a/tlatools/src/tlc2/util/StatePoolWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/util/StatePoolWriter.java
similarity index 100%
rename from tlatools/src/tlc2/util/StatePoolWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/StatePoolWriter.java
diff --git a/tlatools/src/tlc2/util/StateWriter.java b/tlatools/org.lamport.tlatools/src/tlc2/util/StateWriter.java
similarity index 100%
rename from tlatools/src/tlc2/util/StateWriter.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/StateWriter.java
diff --git a/tlatools/src/tlc2/util/Striped.java b/tlatools/org.lamport.tlatools/src/tlc2/util/Striped.java
similarity index 100%
rename from tlatools/src/tlc2/util/Striped.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/Striped.java
diff --git a/tlatools/src/tlc2/util/Sx.java b/tlatools/org.lamport.tlatools/src/tlc2/util/Sx.java
similarity index 100%
rename from tlatools/src/tlc2/util/Sx.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/Sx.java
diff --git a/tlatools/src/tlc2/util/SynchronousDiskIntStack.java b/tlatools/org.lamport.tlatools/src/tlc2/util/SynchronousDiskIntStack.java
similarity index 100%
rename from tlatools/src/tlc2/util/SynchronousDiskIntStack.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/SynchronousDiskIntStack.java
diff --git a/tlatools/src/tlc2/util/Vect.java b/tlatools/org.lamport.tlatools/src/tlc2/util/Vect.java
similarity index 100%
rename from tlatools/src/tlc2/util/Vect.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/Vect.java
diff --git a/tlatools/src/tlc2/util/statistics/AbstractBucketStatistics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/AbstractBucketStatistics.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/AbstractBucketStatistics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/AbstractBucketStatistics.java
diff --git a/tlatools/src/tlc2/util/statistics/BucketStatistics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/BucketStatistics.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/BucketStatistics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/BucketStatistics.java
diff --git a/tlatools/src/tlc2/util/statistics/ConcurrentBucketStatistics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/ConcurrentBucketStatistics.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/ConcurrentBucketStatistics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/ConcurrentBucketStatistics.java
diff --git a/tlatools/src/tlc2/util/statistics/CounterStatistic.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/CounterStatistic.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/CounterStatistic.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/CounterStatistic.java
diff --git a/tlatools/src/tlc2/util/statistics/DummyBucketStatistics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/DummyBucketStatistics.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/DummyBucketStatistics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/DummyBucketStatistics.java
diff --git a/tlatools/src/tlc2/util/statistics/FixedSizedBucketStatistics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/FixedSizedBucketStatistics.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/FixedSizedBucketStatistics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/FixedSizedBucketStatistics.java
diff --git a/tlatools/src/tlc2/util/statistics/FixedSizedConcurrentBucketStatistics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/FixedSizedConcurrentBucketStatistics.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/FixedSizedConcurrentBucketStatistics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/FixedSizedConcurrentBucketStatistics.java
diff --git a/tlatools/src/tlc2/util/statistics/IBucketStatistics.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/IBucketStatistics.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/IBucketStatistics.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/IBucketStatistics.java
diff --git a/tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXBean.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXBean.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXBean.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXBean.java
diff --git a/tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXWrapper.java b/tlatools/org.lamport.tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXWrapper.java
similarity index 100%
rename from tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXWrapper.java
rename to tlatools/org.lamport.tlatools/src/tlc2/util/statistics/management/BucketStatisticsMXWrapper.java
diff --git a/tlatools/src/tlc2/value/IBoolValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IBoolValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/IBoolValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IBoolValue.java
diff --git a/tlatools/src/tlc2/value/IFcnLambdaValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IFcnLambdaValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/IFcnLambdaValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IFcnLambdaValue.java
diff --git a/tlatools/src/tlc2/value/IFcnParams.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IFcnParams.java
similarity index 100%
rename from tlatools/src/tlc2/value/IFcnParams.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IFcnParams.java
diff --git a/tlatools/src/tlc2/value/IFcnRcdValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IFcnRcdValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/IFcnRcdValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IFcnRcdValue.java
diff --git a/tlatools/src/tlc2/value/IMVPerm.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IMVPerm.java
similarity index 100%
rename from tlatools/src/tlc2/value/IMVPerm.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IMVPerm.java
diff --git a/tlatools/src/tlc2/value/IModelValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IModelValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/IModelValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IModelValue.java
diff --git a/tlatools/src/tlc2/value/ITupleValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/ITupleValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/ITupleValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/ITupleValue.java
diff --git a/tlatools/src/tlc2/value/IValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/IValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IValue.java
diff --git a/tlatools/src/tlc2/value/IValueInputStream.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IValueInputStream.java
similarity index 100%
rename from tlatools/src/tlc2/value/IValueInputStream.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IValueInputStream.java
diff --git a/tlatools/src/tlc2/value/IValueOutputStream.java b/tlatools/org.lamport.tlatools/src/tlc2/value/IValueOutputStream.java
similarity index 100%
rename from tlatools/src/tlc2/value/IValueOutputStream.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/IValueOutputStream.java
diff --git a/tlatools/src/tlc2/value/RandomEnumerableValues.java b/tlatools/org.lamport.tlatools/src/tlc2/value/RandomEnumerableValues.java
similarity index 100%
rename from tlatools/src/tlc2/value/RandomEnumerableValues.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/RandomEnumerableValues.java
diff --git a/tlatools/src/tlc2/value/ValueConstants.java b/tlatools/org.lamport.tlatools/src/tlc2/value/ValueConstants.java
similarity index 100%
rename from tlatools/src/tlc2/value/ValueConstants.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/ValueConstants.java
diff --git a/tlatools/src/tlc2/value/ValueInputStream.java b/tlatools/org.lamport.tlatools/src/tlc2/value/ValueInputStream.java
similarity index 100%
rename from tlatools/src/tlc2/value/ValueInputStream.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/ValueInputStream.java
diff --git a/tlatools/src/tlc2/value/ValueOutputStream.java b/tlatools/org.lamport.tlatools/src/tlc2/value/ValueOutputStream.java
similarity index 100%
rename from tlatools/src/tlc2/value/ValueOutputStream.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/ValueOutputStream.java
diff --git a/tlatools/src/tlc2/value/Values.java b/tlatools/org.lamport.tlatools/src/tlc2/value/Values.java
similarity index 100%
rename from tlatools/src/tlc2/value/Values.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/Values.java
diff --git a/tlatools/src/tlc2/value/impl/Applicable.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/Applicable.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/Applicable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/Applicable.java
diff --git a/tlatools/src/tlc2/value/impl/BoolValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/BoolValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/BoolValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/BoolValue.java
diff --git a/tlatools/src/tlc2/value/impl/Enumerable.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/Enumerable.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/Enumerable.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/Enumerable.java
diff --git a/tlatools/src/tlc2/value/impl/EnumerableValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/EnumerableValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/EnumerableValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/EnumerableValue.java
diff --git a/tlatools/src/tlc2/value/impl/EvaluatingValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/EvaluatingValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/EvaluatingValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/EvaluatingValue.java
diff --git a/tlatools/src/tlc2/value/impl/FcnLambdaValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/FcnLambdaValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/FcnLambdaValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/FcnLambdaValue.java
diff --git a/tlatools/src/tlc2/value/impl/FcnParams.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/FcnParams.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/FcnParams.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/FcnParams.java
diff --git a/tlatools/src/tlc2/value/impl/FcnRcdValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/FcnRcdValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/FcnRcdValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/FcnRcdValue.java
diff --git a/tlatools/src/tlc2/value/impl/IntValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/IntValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/IntValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/IntValue.java
diff --git a/tlatools/src/tlc2/value/impl/IntervalValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/IntervalValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/IntervalValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/IntervalValue.java
diff --git a/tlatools/src/tlc2/value/impl/LazyValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/LazyValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/LazyValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/LazyValue.java
diff --git a/tlatools/src/tlc2/value/impl/MVPerm.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/MVPerm.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/MVPerm.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/MVPerm.java
diff --git a/tlatools/src/tlc2/value/impl/MVPerms.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/MVPerms.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/MVPerms.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/MVPerms.java
diff --git a/tlatools/src/tlc2/value/impl/MethodValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/MethodValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/MethodValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/MethodValue.java
diff --git a/tlatools/src/tlc2/value/impl/ModelValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/ModelValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/ModelValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/ModelValue.java
diff --git a/tlatools/src/tlc2/value/impl/OpLambdaValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/OpLambdaValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/OpLambdaValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/OpLambdaValue.java
diff --git a/tlatools/src/tlc2/value/impl/OpRcdValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/OpRcdValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/OpRcdValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/OpRcdValue.java
diff --git a/tlatools/src/tlc2/value/impl/OpValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/OpValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/OpValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/OpValue.java
diff --git a/tlatools/src/tlc2/value/impl/RecordValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/RecordValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/RecordValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/RecordValue.java
diff --git a/tlatools/src/tlc2/value/impl/Reducible.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/Reducible.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/Reducible.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/Reducible.java
diff --git a/tlatools/src/tlc2/value/impl/SetCapValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetCapValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetCapValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetCapValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetCupValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetCupValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetCupValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetCupValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetDiffValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetDiffValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetDiffValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetDiffValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetEnumValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetEnumValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetEnumValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetEnumValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetOfFcnsOrRcdsValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfFcnsOrRcdsValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetOfFcnsOrRcdsValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfFcnsOrRcdsValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetOfFcnsValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfFcnsValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetOfFcnsValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfFcnsValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetOfRcdsValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfRcdsValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetOfRcdsValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfRcdsValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetOfTuplesValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfTuplesValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetOfTuplesValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetOfTuplesValue.java
diff --git a/tlatools/src/tlc2/value/impl/SetPredValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetPredValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SetPredValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SetPredValue.java
diff --git a/tlatools/src/tlc2/value/impl/StringValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/StringValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/StringValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/StringValue.java
diff --git a/tlatools/src/tlc2/value/impl/SubsetValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SubsetValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SubsetValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SubsetValue.java
diff --git a/tlatools/src/tlc2/value/impl/SubsetValue.tla b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/SubsetValue.tla
similarity index 100%
rename from tlatools/src/tlc2/value/impl/SubsetValue.tla
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/SubsetValue.tla
diff --git a/tlatools/src/tlc2/value/impl/TupleValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/TupleValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/TupleValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/TupleValue.java
diff --git a/tlatools/src/tlc2/value/impl/UndefValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/UndefValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/UndefValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/UndefValue.java
diff --git a/tlatools/src/tlc2/value/impl/UnionValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/UnionValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/UnionValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/UnionValue.java
diff --git a/tlatools/src/tlc2/value/impl/UserObj.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/UserObj.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/UserObj.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/UserObj.java
diff --git a/tlatools/src/tlc2/value/impl/UserValue.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/UserValue.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/UserValue.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/UserValue.java
diff --git a/tlatools/src/tlc2/value/impl/Value.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/Value.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/Value.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/Value.java
diff --git a/tlatools/src/tlc2/value/impl/ValueEnumeration.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/ValueEnumeration.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/ValueEnumeration.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/ValueEnumeration.java
diff --git a/tlatools/src/tlc2/value/impl/ValueExcept.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/ValueExcept.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/ValueExcept.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/ValueExcept.java
diff --git a/tlatools/src/tlc2/value/impl/ValueVec.java b/tlatools/org.lamport.tlatools/src/tlc2/value/impl/ValueVec.java
similarity index 100%
rename from tlatools/src/tlc2/value/impl/ValueVec.java
rename to tlatools/org.lamport.tlatools/src/tlc2/value/impl/ValueVec.java
diff --git a/tlatools/src/util/Assert.java b/tlatools/org.lamport.tlatools/src/util/Assert.java
similarity index 100%
rename from tlatools/src/util/Assert.java
rename to tlatools/org.lamport.tlatools/src/util/Assert.java
diff --git a/tlatools/src/util/BufferedDataInputStream.java b/tlatools/org.lamport.tlatools/src/util/BufferedDataInputStream.java
similarity index 100%
rename from tlatools/src/util/BufferedDataInputStream.java
rename to tlatools/org.lamport.tlatools/src/util/BufferedDataInputStream.java
diff --git a/tlatools/src/util/BufferedDataOutputStream.java b/tlatools/org.lamport.tlatools/src/util/BufferedDataOutputStream.java
similarity index 100%
rename from tlatools/src/util/BufferedDataOutputStream.java
rename to tlatools/org.lamport.tlatools/src/util/BufferedDataOutputStream.java
diff --git a/tlatools/src/util/ByteArrayInputStream.java b/tlatools/org.lamport.tlatools/src/util/ByteArrayInputStream.java
similarity index 100%
rename from tlatools/src/util/ByteArrayInputStream.java
rename to tlatools/org.lamport.tlatools/src/util/ByteArrayInputStream.java
diff --git a/tlatools/src/util/DebugPrinter.java b/tlatools/org.lamport.tlatools/src/util/DebugPrinter.java
similarity index 100%
rename from tlatools/src/util/DebugPrinter.java
rename to tlatools/org.lamport.tlatools/src/util/DebugPrinter.java
diff --git a/tlatools/src/util/ExecutionStatisticsCollector.java b/tlatools/org.lamport.tlatools/src/util/ExecutionStatisticsCollector.java
similarity index 100%
rename from tlatools/src/util/ExecutionStatisticsCollector.java
rename to tlatools/org.lamport.tlatools/src/util/ExecutionStatisticsCollector.java
diff --git a/tlatools/src/util/ExecutionStatisticsCollector.md b/tlatools/org.lamport.tlatools/src/util/ExecutionStatisticsCollector.md
similarity index 100%
rename from tlatools/src/util/ExecutionStatisticsCollector.md
rename to tlatools/org.lamport.tlatools/src/util/ExecutionStatisticsCollector.md
diff --git a/tlatools/src/util/FileUtil.java b/tlatools/org.lamport.tlatools/src/util/FileUtil.java
similarity index 100%
rename from tlatools/src/util/FileUtil.java
rename to tlatools/org.lamport.tlatools/src/util/FileUtil.java
diff --git a/tlatools/src/util/FilenameToStream.java b/tlatools/org.lamport.tlatools/src/util/FilenameToStream.java
similarity index 100%
rename from tlatools/src/util/FilenameToStream.java
rename to tlatools/org.lamport.tlatools/src/util/FilenameToStream.java
diff --git a/tlatools/src/util/IDataInputStream.java b/tlatools/org.lamport.tlatools/src/util/IDataInputStream.java
similarity index 100%
rename from tlatools/src/util/IDataInputStream.java
rename to tlatools/org.lamport.tlatools/src/util/IDataInputStream.java
diff --git a/tlatools/src/util/IDataOutputStream.java b/tlatools/org.lamport.tlatools/src/util/IDataOutputStream.java
similarity index 100%
rename from tlatools/src/util/IDataOutputStream.java
rename to tlatools/org.lamport.tlatools/src/util/IDataOutputStream.java
diff --git a/tlatools/src/util/InternTable.java b/tlatools/org.lamport.tlatools/src/util/InternTable.java
similarity index 100%
rename from tlatools/src/util/InternTable.java
rename to tlatools/org.lamport.tlatools/src/util/InternTable.java
diff --git a/tlatools/src/util/MailSender.java b/tlatools/org.lamport.tlatools/src/util/MailSender.java
similarity index 100%
rename from tlatools/src/util/MailSender.java
rename to tlatools/org.lamport.tlatools/src/util/MailSender.java
diff --git a/tlatools/src/util/NamedInputStream.java b/tlatools/org.lamport.tlatools/src/util/NamedInputStream.java
similarity index 100%
rename from tlatools/src/util/NamedInputStream.java
rename to tlatools/org.lamport.tlatools/src/util/NamedInputStream.java
diff --git a/tlatools/src/util/Set.java b/tlatools/org.lamport.tlatools/src/util/Set.java
similarity index 100%
rename from tlatools/src/util/Set.java
rename to tlatools/org.lamport.tlatools/src/util/Set.java
diff --git a/tlatools/src/util/SimpleFilenameToStream.java b/tlatools/org.lamport.tlatools/src/util/SimpleFilenameToStream.java
similarity index 100%
rename from tlatools/src/util/SimpleFilenameToStream.java
rename to tlatools/org.lamport.tlatools/src/util/SimpleFilenameToStream.java
diff --git a/tlatools/src/util/StringHelper.java b/tlatools/org.lamport.tlatools/src/util/StringHelper.java
similarity index 100%
rename from tlatools/src/util/StringHelper.java
rename to tlatools/org.lamport.tlatools/src/util/StringHelper.java
diff --git a/tlatools/src/util/TLAConstants.java b/tlatools/org.lamport.tlatools/src/util/TLAConstants.java
similarity index 100%
rename from tlatools/src/util/TLAConstants.java
rename to tlatools/org.lamport.tlatools/src/util/TLAConstants.java
diff --git a/tlatools/src/util/TLAFlightRecorder.java b/tlatools/org.lamport.tlatools/src/util/TLAFlightRecorder.java
similarity index 100%
rename from tlatools/src/util/TLAFlightRecorder.java
rename to tlatools/org.lamport.tlatools/src/util/TLAFlightRecorder.java
diff --git a/tlatools/src/util/TLCRuntime.java b/tlatools/org.lamport.tlatools/src/util/TLCRuntime.java
similarity index 100%
rename from tlatools/src/util/TLCRuntime.java
rename to tlatools/org.lamport.tlatools/src/util/TLCRuntime.java
diff --git a/tlatools/src/util/ToolIO.java b/tlatools/org.lamport.tlatools/src/util/ToolIO.java
similarity index 100%
rename from tlatools/src/util/ToolIO.java
rename to tlatools/org.lamport.tlatools/src/util/ToolIO.java
diff --git a/tlatools/src/util/UniqueString.java b/tlatools/org.lamport.tlatools/src/util/UniqueString.java
similarity index 100%
rename from tlatools/src/util/UniqueString.java
rename to tlatools/org.lamport.tlatools/src/util/UniqueString.java
diff --git a/tlatools/src/util/UsageGenerator.java b/tlatools/org.lamport.tlatools/src/util/UsageGenerator.java
similarity index 100%
rename from tlatools/src/util/UsageGenerator.java
rename to tlatools/org.lamport.tlatools/src/util/UsageGenerator.java
diff --git a/tlatools/src/util/WrongInvocationException.java b/tlatools/org.lamport.tlatools/src/util/WrongInvocationException.java
similarity index 100%
rename from tlatools/src/util/WrongInvocationException.java
rename to tlatools/org.lamport.tlatools/src/util/WrongInvocationException.java
diff --git a/tlatools/test-benchmark/ModuleOverwrites.java b/tlatools/org.lamport.tlatools/test-benchmark/ModuleOverwrites.java
similarity index 100%
rename from tlatools/test-benchmark/ModuleOverwrites.java
rename to tlatools/org.lamport.tlatools/test-benchmark/ModuleOverwrites.java
diff --git a/tlatools/test-benchmark/README.txt b/tlatools/org.lamport.tlatools/test-benchmark/README.txt
similarity index 100%
rename from tlatools/test-benchmark/README.txt
rename to tlatools/org.lamport.tlatools/test-benchmark/README.txt
diff --git a/tlatools/test-benchmark/heapstats.jfc b/tlatools/org.lamport.tlatools/test-benchmark/heapstats.jfc
similarity index 100%
rename from tlatools/test-benchmark/heapstats.jfc
rename to tlatools/org.lamport.tlatools/test-benchmark/heapstats.jfc
diff --git a/tlatools/test-benchmark/tlc2/tool/ModuleOverwrites-1531220029-80dc6de2b.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/ModuleOverwrites-1531220029-80dc6de2b.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/ModuleOverwrites-1531220029-80dc6de2b.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/ModuleOverwrites-1531220029-80dc6de2b.json
diff --git a/tlatools/test-benchmark/tlc2/tool/ModuleOverwritesBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/ModuleOverwritesBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/ModuleOverwritesBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/ModuleOverwritesBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark-1535138934-548ce71f5.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark-1535138934-548ce71f5.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark-1535138934-548ce71f5.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark-1535138934-548ce71f5.json
diff --git a/tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark-1540420474-5f451e67c.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark-1540420474-5f451e67c.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark-1540420474-5f451e67c.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark-1540420474-5f451e67c.json
diff --git a/tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/fp/LongArrayInitializeBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/tool/queue/DiskQueueBenachmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/queue/DiskQueueBenachmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/queue/DiskQueueBenachmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/queue/DiskQueueBenachmark.java
diff --git a/tlatools/test-benchmark/tlc2/tool/queue/StateQueueBenachmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/queue/StateQueueBenachmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/queue/StateQueueBenachmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/queue/StateQueueBenachmark.java
diff --git a/tlatools/test-benchmark/tlc2/tool/simulation/SimulatorBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/simulation/SimulatorBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/tool/simulation/SimulatorBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/tool/simulation/SimulatorBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/util/CombinatoricsBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/util/CombinatoricsBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/util/CombinatoricsBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/util/CombinatoricsBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/util/FP64Benchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/util/FP64Benchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/util/FP64Benchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/util/FP64Benchmark.java
diff --git a/tlatools/test-benchmark/tlc2/util/FlightRecorderProfiler.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/util/FlightRecorderProfiler.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/util/FlightRecorderProfiler.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/util/FlightRecorderProfiler.java
diff --git a/tlatools/test-benchmark/tlc2/value/EnumerateSubsetBenchmark-1537381744-b7b00550b.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/EnumerateSubsetBenchmark-1537381744-b7b00550b.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/EnumerateSubsetBenchmark-1537381744-b7b00550b.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/EnumerateSubsetBenchmark-1537381744-b7b00550b.json
diff --git a/tlatools/test-benchmark/tlc2/value/Randomization-1530025487-ebb8802.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530025487-ebb8802.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/Randomization-1530025487-ebb8802.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530025487-ebb8802.json
diff --git a/tlatools/test-benchmark/tlc2/value/Randomization-1530034012-4a34ace.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530034012-4a34ace.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/Randomization-1530034012-4a34ace.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530034012-4a34ace.json
diff --git a/tlatools/test-benchmark/tlc2/value/Randomization-1530090015-39e5e3b02.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530090015-39e5e3b02.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/Randomization-1530090015-39e5e3b02.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530090015-39e5e3b02.json
diff --git a/tlatools/test-benchmark/tlc2/value/Randomization-1530276206-f9351808e.json b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530276206-f9351808e.json
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/Randomization-1530276206-f9351808e.json
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/Randomization-1530276206-f9351808e.json
diff --git a/tlatools/test-benchmark/tlc2/value/impl/EnumerateSubsetBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/EnumerateSubsetBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/impl/EnumerateSubsetBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/EnumerateSubsetBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/value/impl/IntervalValueBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/IntervalValueBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/impl/IntervalValueBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/IntervalValueBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/value/impl/RandomizationBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/RandomizationBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/impl/RandomizationBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/RandomizationBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/value/impl/SetEnumValueBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SetEnumValueBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/impl/SetEnumValueBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SetEnumValueBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/value/impl/SetOfFcnsBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SetOfFcnsBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/impl/SetOfFcnsBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SetOfFcnsBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/value/impl/SubsetBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SubsetBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/impl/SubsetBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SubsetBenchmark.java
diff --git a/tlatools/test-benchmark/tlc2/value/impl/SubsetValueBenchmark.java b/tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SubsetValueBenchmark.java
similarity index 100%
rename from tlatools/test-benchmark/tlc2/value/impl/SubsetValueBenchmark.java
rename to tlatools/org.lamport.tlatools/test-benchmark/tlc2/value/impl/SubsetValueBenchmark.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/ConcurrentWriteTest.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/ConcurrentWriteTest.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/ConcurrentWriteTest.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/ConcurrentWriteTest.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedFPSetTest.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedFPSetTest.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedFPSetTest.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedFPSetTest.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedLSBDiskFPSetTest.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedLSBDiskFPSetTest.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedLSBDiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedLSBDiskFPSetTest.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedMSBDiskFPSetTest.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedMSBDiskFPSetTest.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedMSBDiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedMSBDiskFPSetTest.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedOffHeapDiskFPSetTest.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedOffHeapDiskFPSetTest.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedOffHeapDiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/MultiThreadedOffHeapDiskFPSetTest.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/generator/BatchedFingerPrintGenerator.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/BatchedFingerPrintGenerator.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/generator/BatchedFingerPrintGenerator.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/BatchedFingerPrintGenerator.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/generator/FingerPrintGenerator.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/FingerPrintGenerator.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/generator/FingerPrintGenerator.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/FingerPrintGenerator.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/generator/LongVecFingerPrintGenerator.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/LongVecFingerPrintGenerator.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/generator/LongVecFingerPrintGenerator.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/LongVecFingerPrintGenerator.java
diff --git a/tlatools/test-concurrent/tlc2/tool/fp/generator/PartitionedFingerPrintGenerator.java b/tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/PartitionedFingerPrintGenerator.java
similarity index 100%
rename from tlatools/test-concurrent/tlc2/tool/fp/generator/PartitionedFingerPrintGenerator.java
rename to tlatools/org.lamport.tlatools/test-concurrent/tlc2/tool/fp/generator/PartitionedFingerPrintGenerator.java
diff --git a/tlatools/test-long/tlc2/tool/fp/DiskFPSetTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/DiskFPSetTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/fp/DiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/DiskFPSetTest.java
diff --git a/tlatools/test-long/tlc2/tool/fp/FPSetTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/FPSetTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/fp/FPSetTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/FPSetTest.java
diff --git a/tlatools/test-long/tlc2/tool/fp/MSBDiskFPSetTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/MSBDiskFPSetTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/fp/MSBDiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/MSBDiskFPSetTest.java
diff --git a/tlatools/test-long/tlc2/tool/fp/OffHeapDiskFPSetLongTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/OffHeapDiskFPSetLongTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/fp/OffHeapDiskFPSetLongTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/fp/OffHeapDiskFPSetLongTest.java
diff --git a/tlatools/test-long/tlc2/tool/liveness/MultiThreadedSpecTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/liveness/MultiThreadedSpecTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/liveness/MultiThreadedSpecTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/liveness/MultiThreadedSpecTest.java
diff --git a/tlatools/test-long/tlc2/tool/liveness/NoTableauSpecTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/liveness/NoTableauSpecTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/liveness/NoTableauSpecTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/liveness/NoTableauSpecTest.java
diff --git a/tlatools/test-long/tlc2/tool/liveness/TableauSpecTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/liveness/TableauSpecTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/liveness/TableauSpecTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/liveness/TableauSpecTest.java
diff --git a/tlatools/test-long/tlc2/tool/queue/DiskStateQueueTest.java b/tlatools/org.lamport.tlatools/test-long/tlc2/tool/queue/DiskStateQueueTest.java
similarity index 100%
rename from tlatools/test-long/tlc2/tool/queue/DiskStateQueueTest.java
rename to tlatools/org.lamport.tlatools/test-long/tlc2/tool/queue/DiskStateQueueTest.java
diff --git a/tlatools/test-model/.gitattributes b/tlatools/org.lamport.tlatools/test-model/.gitattributes
similarity index 100%
rename from tlatools/test-model/.gitattributes
rename to tlatools/org.lamport.tlatools/test-model/.gitattributes
diff --git a/tlatools/test-model/.gitignore b/tlatools/org.lamport.tlatools/test-model/.gitignore
similarity index 100%
rename from tlatools/test-model/.gitignore
rename to tlatools/org.lamport.tlatools/test-model/.gitignore
diff --git a/tlatools/test-model/AS/AS.cfg b/tlatools/org.lamport.tlatools/test-model/AS/AS.cfg
similarity index 100%
rename from tlatools/test-model/AS/AS.cfg
rename to tlatools/org.lamport.tlatools/test-model/AS/AS.cfg
diff --git a/tlatools/test-model/AS/AS.tla b/tlatools/org.lamport.tlatools/test-model/AS/AS.tla
similarity index 100%
rename from tlatools/test-model/AS/AS.tla
rename to tlatools/org.lamport.tlatools/test-model/AS/AS.tla
diff --git a/tlatools/test-model/AssertExpressionStack.cfg b/tlatools/org.lamport.tlatools/test-model/AssertExpressionStack.cfg
similarity index 100%
rename from tlatools/test-model/AssertExpressionStack.cfg
rename to tlatools/org.lamport.tlatools/test-model/AssertExpressionStack.cfg
diff --git a/tlatools/test-model/AssertExpressionStack.tla b/tlatools/org.lamport.tlatools/test-model/AssertExpressionStack.tla
similarity index 100%
rename from tlatools/test-model/AssertExpressionStack.tla
rename to tlatools/org.lamport.tlatools/test-model/AssertExpressionStack.tla
diff --git a/tlatools/test-model/AssignmentInit.cfg b/tlatools/org.lamport.tlatools/test-model/AssignmentInit.cfg
similarity index 100%
rename from tlatools/test-model/AssignmentInit.cfg
rename to tlatools/org.lamport.tlatools/test-model/AssignmentInit.cfg
diff --git a/tlatools/test-model/AssignmentInit.tla b/tlatools/org.lamport.tlatools/test-model/AssignmentInit.tla
similarity index 100%
rename from tlatools/test-model/AssignmentInit.tla
rename to tlatools/org.lamport.tlatools/test-model/AssignmentInit.tla
diff --git a/tlatools/test-model/AssignmentInitExpensive.cfg b/tlatools/org.lamport.tlatools/test-model/AssignmentInitExpensive.cfg
similarity index 100%
rename from tlatools/test-model/AssignmentInitExpensive.cfg
rename to tlatools/org.lamport.tlatools/test-model/AssignmentInitExpensive.cfg
diff --git a/tlatools/test-model/AssignmentInitExpensive.tla b/tlatools/org.lamport.tlatools/test-model/AssignmentInitExpensive.tla
similarity index 100%
rename from tlatools/test-model/AssignmentInitExpensive.tla
rename to tlatools/org.lamport.tlatools/test-model/AssignmentInitExpensive.tla
diff --git a/tlatools/test-model/AssignmentInitNeg.cfg b/tlatools/org.lamport.tlatools/test-model/AssignmentInitNeg.cfg
similarity index 100%
rename from tlatools/test-model/AssignmentInitNeg.cfg
rename to tlatools/org.lamport.tlatools/test-model/AssignmentInitNeg.cfg
diff --git a/tlatools/test-model/AssignmentInitNeg.tla b/tlatools/org.lamport.tlatools/test-model/AssignmentInitNeg.tla
similarity index 100%
rename from tlatools/test-model/AssignmentInitNeg.tla
rename to tlatools/org.lamport.tlatools/test-model/AssignmentInitNeg.tla
diff --git a/tlatools/test-model/AssignmentNext.cfg b/tlatools/org.lamport.tlatools/test-model/AssignmentNext.cfg
similarity index 100%
rename from tlatools/test-model/AssignmentNext.cfg
rename to tlatools/org.lamport.tlatools/test-model/AssignmentNext.cfg
diff --git a/tlatools/test-model/AssignmentNext.tla b/tlatools/org.lamport.tlatools/test-model/AssignmentNext.tla
similarity index 100%
rename from tlatools/test-model/AssignmentNext.tla
rename to tlatools/org.lamport.tlatools/test-model/AssignmentNext.tla
diff --git a/tlatools/test-model/AssignmentNext2.cfg b/tlatools/org.lamport.tlatools/test-model/AssignmentNext2.cfg
similarity index 100%
rename from tlatools/test-model/AssignmentNext2.cfg
rename to tlatools/org.lamport.tlatools/test-model/AssignmentNext2.cfg
diff --git a/tlatools/test-model/AssignmentNext2.tla b/tlatools/org.lamport.tlatools/test-model/AssignmentNext2.tla
similarity index 100%
rename from tlatools/test-model/AssignmentNext2.tla
rename to tlatools/org.lamport.tlatools/test-model/AssignmentNext2.tla
diff --git a/tlatools/test-model/AssignmentNext3.cfg b/tlatools/org.lamport.tlatools/test-model/AssignmentNext3.cfg
similarity index 100%
rename from tlatools/test-model/AssignmentNext3.cfg
rename to tlatools/org.lamport.tlatools/test-model/AssignmentNext3.cfg
diff --git a/tlatools/test-model/AssignmentNext3.tla b/tlatools/org.lamport.tlatools/test-model/AssignmentNext3.tla
similarity index 100%
rename from tlatools/test-model/AssignmentNext3.tla
rename to tlatools/org.lamport.tlatools/test-model/AssignmentNext3.tla
diff --git a/tlatools/test-model/BagsTest.cfg b/tlatools/org.lamport.tlatools/test-model/BagsTest.cfg
similarity index 100%
rename from tlatools/test-model/BagsTest.cfg
rename to tlatools/org.lamport.tlatools/test-model/BagsTest.cfg
diff --git a/tlatools/test-model/BagsTest.tla b/tlatools/org.lamport.tlatools/test-model/BagsTest.tla
similarity index 100%
rename from tlatools/test-model/BagsTest.tla
rename to tlatools/org.lamport.tlatools/test-model/BagsTest.tla
diff --git a/tlatools/test-model/BidirectionalTransitions.tla b/tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions.tla
similarity index 100%
rename from tlatools/test-model/BidirectionalTransitions.tla
rename to tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions.tla
diff --git a/tlatools/test-model/BidirectionalTransitions1.cfg b/tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions1.cfg
similarity index 100%
rename from tlatools/test-model/BidirectionalTransitions1.cfg
rename to tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions1.cfg
diff --git a/tlatools/test-model/BidirectionalTransitions1Bx.cfg b/tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions1Bx.cfg
similarity index 100%
rename from tlatools/test-model/BidirectionalTransitions1Bx.cfg
rename to tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions1Bx.cfg
diff --git a/tlatools/test-model/BidirectionalTransitions1By.cfg b/tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions1By.cfg
similarity index 100%
rename from tlatools/test-model/BidirectionalTransitions1By.cfg
rename to tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions1By.cfg
diff --git a/tlatools/test-model/BidirectionalTransitions2.cfg b/tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions2.cfg
similarity index 100%
rename from tlatools/test-model/BidirectionalTransitions2.cfg
rename to tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions2.cfg
diff --git a/tlatools/test-model/BidirectionalTransitions2Cx.cfg b/tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions2Cx.cfg
similarity index 100%
rename from tlatools/test-model/BidirectionalTransitions2Cx.cfg
rename to tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions2Cx.cfg
diff --git a/tlatools/test-model/BidirectionalTransitions2Cy.cfg b/tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions2Cy.cfg
similarity index 100%
rename from tlatools/test-model/BidirectionalTransitions2Cy.cfg
rename to tlatools/org.lamport.tlatools/test-model/BidirectionalTransitions2Cy.cfg
diff --git a/tlatools/test-model/Bug156/FindOp.tla b/tlatools/org.lamport.tlatools/test-model/Bug156/FindOp.tla
similarity index 100%
rename from tlatools/test-model/Bug156/FindOp.tla
rename to tlatools/org.lamport.tlatools/test-model/Bug156/FindOp.tla
diff --git a/tlatools/test-model/Bug156/TE.cfg b/tlatools/org.lamport.tlatools/test-model/Bug156/TE.cfg
similarity index 100%
rename from tlatools/test-model/Bug156/TE.cfg
rename to tlatools/org.lamport.tlatools/test-model/Bug156/TE.cfg
diff --git a/tlatools/test-model/Bug156/TE.tla b/tlatools/org.lamport.tlatools/test-model/Bug156/TE.tla
similarity index 100%
rename from tlatools/test-model/Bug156/TE.tla
rename to tlatools/org.lamport.tlatools/test-model/Bug156/TE.tla
diff --git a/tlatools/test-model/Bug279/InitStateBug.cfg b/tlatools/org.lamport.tlatools/test-model/Bug279/InitStateBug.cfg
similarity index 100%
rename from tlatools/test-model/Bug279/InitStateBug.cfg
rename to tlatools/org.lamport.tlatools/test-model/Bug279/InitStateBug.cfg
diff --git a/tlatools/test-model/Bug279/InitStateBug.tla b/tlatools/org.lamport.tlatools/test-model/Bug279/InitStateBug.tla
similarity index 100%
rename from tlatools/test-model/Bug279/InitStateBug.tla
rename to tlatools/org.lamport.tlatools/test-model/Bug279/InitStateBug.tla
diff --git a/tlatools/test-model/CallGotoUnlabeledTest.tla b/tlatools/org.lamport.tlatools/test-model/CallGotoUnlabeledTest.tla
similarity index 100%
rename from tlatools/test-model/CallGotoUnlabeledTest.tla
rename to tlatools/org.lamport.tlatools/test-model/CallGotoUnlabeledTest.tla
diff --git a/tlatools/test-model/CodePlexBug08/AgentRing.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/AgentRing.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/AgentRing.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/AgentRing.tla
diff --git a/tlatools/test-model/CodePlexBug08/AgentRingMC.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/AgentRingMC.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/AgentRingMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/AgentRingMC.cfg
diff --git a/tlatools/test-model/CodePlexBug08/AgentRingMC.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/AgentRingMC.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/AgentRingMC.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/AgentRingMC.tla
diff --git a/tlatools/test-model/CodePlexBug08/CodeplexBug8.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/CodeplexBug8.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/CodeplexBug8.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/CodeplexBug8.tla
diff --git a/tlatools/test-model/CodePlexBug08/EWD840.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840.tla
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC1.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC1.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC1.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC1.cfg
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC1.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC1.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC1.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC1.tla
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC2.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC2.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC2.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC2.cfg
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC2.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC2.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC2.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC2.tla
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC3.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC3.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC3.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC3.cfg
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC3.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC3.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC3.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC3.tla
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC4.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC4.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC4.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC4.cfg
diff --git a/tlatools/test-model/CodePlexBug08/EWD840MC4.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC4.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/EWD840MC4.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/EWD840MC4.tla
diff --git a/tlatools/test-model/CodePlexBug08/InlineMC.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/InlineMC.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/InlineMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/InlineMC.cfg
diff --git a/tlatools/test-model/CodePlexBug08/InlineMC.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/InlineMC.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/InlineMC.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/InlineMC.tla
diff --git a/tlatools/test-model/CodePlexBug08/MC.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MC.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MC.cfg
diff --git a/tlatools/test-model/CodePlexBug08/MC.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MC.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MC.tla
diff --git a/tlatools/test-model/CodePlexBug08/MCa.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MCa.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/MCa.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MCa.cfg
diff --git a/tlatools/test-model/CodePlexBug08/MCa.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MCa.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/MCa.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/MCa.tla
diff --git a/tlatools/test-model/CodePlexBug08/checkpoint.zip b/tlatools/org.lamport.tlatools/test-model/CodePlexBug08/checkpoint.zip
similarity index 100%
rename from tlatools/test-model/CodePlexBug08/checkpoint.zip
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug08/checkpoint.zip
diff --git a/tlatools/test-model/CodePlexBug21.cfg b/tlatools/org.lamport.tlatools/test-model/CodePlexBug21.cfg
similarity index 100%
rename from tlatools/test-model/CodePlexBug21.cfg
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug21.cfg
diff --git a/tlatools/test-model/CodePlexBug21.tla b/tlatools/org.lamport.tlatools/test-model/CodePlexBug21.tla
similarity index 100%
rename from tlatools/test-model/CodePlexBug21.tla
rename to tlatools/org.lamport.tlatools/test-model/CodePlexBug21.tla
diff --git a/tlatools/test-model/Continue.cfg b/tlatools/org.lamport.tlatools/test-model/Continue.cfg
similarity index 100%
rename from tlatools/test-model/Continue.cfg
rename to tlatools/org.lamport.tlatools/test-model/Continue.cfg
diff --git a/tlatools/test-model/Continue.tla b/tlatools/org.lamport.tlatools/test-model/Continue.tla
similarity index 100%
rename from tlatools/test-model/Continue.tla
rename to tlatools/org.lamport.tlatools/test-model/Continue.tla
diff --git a/tlatools/test-model/DepthFirstErrorTrace.cfg b/tlatools/org.lamport.tlatools/test-model/DepthFirstErrorTrace.cfg
similarity index 100%
rename from tlatools/test-model/DepthFirstErrorTrace.cfg
rename to tlatools/org.lamport.tlatools/test-model/DepthFirstErrorTrace.cfg
diff --git a/tlatools/test-model/DepthFirstErrorTrace.tla b/tlatools/org.lamport.tlatools/test-model/DepthFirstErrorTrace.tla
similarity index 100%
rename from tlatools/test-model/DepthFirstErrorTrace.tla
rename to tlatools/org.lamport.tlatools/test-model/DepthFirstErrorTrace.tla
diff --git a/tlatools/test-model/DepthFirstTerminate.cfg b/tlatools/org.lamport.tlatools/test-model/DepthFirstTerminate.cfg
similarity index 100%
rename from tlatools/test-model/DepthFirstTerminate.cfg
rename to tlatools/org.lamport.tlatools/test-model/DepthFirstTerminate.cfg
diff --git a/tlatools/test-model/DepthFirstTerminate.tla b/tlatools/org.lamport.tlatools/test-model/DepthFirstTerminate.tla
similarity index 100%
rename from tlatools/test-model/DepthFirstTerminate.tla
rename to tlatools/org.lamport.tlatools/test-model/DepthFirstTerminate.tla
diff --git a/tlatools/test-model/DieHard.cfg b/tlatools/org.lamport.tlatools/test-model/DieHard.cfg
similarity index 100%
rename from tlatools/test-model/DieHard.cfg
rename to tlatools/org.lamport.tlatools/test-model/DieHard.cfg
diff --git a/tlatools/test-model/DieHard.tla b/tlatools/org.lamport.tlatools/test-model/DieHard.tla
similarity index 100%
rename from tlatools/test-model/DieHard.tla
rename to tlatools/org.lamport.tlatools/test-model/DieHard.tla
diff --git a/tlatools/test-model/DieHardTLA.cfg b/tlatools/org.lamport.tlatools/test-model/DieHardTLA.cfg
similarity index 100%
rename from tlatools/test-model/DieHardTLA.cfg
rename to tlatools/org.lamport.tlatools/test-model/DieHardTLA.cfg
diff --git a/tlatools/test-model/DieHardTLA.tla b/tlatools/org.lamport.tlatools/test-model/DieHardTLA.tla
similarity index 100%
rename from tlatools/test-model/DieHardTLA.tla
rename to tlatools/org.lamport.tlatools/test-model/DieHardTLA.tla
diff --git a/tlatools/test-model/DistributedTrace.cfg b/tlatools/org.lamport.tlatools/test-model/DistributedTrace.cfg
similarity index 100%
rename from tlatools/test-model/DistributedTrace.cfg
rename to tlatools/org.lamport.tlatools/test-model/DistributedTrace.cfg
diff --git a/tlatools/test-model/DistributedTrace.tla b/tlatools/org.lamport.tlatools/test-model/DistributedTrace.tla
similarity index 100%
rename from tlatools/test-model/DistributedTrace.tla
rename to tlatools/org.lamport.tlatools/test-model/DistributedTrace.tla
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.cfg b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.cfg
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.cfg
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.cfg
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.tla b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.tla
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.tla
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorEvalException.tla
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.cfg b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.cfg
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.cfg
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.cfg
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.tla b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.tla
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.tla
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariant.tla
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.cfg b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.cfg
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.cfg
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.cfg
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.tla b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.tla
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.tla
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorInvariantContinue.tla
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.cfg b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.cfg
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.cfg
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.cfg
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.tla b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.tla
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.tla
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorMinimalErrorStack.tla
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.cfg b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.cfg
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.cfg
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.cfg
diff --git a/tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.tla b/tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.tla
similarity index 100%
rename from tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.tla
rename to tlatools/org.lamport.tlatools/test-model/DoInitFunctor/DoInitFunctorProperty.tla
diff --git a/tlatools/test-model/EWD840/EWD840.tla b/tlatools/org.lamport.tlatools/test-model/EWD840/EWD840.tla
similarity index 100%
rename from tlatools/test-model/EWD840/EWD840.tla
rename to tlatools/org.lamport.tlatools/test-model/EWD840/EWD840.tla
diff --git a/tlatools/test-model/EWD840/MC.cfg b/tlatools/org.lamport.tlatools/test-model/EWD840/MC.cfg
similarity index 100%
rename from tlatools/test-model/EWD840/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/EWD840/MC.cfg
diff --git a/tlatools/test-model/EWD840/MC.tla b/tlatools/org.lamport.tlatools/test-model/EWD840/MC.tla
similarity index 100%
rename from tlatools/test-model/EWD840/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/EWD840/MC.tla
diff --git a/tlatools/test-model/EWD840/MC06.cfg b/tlatools/org.lamport.tlatools/test-model/EWD840/MC06.cfg
similarity index 100%
rename from tlatools/test-model/EWD840/MC06.cfg
rename to tlatools/org.lamport.tlatools/test-model/EWD840/MC06.cfg
diff --git a/tlatools/test-model/EWD840/MC06.tla b/tlatools/org.lamport.tlatools/test-model/EWD840/MC06.tla
similarity index 100%
rename from tlatools/test-model/EWD840/MC06.tla
rename to tlatools/org.lamport.tlatools/test-model/EWD840/MC06.tla
diff --git a/tlatools/test-model/Empty.cfg b/tlatools/org.lamport.tlatools/test-model/Empty.cfg
similarity index 100%
rename from tlatools/test-model/Empty.cfg
rename to tlatools/org.lamport.tlatools/test-model/Empty.cfg
diff --git a/tlatools/test-model/Empty.tla b/tlatools/org.lamport.tlatools/test-model/Empty.tla
similarity index 100%
rename from tlatools/test-model/Empty.tla
rename to tlatools/org.lamport.tlatools/test-model/Empty.tla
diff --git a/tlatools/test-model/EmptyOrderOfSolutions.cfg b/tlatools/org.lamport.tlatools/test-model/EmptyOrderOfSolutions.cfg
similarity index 100%
rename from tlatools/test-model/EmptyOrderOfSolutions.cfg
rename to tlatools/org.lamport.tlatools/test-model/EmptyOrderOfSolutions.cfg
diff --git a/tlatools/test-model/EmptyOrderOfSolutions.tla b/tlatools/org.lamport.tlatools/test-model/EmptyOrderOfSolutions.tla
similarity index 100%
rename from tlatools/test-model/EmptyOrderOfSolutions.tla
rename to tlatools/org.lamport.tlatools/test-model/EmptyOrderOfSolutions.tla
diff --git a/tlatools/test-model/EmptySubsetEq.cfg b/tlatools/org.lamport.tlatools/test-model/EmptySubsetEq.cfg
similarity index 100%
rename from tlatools/test-model/EmptySubsetEq.cfg
rename to tlatools/org.lamport.tlatools/test-model/EmptySubsetEq.cfg
diff --git a/tlatools/test-model/EmptySubsetEq.tla b/tlatools/org.lamport.tlatools/test-model/EmptySubsetEq.tla
similarity index 100%
rename from tlatools/test-model/EmptySubsetEq.tla
rename to tlatools/org.lamport.tlatools/test-model/EmptySubsetEq.tla
diff --git a/tlatools/test-model/EvalOrder/Base.tla b/tlatools/org.lamport.tlatools/test-model/EvalOrder/Base.tla
similarity index 100%
rename from tlatools/test-model/EvalOrder/Base.tla
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/Base.tla
diff --git a/tlatools/test-model/EvalOrder/InitEvalOrder.tla b/tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder.tla
similarity index 100%
rename from tlatools/test-model/EvalOrder/InitEvalOrder.tla
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder.tla
diff --git a/tlatools/test-model/EvalOrder/InitEvalOrder1.cfg b/tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder1.cfg
similarity index 100%
rename from tlatools/test-model/EvalOrder/InitEvalOrder1.cfg
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder1.cfg
diff --git a/tlatools/test-model/EvalOrder/InitEvalOrder2.cfg b/tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder2.cfg
similarity index 100%
rename from tlatools/test-model/EvalOrder/InitEvalOrder2.cfg
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder2.cfg
diff --git a/tlatools/test-model/EvalOrder/InitEvalOrder3.cfg b/tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder3.cfg
similarity index 100%
rename from tlatools/test-model/EvalOrder/InitEvalOrder3.cfg
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder3.cfg
diff --git a/tlatools/test-model/EvalOrder/InitEvalOrder4.cfg b/tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder4.cfg
similarity index 100%
rename from tlatools/test-model/EvalOrder/InitEvalOrder4.cfg
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrder4.cfg
diff --git a/tlatools/test-model/EvalOrder/InitEvalOrderBasic.cfg b/tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrderBasic.cfg
similarity index 100%
rename from tlatools/test-model/EvalOrder/InitEvalOrderBasic.cfg
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrderBasic.cfg
diff --git a/tlatools/test-model/EvalOrder/InitEvalOrderBasic.tla b/tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrderBasic.tla
similarity index 100%
rename from tlatools/test-model/EvalOrder/InitEvalOrderBasic.tla
rename to tlatools/org.lamport.tlatools/test-model/EvalOrder/InitEvalOrderBasic.tla
diff --git a/tlatools/test-model/FingerprintExceptionInit.cfg b/tlatools/org.lamport.tlatools/test-model/FingerprintExceptionInit.cfg
similarity index 100%
rename from tlatools/test-model/FingerprintExceptionInit.cfg
rename to tlatools/org.lamport.tlatools/test-model/FingerprintExceptionInit.cfg
diff --git a/tlatools/test-model/FingerprintExceptionInit.tla b/tlatools/org.lamport.tlatools/test-model/FingerprintExceptionInit.tla
similarity index 100%
rename from tlatools/test-model/FingerprintExceptionInit.tla
rename to tlatools/org.lamport.tlatools/test-model/FingerprintExceptionInit.tla
diff --git a/tlatools/test-model/FingerprintExceptionNext.cfg b/tlatools/org.lamport.tlatools/test-model/FingerprintExceptionNext.cfg
similarity index 100%
rename from tlatools/test-model/FingerprintExceptionNext.cfg
rename to tlatools/org.lamport.tlatools/test-model/FingerprintExceptionNext.cfg
diff --git a/tlatools/test-model/FingerprintExceptionNext.tla b/tlatools/org.lamport.tlatools/test-model/FingerprintExceptionNext.tla
similarity index 100%
rename from tlatools/test-model/FingerprintExceptionNext.tla
rename to tlatools/org.lamport.tlatools/test-model/FingerprintExceptionNext.tla
diff --git a/tlatools/test-model/Github179a.cfg b/tlatools/org.lamport.tlatools/test-model/Github179a.cfg
similarity index 100%
rename from tlatools/test-model/Github179a.cfg
rename to tlatools/org.lamport.tlatools/test-model/Github179a.cfg
diff --git a/tlatools/test-model/Github179a.tla b/tlatools/org.lamport.tlatools/test-model/Github179a.tla
similarity index 100%
rename from tlatools/test-model/Github179a.tla
rename to tlatools/org.lamport.tlatools/test-model/Github179a.tla
diff --git a/tlatools/test-model/Github179b.cfg b/tlatools/org.lamport.tlatools/test-model/Github179b.cfg
similarity index 100%
rename from tlatools/test-model/Github179b.cfg
rename to tlatools/org.lamport.tlatools/test-model/Github179b.cfg
diff --git a/tlatools/test-model/Github179b.tla b/tlatools/org.lamport.tlatools/test-model/Github179b.tla
similarity index 100%
rename from tlatools/test-model/Github179b.tla
rename to tlatools/org.lamport.tlatools/test-model/Github179b.tla
diff --git a/tlatools/test-model/Github179c.cfg b/tlatools/org.lamport.tlatools/test-model/Github179c.cfg
similarity index 100%
rename from tlatools/test-model/Github179c.cfg
rename to tlatools/org.lamport.tlatools/test-model/Github179c.cfg
diff --git a/tlatools/test-model/Github179c.tla b/tlatools/org.lamport.tlatools/test-model/Github179c.tla
similarity index 100%
rename from tlatools/test-model/Github179c.tla
rename to tlatools/org.lamport.tlatools/test-model/Github179c.tla
diff --git a/tlatools/test-model/Github361.cfg b/tlatools/org.lamport.tlatools/test-model/Github361.cfg
similarity index 100%
rename from tlatools/test-model/Github361.cfg
rename to tlatools/org.lamport.tlatools/test-model/Github361.cfg
diff --git a/tlatools/test-model/Github361.tla b/tlatools/org.lamport.tlatools/test-model/Github361.tla
similarity index 100%
rename from tlatools/test-model/Github361.tla
rename to tlatools/org.lamport.tlatools/test-model/Github361.tla
diff --git a/tlatools/test-model/Github391.cfg b/tlatools/org.lamport.tlatools/test-model/Github391.cfg
similarity index 100%
rename from tlatools/test-model/Github391.cfg
rename to tlatools/org.lamport.tlatools/test-model/Github391.cfg
diff --git a/tlatools/test-model/Github391.tla b/tlatools/org.lamport.tlatools/test-model/Github391.tla
similarity index 100%
rename from tlatools/test-model/Github391.tla
rename to tlatools/org.lamport.tlatools/test-model/Github391.tla
diff --git a/tlatools/test-model/Github407.cfg b/tlatools/org.lamport.tlatools/test-model/Github407.cfg
similarity index 100%
rename from tlatools/test-model/Github407.cfg
rename to tlatools/org.lamport.tlatools/test-model/Github407.cfg
diff --git a/tlatools/test-model/Github407.tla b/tlatools/org.lamport.tlatools/test-model/Github407.tla
similarity index 100%
rename from tlatools/test-model/Github407.tla
rename to tlatools/org.lamport.tlatools/test-model/Github407.tla
diff --git a/tlatools/test-model/Github429.tla b/tlatools/org.lamport.tlatools/test-model/Github429.tla
similarity index 100%
rename from tlatools/test-model/Github429.tla
rename to tlatools/org.lamport.tlatools/test-model/Github429.tla
diff --git a/tlatools/test-model/Github432.cfg b/tlatools/org.lamport.tlatools/test-model/Github432.cfg
similarity index 100%
rename from tlatools/test-model/Github432.cfg
rename to tlatools/org.lamport.tlatools/test-model/Github432.cfg
diff --git a/tlatools/test-model/Github432.tla b/tlatools/org.lamport.tlatools/test-model/Github432.tla
similarity index 100%
rename from tlatools/test-model/Github432.tla
rename to tlatools/org.lamport.tlatools/test-model/Github432.tla
diff --git a/tlatools/test-model/IllegalOperatorTest.tla b/tlatools/org.lamport.tlatools/test-model/IllegalOperatorTest.tla
similarity index 100%
rename from tlatools/test-model/IllegalOperatorTest.tla
rename to tlatools/org.lamport.tlatools/test-model/IllegalOperatorTest.tla
diff --git a/tlatools/test-model/IncompleteNext.cfg b/tlatools/org.lamport.tlatools/test-model/IncompleteNext.cfg
similarity index 100%
rename from tlatools/test-model/IncompleteNext.cfg
rename to tlatools/org.lamport.tlatools/test-model/IncompleteNext.cfg
diff --git a/tlatools/test-model/IncompleteNext.tla b/tlatools/org.lamport.tlatools/test-model/IncompleteNext.tla
similarity index 100%
rename from tlatools/test-model/IncompleteNext.tla
rename to tlatools/org.lamport.tlatools/test-model/IncompleteNext.tla
diff --git a/tlatools/test-model/IncompleteNextMultipleActions.cfg b/tlatools/org.lamport.tlatools/test-model/IncompleteNextMultipleActions.cfg
similarity index 100%
rename from tlatools/test-model/IncompleteNextMultipleActions.cfg
rename to tlatools/org.lamport.tlatools/test-model/IncompleteNextMultipleActions.cfg
diff --git a/tlatools/test-model/IncompleteNextMultipleActions.tla b/tlatools/org.lamport.tlatools/test-model/IncompleteNextMultipleActions.tla
similarity index 100%
rename from tlatools/test-model/IncompleteNextMultipleActions.tla
rename to tlatools/org.lamport.tlatools/test-model/IncompleteNextMultipleActions.tla
diff --git a/tlatools/test-model/LivenessConstraintWarning.cfg b/tlatools/org.lamport.tlatools/test-model/LivenessConstraintWarning.cfg
similarity index 100%
rename from tlatools/test-model/LivenessConstraintWarning.cfg
rename to tlatools/org.lamport.tlatools/test-model/LivenessConstraintWarning.cfg
diff --git a/tlatools/test-model/LivenessConstraintWarning.tla b/tlatools/org.lamport.tlatools/test-model/LivenessConstraintWarning.tla
similarity index 100%
rename from tlatools/test-model/LivenessConstraintWarning.tla
rename to tlatools/org.lamport.tlatools/test-model/LivenessConstraintWarning.tla
diff --git a/tlatools/test-model/Loop/SystemLoop.cfg b/tlatools/org.lamport.tlatools/test-model/Loop/SystemLoop.cfg
similarity index 100%
rename from tlatools/test-model/Loop/SystemLoop.cfg
rename to tlatools/org.lamport.tlatools/test-model/Loop/SystemLoop.cfg
diff --git a/tlatools/test-model/Loop/SystemLoop.tla b/tlatools/org.lamport.tlatools/test-model/Loop/SystemLoop.tla
similarity index 100%
rename from tlatools/test-model/Loop/SystemLoop.tla
rename to tlatools/org.lamport.tlatools/test-model/Loop/SystemLoop.tla
diff --git a/tlatools/test-model/Loop/SystemLoopWeakFair.cfg b/tlatools/org.lamport.tlatools/test-model/Loop/SystemLoopWeakFair.cfg
similarity index 100%
rename from tlatools/test-model/Loop/SystemLoopWeakFair.cfg
rename to tlatools/org.lamport.tlatools/test-model/Loop/SystemLoopWeakFair.cfg
diff --git a/tlatools/test-model/MinimalSetOfInitStates.cfg b/tlatools/org.lamport.tlatools/test-model/MinimalSetOfInitStates.cfg
similarity index 100%
rename from tlatools/test-model/MinimalSetOfInitStates.cfg
rename to tlatools/org.lamport.tlatools/test-model/MinimalSetOfInitStates.cfg
diff --git a/tlatools/test-model/MinimalSetOfInitStates.tla b/tlatools/org.lamport.tlatools/test-model/MinimalSetOfInitStates.tla
similarity index 100%
rename from tlatools/test-model/MinimalSetOfInitStates.tla
rename to tlatools/org.lamport.tlatools/test-model/MinimalSetOfInitStates.tla
diff --git a/tlatools/test-model/MinimalSetOfNextStates.cfg b/tlatools/org.lamport.tlatools/test-model/MinimalSetOfNextStates.cfg
similarity index 100%
rename from tlatools/test-model/MinimalSetOfNextStates.cfg
rename to tlatools/org.lamport.tlatools/test-model/MinimalSetOfNextStates.cfg
diff --git a/tlatools/test-model/MinimalSetOfNextStates.tla b/tlatools/org.lamport.tlatools/test-model/MinimalSetOfNextStates.tla
similarity index 100%
rename from tlatools/test-model/MinimalSetOfNextStates.tla
rename to tlatools/org.lamport.tlatools/test-model/MinimalSetOfNextStates.tla
diff --git a/tlatools/test-model/MinimumDiameter.cfg b/tlatools/org.lamport.tlatools/test-model/MinimumDiameter.cfg
similarity index 100%
rename from tlatools/test-model/MinimumDiameter.cfg
rename to tlatools/org.lamport.tlatools/test-model/MinimumDiameter.cfg
diff --git a/tlatools/test-model/MinimumDiameter.tla b/tlatools/org.lamport.tlatools/test-model/MinimumDiameter.tla
similarity index 100%
rename from tlatools/test-model/MinimumDiameter.tla
rename to tlatools/org.lamport.tlatools/test-model/MinimumDiameter.tla
diff --git a/tlatools/test-model/MissingBodyInWhile.tla b/tlatools/org.lamport.tlatools/test-model/MissingBodyInWhile.tla
similarity index 100%
rename from tlatools/test-model/MissingBodyInWhile.tla
rename to tlatools/org.lamport.tlatools/test-model/MissingBodyInWhile.tla
diff --git a/tlatools/test-model/MissingBodyInWith.tla b/tlatools/org.lamport.tlatools/test-model/MissingBodyInWith.tla
similarity index 100%
rename from tlatools/test-model/MissingBodyInWith.tla
rename to tlatools/org.lamport.tlatools/test-model/MissingBodyInWith.tla
diff --git a/tlatools/test-model/ModuleOverwrites/ModuleOverwrites.cfg b/tlatools/org.lamport.tlatools/test-model/ModuleOverwrites/ModuleOverwrites.cfg
similarity index 100%
rename from tlatools/test-model/ModuleOverwrites/ModuleOverwrites.cfg
rename to tlatools/org.lamport.tlatools/test-model/ModuleOverwrites/ModuleOverwrites.cfg
diff --git a/tlatools/test-model/ModuleOverwrites/ModuleOverwrites.tla b/tlatools/org.lamport.tlatools/test-model/ModuleOverwrites/ModuleOverwrites.tla
similarity index 100%
rename from tlatools/test-model/ModuleOverwrites/ModuleOverwrites.tla
rename to tlatools/org.lamport.tlatools/test-model/ModuleOverwrites/ModuleOverwrites.tla
diff --git a/tlatools/test-model/PlusCalOptions.cfg b/tlatools/org.lamport.tlatools/test-model/PlusCalOptions.cfg
similarity index 100%
rename from tlatools/test-model/PlusCalOptions.cfg
rename to tlatools/org.lamport.tlatools/test-model/PlusCalOptions.cfg
diff --git a/tlatools/test-model/PlusCalOptions.tla b/tlatools/org.lamport.tlatools/test-model/PlusCalOptions.tla
similarity index 100%
rename from tlatools/test-model/PlusCalOptions.tla
rename to tlatools/org.lamport.tlatools/test-model/PlusCalOptions.tla
diff --git a/tlatools/test-model/PrintTraceRace/MC.cfg b/tlatools/org.lamport.tlatools/test-model/PrintTraceRace/MC.cfg
similarity index 100%
rename from tlatools/test-model/PrintTraceRace/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/PrintTraceRace/MC.cfg
diff --git a/tlatools/test-model/PrintTraceRace/MC.tla b/tlatools/org.lamport.tlatools/test-model/PrintTraceRace/MC.tla
similarity index 100%
rename from tlatools/test-model/PrintTraceRace/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/PrintTraceRace/MC.tla
diff --git a/tlatools/test-model/PrintTraceRace/PrintTraceRace.tla b/tlatools/org.lamport.tlatools/test-model/PrintTraceRace/PrintTraceRace.tla
similarity index 100%
rename from tlatools/test-model/PrintTraceRace/PrintTraceRace.tla
rename to tlatools/org.lamport.tlatools/test-model/PrintTraceRace/PrintTraceRace.tla
diff --git a/tlatools/test-model/RandomElement.cfg b/tlatools/org.lamport.tlatools/test-model/RandomElement.cfg
similarity index 100%
rename from tlatools/test-model/RandomElement.cfg
rename to tlatools/org.lamport.tlatools/test-model/RandomElement.cfg
diff --git a/tlatools/test-model/RandomElement.tla b/tlatools/org.lamport.tlatools/test-model/RandomElement.tla
similarity index 100%
rename from tlatools/test-model/RandomElement.tla
rename to tlatools/org.lamport.tlatools/test-model/RandomElement.tla
diff --git a/tlatools/test-model/RandomElementXandY.cfg b/tlatools/org.lamport.tlatools/test-model/RandomElementXandY.cfg
similarity index 100%
rename from tlatools/test-model/RandomElementXandY.cfg
rename to tlatools/org.lamport.tlatools/test-model/RandomElementXandY.cfg
diff --git a/tlatools/test-model/RandomElementXandY.tla b/tlatools/org.lamport.tlatools/test-model/RandomElementXandY.tla
similarity index 100%
rename from tlatools/test-model/RandomElementXandY.tla
rename to tlatools/org.lamport.tlatools/test-model/RandomElementXandY.tla
diff --git a/tlatools/test-model/RandomSubset.cfg b/tlatools/org.lamport.tlatools/test-model/RandomSubset.cfg
similarity index 100%
rename from tlatools/test-model/RandomSubset.cfg
rename to tlatools/org.lamport.tlatools/test-model/RandomSubset.cfg
diff --git a/tlatools/test-model/RandomSubset.tla b/tlatools/org.lamport.tlatools/test-model/RandomSubset.tla
similarity index 100%
rename from tlatools/test-model/RandomSubset.tla
rename to tlatools/org.lamport.tlatools/test-model/RandomSubset.tla
diff --git a/tlatools/test-model/RandomSubsetNext.cfg b/tlatools/org.lamport.tlatools/test-model/RandomSubsetNext.cfg
similarity index 100%
rename from tlatools/test-model/RandomSubsetNext.cfg
rename to tlatools/org.lamport.tlatools/test-model/RandomSubsetNext.cfg
diff --git a/tlatools/test-model/RandomSubsetNext.tla b/tlatools/org.lamport.tlatools/test-model/RandomSubsetNext.tla
similarity index 100%
rename from tlatools/test-model/RandomSubsetNext.tla
rename to tlatools/org.lamport.tlatools/test-model/RandomSubsetNext.tla
diff --git a/tlatools/test-model/RandomSubsetSetOfFcns.cfg b/tlatools/org.lamport.tlatools/test-model/RandomSubsetSetOfFcns.cfg
similarity index 100%
rename from tlatools/test-model/RandomSubsetSetOfFcns.cfg
rename to tlatools/org.lamport.tlatools/test-model/RandomSubsetSetOfFcns.cfg
diff --git a/tlatools/test-model/RandomSubsetSetOfFcns.tla b/tlatools/org.lamport.tlatools/test-model/RandomSubsetSetOfFcns.tla
similarity index 100%
rename from tlatools/test-model/RandomSubsetSetOfFcns.tla
rename to tlatools/org.lamport.tlatools/test-model/RandomSubsetSetOfFcns.tla
diff --git a/tlatools/test-model/SetPredValue.cfg b/tlatools/org.lamport.tlatools/test-model/SetPredValue.cfg
similarity index 100%
rename from tlatools/test-model/SetPredValue.cfg
rename to tlatools/org.lamport.tlatools/test-model/SetPredValue.cfg
diff --git a/tlatools/test-model/SetPredValue.tla b/tlatools/org.lamport.tlatools/test-model/SetPredValue.tla
similarity index 100%
rename from tlatools/test-model/SetPredValue.tla
rename to tlatools/org.lamport.tlatools/test-model/SetPredValue.tla
diff --git a/tlatools/test-model/StandardModules.cfg b/tlatools/org.lamport.tlatools/test-model/StandardModules.cfg
similarity index 100%
rename from tlatools/test-model/StandardModules.cfg
rename to tlatools/org.lamport.tlatools/test-model/StandardModules.cfg
diff --git a/tlatools/test-model/StandardModules.tla b/tlatools/org.lamport.tlatools/test-model/StandardModules.tla
similarity index 100%
rename from tlatools/test-model/StandardModules.tla
rename to tlatools/org.lamport.tlatools/test-model/StandardModules.tla
diff --git a/tlatools/test-model/SubsetEq.cfg b/tlatools/org.lamport.tlatools/test-model/SubsetEq.cfg
similarity index 100%
rename from tlatools/test-model/SubsetEq.cfg
rename to tlatools/org.lamport.tlatools/test-model/SubsetEq.cfg
diff --git a/tlatools/test-model/SubsetEq.tla b/tlatools/org.lamport.tlatools/test-model/SubsetEq.tla
similarity index 100%
rename from tlatools/test-model/SubsetEq.tla
rename to tlatools/org.lamport.tlatools/test-model/SubsetEq.tla
diff --git a/tlatools/test-model/TLCGetLevel.cfg b/tlatools/org.lamport.tlatools/test-model/TLCGetLevel.cfg
similarity index 100%
rename from tlatools/test-model/TLCGetLevel.cfg
rename to tlatools/org.lamport.tlatools/test-model/TLCGetLevel.cfg
diff --git a/tlatools/test-model/TLCGetLevel.tla b/tlatools/org.lamport.tlatools/test-model/TLCGetLevel.tla
similarity index 100%
rename from tlatools/test-model/TLCGetLevel.tla
rename to tlatools/org.lamport.tlatools/test-model/TLCGetLevel.tla
diff --git a/tlatools/test-model/TLCGetNamedUndefined.cfg b/tlatools/org.lamport.tlatools/test-model/TLCGetNamedUndefined.cfg
similarity index 100%
rename from tlatools/test-model/TLCGetNamedUndefined.cfg
rename to tlatools/org.lamport.tlatools/test-model/TLCGetNamedUndefined.cfg
diff --git a/tlatools/test-model/TLCGetNamedUndefined.tla b/tlatools/org.lamport.tlatools/test-model/TLCGetNamedUndefined.tla
similarity index 100%
rename from tlatools/test-model/TLCGetNamedUndefined.tla
rename to tlatools/org.lamport.tlatools/test-model/TLCGetNamedUndefined.tla
diff --git a/tlatools/test-model/TLCGetNonDeterminism.cfg b/tlatools/org.lamport.tlatools/test-model/TLCGetNonDeterminism.cfg
similarity index 100%
rename from tlatools/test-model/TLCGetNonDeterminism.cfg
rename to tlatools/org.lamport.tlatools/test-model/TLCGetNonDeterminism.cfg
diff --git a/tlatools/test-model/TLCGetNonDeterminism.tla b/tlatools/org.lamport.tlatools/test-model/TLCGetNonDeterminism.tla
similarity index 100%
rename from tlatools/test-model/TLCGetNonDeterminism.tla
rename to tlatools/org.lamport.tlatools/test-model/TLCGetNonDeterminism.tla
diff --git a/tlatools/test-model/TLCSet.cfg b/tlatools/org.lamport.tlatools/test-model/TLCSet.cfg
similarity index 100%
rename from tlatools/test-model/TLCSet.cfg
rename to tlatools/org.lamport.tlatools/test-model/TLCSet.cfg
diff --git a/tlatools/test-model/TLCSet.tla b/tlatools/org.lamport.tlatools/test-model/TLCSet.tla
similarity index 100%
rename from tlatools/test-model/TLCSet.tla
rename to tlatools/org.lamport.tlatools/test-model/TLCSet.tla
diff --git a/tlatools/test-model/TLCSetInit.cfg b/tlatools/org.lamport.tlatools/test-model/TLCSetInit.cfg
similarity index 100%
rename from tlatools/test-model/TLCSetInit.cfg
rename to tlatools/org.lamport.tlatools/test-model/TLCSetInit.cfg
diff --git a/tlatools/test-model/TLCSetInit.tla b/tlatools/org.lamport.tlatools/test-model/TLCSetInit.tla
similarity index 100%
rename from tlatools/test-model/TLCSetInit.tla
rename to tlatools/org.lamport.tlatools/test-model/TLCSetInit.tla
diff --git a/tlatools/test-model/TSnapShot/MC.cfg b/tlatools/org.lamport.tlatools/test-model/TSnapShot/MC.cfg
similarity index 100%
rename from tlatools/test-model/TSnapShot/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/TSnapShot/MC.cfg
diff --git a/tlatools/test-model/TSnapShot/MC.tla b/tlatools/org.lamport.tlatools/test-model/TSnapShot/MC.tla
similarity index 100%
rename from tlatools/test-model/TSnapShot/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/TSnapShot/MC.tla
diff --git a/tlatools/test-model/TSnapShot/TSnapShot.tla b/tlatools/org.lamport.tlatools/test-model/TSnapShot/TSnapShot.tla
similarity index 100%
rename from tlatools/test-model/TSnapShot/TSnapShot.tla
rename to tlatools/org.lamport.tlatools/test-model/TSnapShot/TSnapShot.tla
diff --git a/tlatools/test-model/Test2.cfg b/tlatools/org.lamport.tlatools/test-model/Test2.cfg
similarity index 100%
rename from tlatools/test-model/Test2.cfg
rename to tlatools/org.lamport.tlatools/test-model/Test2.cfg
diff --git a/tlatools/test-model/Test2.tla b/tlatools/org.lamport.tlatools/test-model/Test2.tla
similarity index 100%
rename from tlatools/test-model/Test2.tla
rename to tlatools/org.lamport.tlatools/test-model/Test2.tla
diff --git a/tlatools/test-model/Test2a.cfg b/tlatools/org.lamport.tlatools/test-model/Test2a.cfg
similarity index 100%
rename from tlatools/test-model/Test2a.cfg
rename to tlatools/org.lamport.tlatools/test-model/Test2a.cfg
diff --git a/tlatools/test-model/Test2a.tla b/tlatools/org.lamport.tlatools/test-model/Test2a.tla
similarity index 100%
rename from tlatools/test-model/Test2a.tla
rename to tlatools/org.lamport.tlatools/test-model/Test2a.tla
diff --git a/tlatools/test-model/Test3.cfg b/tlatools/org.lamport.tlatools/test-model/Test3.cfg
similarity index 100%
rename from tlatools/test-model/Test3.cfg
rename to tlatools/org.lamport.tlatools/test-model/Test3.cfg
diff --git a/tlatools/test-model/Test3.tla b/tlatools/org.lamport.tlatools/test-model/Test3.tla
similarity index 100%
rename from tlatools/test-model/Test3.tla
rename to tlatools/org.lamport.tlatools/test-model/Test3.tla
diff --git a/tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.cfg b/tlatools/org.lamport.tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.cfg
similarity index 100%
rename from tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.cfg
rename to tlatools/org.lamport.tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.cfg
diff --git a/tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.tla b/tlatools/org.lamport.tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.tla
similarity index 100%
rename from tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.tla
rename to tlatools/org.lamport.tlatools/test-model/TraceWithLargeSetOfInitialStatesTest.tla
diff --git a/tlatools/test-model/UserModuleOverride.cfg b/tlatools/org.lamport.tlatools/test-model/UserModuleOverride.cfg
similarity index 100%
rename from tlatools/test-model/UserModuleOverride.cfg
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverride.cfg
diff --git a/tlatools/test-model/UserModuleOverride.class b/tlatools/org.lamport.tlatools/test-model/UserModuleOverride.class
similarity index 100%
rename from tlatools/test-model/UserModuleOverride.class
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverride.class
diff --git a/tlatools/test-model/UserModuleOverride.java b/tlatools/org.lamport.tlatools/test-model/UserModuleOverride.java
similarity index 100%
rename from tlatools/test-model/UserModuleOverride.java
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverride.java
diff --git a/tlatools/test-model/UserModuleOverride.tla b/tlatools/org.lamport.tlatools/test-model/UserModuleOverride.tla
similarity index 100%
rename from tlatools/test-model/UserModuleOverride.tla
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverride.tla
diff --git a/tlatools/test-model/UserModuleOverrideAnnotation.cfg b/tlatools/org.lamport.tlatools/test-model/UserModuleOverrideAnnotation.cfg
similarity index 100%
rename from tlatools/test-model/UserModuleOverrideAnnotation.cfg
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverrideAnnotation.cfg
diff --git a/tlatools/test-model/UserModuleOverrideAnnotation.tla b/tlatools/org.lamport.tlatools/test-model/UserModuleOverrideAnnotation.tla
similarity index 100%
rename from tlatools/test-model/UserModuleOverrideAnnotation.tla
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverrideAnnotation.tla
diff --git a/tlatools/test-model/UserModuleOverrideBase.cfg b/tlatools/org.lamport.tlatools/test-model/UserModuleOverrideBase.cfg
similarity index 100%
rename from tlatools/test-model/UserModuleOverrideBase.cfg
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverrideBase.cfg
diff --git a/tlatools/test-model/UserModuleOverrideBase.tla b/tlatools/org.lamport.tlatools/test-model/UserModuleOverrideBase.tla
similarity index 100%
rename from tlatools/test-model/UserModuleOverrideBase.tla
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverrideBase.tla
diff --git a/tlatools/test-model/UserModuleOverrideFromJar.jar b/tlatools/org.lamport.tlatools/test-model/UserModuleOverrideFromJar.jar
similarity index 100%
rename from tlatools/test-model/UserModuleOverrideFromJar.jar
rename to tlatools/org.lamport.tlatools/test-model/UserModuleOverrideFromJar.jar
diff --git a/tlatools/test-model/ViewMap.cfg b/tlatools/org.lamport.tlatools/test-model/ViewMap.cfg
similarity index 100%
rename from tlatools/test-model/ViewMap.cfg
rename to tlatools/org.lamport.tlatools/test-model/ViewMap.cfg
diff --git a/tlatools/test-model/ViewMap.tla b/tlatools/org.lamport.tlatools/test-model/ViewMap.tla
similarity index 100%
rename from tlatools/test-model/ViewMap.tla
rename to tlatools/org.lamport.tlatools/test-model/ViewMap.tla
diff --git a/tlatools/test-model/VoteProof/Consensus.tla b/tlatools/org.lamport.tlatools/test-model/VoteProof/Consensus.tla
similarity index 100%
rename from tlatools/test-model/VoteProof/Consensus.tla
rename to tlatools/org.lamport.tlatools/test-model/VoteProof/Consensus.tla
diff --git a/tlatools/test-model/VoteProof/FiniteSets.tla b/tlatools/org.lamport.tlatools/test-model/VoteProof/FiniteSets.tla
similarity index 100%
rename from tlatools/test-model/VoteProof/FiniteSets.tla
rename to tlatools/org.lamport.tlatools/test-model/VoteProof/FiniteSets.tla
diff --git a/tlatools/test-model/VoteProof/MC.cfg b/tlatools/org.lamport.tlatools/test-model/VoteProof/MC.cfg
similarity index 100%
rename from tlatools/test-model/VoteProof/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/VoteProof/MC.cfg
diff --git a/tlatools/test-model/VoteProof/MC.tla b/tlatools/org.lamport.tlatools/test-model/VoteProof/MC.tla
similarity index 100%
rename from tlatools/test-model/VoteProof/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/VoteProof/MC.tla
diff --git a/tlatools/test-model/VoteProof/TLAPS.tla b/tlatools/org.lamport.tlatools/test-model/VoteProof/TLAPS.tla
similarity index 100%
rename from tlatools/test-model/VoteProof/TLAPS.tla
rename to tlatools/org.lamport.tlatools/test-model/VoteProof/TLAPS.tla
diff --git a/tlatools/test-model/VoteProof/VoteProof.tla b/tlatools/org.lamport.tlatools/test-model/VoteProof/VoteProof.tla
similarity index 100%
rename from tlatools/test-model/VoteProof/VoteProof.tla
rename to tlatools/org.lamport.tlatools/test-model/VoteProof/VoteProof.tla
diff --git a/tlatools/test-model/checkpoint/InfiniteStateSpace.cfg b/tlatools/org.lamport.tlatools/test-model/checkpoint/InfiniteStateSpace.cfg
similarity index 100%
rename from tlatools/test-model/checkpoint/InfiniteStateSpace.cfg
rename to tlatools/org.lamport.tlatools/test-model/checkpoint/InfiniteStateSpace.cfg
diff --git a/tlatools/test-model/checkpoint/InfiniteStateSpace.tla b/tlatools/org.lamport.tlatools/test-model/checkpoint/InfiniteStateSpace.tla
similarity index 100%
rename from tlatools/test-model/checkpoint/InfiniteStateSpace.tla
rename to tlatools/org.lamport.tlatools/test-model/checkpoint/InfiniteStateSpace.tla
diff --git a/tlatools/test-model/coverage/A.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/A.cfg
similarity index 100%
rename from tlatools/test-model/coverage/A.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/A.cfg
diff --git a/tlatools/test-model/coverage/A.tla b/tlatools/org.lamport.tlatools/test-model/coverage/A.tla
similarity index 100%
rename from tlatools/test-model/coverage/A.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/A.tla
diff --git a/tlatools/test-model/coverage/B.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/B.cfg
similarity index 100%
rename from tlatools/test-model/coverage/B.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/B.cfg
diff --git a/tlatools/test-model/coverage/B.tla b/tlatools/org.lamport.tlatools/test-model/coverage/B.tla
similarity index 100%
rename from tlatools/test-model/coverage/B.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/B.tla
diff --git a/tlatools/test-model/coverage/C.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/C.cfg
similarity index 100%
rename from tlatools/test-model/coverage/C.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/C.cfg
diff --git a/tlatools/test-model/coverage/C.tla b/tlatools/org.lamport.tlatools/test-model/coverage/C.tla
similarity index 100%
rename from tlatools/test-model/coverage/C.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/C.tla
diff --git a/tlatools/test-model/coverage/CoverageStatistics.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/CoverageStatistics.cfg
similarity index 100%
rename from tlatools/test-model/coverage/CoverageStatistics.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/CoverageStatistics.cfg
diff --git a/tlatools/test-model/coverage/CoverageStatistics.tla b/tlatools/org.lamport.tlatools/test-model/coverage/CoverageStatistics.tla
similarity index 100%
rename from tlatools/test-model/coverage/CoverageStatistics.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/CoverageStatistics.tla
diff --git a/tlatools/test-model/coverage/D.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/D.cfg
similarity index 100%
rename from tlatools/test-model/coverage/D.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/D.cfg
diff --git a/tlatools/test-model/coverage/D.tla b/tlatools/org.lamport.tlatools/test-model/coverage/D.tla
similarity index 100%
rename from tlatools/test-model/coverage/D.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/D.tla
diff --git a/tlatools/test-model/coverage/E.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/E.cfg
similarity index 100%
rename from tlatools/test-model/coverage/E.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/E.cfg
diff --git a/tlatools/test-model/coverage/E.tla b/tlatools/org.lamport.tlatools/test-model/coverage/E.tla
similarity index 100%
rename from tlatools/test-model/coverage/E.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/E.tla
diff --git a/tlatools/test-model/coverage/F.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/F.cfg
similarity index 100%
rename from tlatools/test-model/coverage/F.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/F.cfg
diff --git a/tlatools/test-model/coverage/F.tla b/tlatools/org.lamport.tlatools/test-model/coverage/F.tla
similarity index 100%
rename from tlatools/test-model/coverage/F.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/F.tla
diff --git a/tlatools/test-model/coverage/G.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/G.cfg
similarity index 100%
rename from tlatools/test-model/coverage/G.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/G.cfg
diff --git a/tlatools/test-model/coverage/G.tla b/tlatools/org.lamport.tlatools/test-model/coverage/G.tla
similarity index 100%
rename from tlatools/test-model/coverage/G.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/G.tla
diff --git a/tlatools/test-model/coverage/Github314.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/Github314.cfg
similarity index 100%
rename from tlatools/test-model/coverage/Github314.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/Github314.cfg
diff --git a/tlatools/test-model/coverage/Github314.tla b/tlatools/org.lamport.tlatools/test-model/coverage/Github314.tla
similarity index 100%
rename from tlatools/test-model/coverage/Github314.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/Github314.tla
diff --git a/tlatools/test-model/coverage/Github377.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/Github377.cfg
similarity index 100%
rename from tlatools/test-model/coverage/Github377.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/Github377.cfg
diff --git a/tlatools/test-model/coverage/Github377.tla b/tlatools/org.lamport.tlatools/test-model/coverage/Github377.tla
similarity index 100%
rename from tlatools/test-model/coverage/Github377.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/Github377.tla
diff --git a/tlatools/test-model/coverage/H.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/H.cfg
similarity index 100%
rename from tlatools/test-model/coverage/H.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/H.cfg
diff --git a/tlatools/test-model/coverage/H.tla b/tlatools/org.lamport.tlatools/test-model/coverage/H.tla
similarity index 100%
rename from tlatools/test-model/coverage/H.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/H.tla
diff --git a/tlatools/test-model/coverage/I.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/I.cfg
similarity index 100%
rename from tlatools/test-model/coverage/I.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/I.cfg
diff --git a/tlatools/test-model/coverage/I.tla b/tlatools/org.lamport.tlatools/test-model/coverage/I.tla
similarity index 100%
rename from tlatools/test-model/coverage/I.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/I.tla
diff --git a/tlatools/test-model/coverage/J.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/J.cfg
similarity index 100%
rename from tlatools/test-model/coverage/J.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/J.cfg
diff --git a/tlatools/test-model/coverage/J.tla b/tlatools/org.lamport.tlatools/test-model/coverage/J.tla
similarity index 100%
rename from tlatools/test-model/coverage/J.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/J.tla
diff --git a/tlatools/test-model/coverage/K.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/K.cfg
similarity index 100%
rename from tlatools/test-model/coverage/K.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/K.cfg
diff --git a/tlatools/test-model/coverage/K.tla b/tlatools/org.lamport.tlatools/test-model/coverage/K.tla
similarity index 100%
rename from tlatools/test-model/coverage/K.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/K.tla
diff --git a/tlatools/test-model/coverage/L.cfg b/tlatools/org.lamport.tlatools/test-model/coverage/L.cfg
similarity index 100%
rename from tlatools/test-model/coverage/L.cfg
rename to tlatools/org.lamport.tlatools/test-model/coverage/L.cfg
diff --git a/tlatools/test-model/coverage/L.tla b/tlatools/org.lamport.tlatools/test-model/coverage/L.tla
similarity index 100%
rename from tlatools/test-model/coverage/L.tla
rename to tlatools/org.lamport.tlatools/test-model/coverage/L.tla
diff --git a/tlatools/test-model/pcal/.gitignore b/tlatools/org.lamport.tlatools/test-model/pcal/.gitignore
similarity index 100%
rename from tlatools/test-model/pcal/.gitignore
rename to tlatools/org.lamport.tlatools/test-model/pcal/.gitignore
diff --git a/tlatools/test-model/pcal/Bakery.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Bakery.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Bakery.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Bakery.cfg
diff --git a/tlatools/test-model/pcal/Bakery.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Bakery.tla
similarity index 100%
rename from tlatools/test-model/pcal/Bakery.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Bakery.tla
diff --git a/tlatools/test-model/pcal/CBakery.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/CBakery.cfg
similarity index 100%
rename from tlatools/test-model/pcal/CBakery.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/CBakery.cfg
diff --git a/tlatools/test-model/pcal/CBakery.tla b/tlatools/org.lamport.tlatools/test-model/pcal/CBakery.tla
similarity index 100%
rename from tlatools/test-model/pcal/CBakery.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/CBakery.tla
diff --git a/tlatools/test-model/pcal/CCallReturn1.tla b/tlatools/org.lamport.tlatools/test-model/pcal/CCallReturn1.tla
similarity index 100%
rename from tlatools/test-model/pcal/CCallReturn1.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/CCallReturn1.tla
diff --git a/tlatools/test-model/pcal/CDiningPhilosophers.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/CDiningPhilosophers.cfg
similarity index 100%
rename from tlatools/test-model/pcal/CDiningPhilosophers.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/CDiningPhilosophers.cfg
diff --git a/tlatools/test-model/pcal/CDiningPhilosophers.tla b/tlatools/org.lamport.tlatools/test-model/pcal/CDiningPhilosophers.tla
similarity index 100%
rename from tlatools/test-model/pcal/CDiningPhilosophers.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/CDiningPhilosophers.tla
diff --git a/tlatools/test-model/pcal/CEither1.tla b/tlatools/org.lamport.tlatools/test-model/pcal/CEither1.tla
similarity index 100%
rename from tlatools/test-model/pcal/CEither1.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/CEither1.tla
diff --git a/tlatools/test-model/pcal/CMultiprocDefine.tla b/tlatools/org.lamport.tlatools/test-model/pcal/CMultiprocDefine.tla
similarity index 100%
rename from tlatools/test-model/pcal/CMultiprocDefine.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/CMultiprocDefine.tla
diff --git a/tlatools/test-model/pcal/CallReturn1.tla b/tlatools/org.lamport.tlatools/test-model/pcal/CallReturn1.tla
similarity index 100%
rename from tlatools/test-model/pcal/CallReturn1.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/CallReturn1.tla
diff --git a/tlatools/test-model/pcal/CallReturn2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/CallReturn2.tla
similarity index 100%
rename from tlatools/test-model/pcal/CallReturn2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/CallReturn2.tla
diff --git a/tlatools/test-model/pcal/DetlefSpec.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/DetlefSpec.cfg
similarity index 100%
rename from tlatools/test-model/pcal/DetlefSpec.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/DetlefSpec.cfg
diff --git a/tlatools/test-model/pcal/DetlefSpec.tla b/tlatools/org.lamport.tlatools/test-model/pcal/DetlefSpec.tla
similarity index 100%
rename from tlatools/test-model/pcal/DetlefSpec.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/DetlefSpec.tla
diff --git a/tlatools/test-model/pcal/DetlefTest.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/DetlefTest.cfg
similarity index 100%
rename from tlatools/test-model/pcal/DetlefTest.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/DetlefTest.cfg
diff --git a/tlatools/test-model/pcal/DetlefTest.tla b/tlatools/org.lamport.tlatools/test-model/pcal/DetlefTest.tla
similarity index 100%
rename from tlatools/test-model/pcal/DetlefTest.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/DetlefTest.tla
diff --git a/tlatools/test-model/pcal/Detlefs.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Detlefs.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Detlefs.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Detlefs.cfg
diff --git a/tlatools/test-model/pcal/Detlefs.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Detlefs.tla
similarity index 100%
rename from tlatools/test-model/pcal/Detlefs.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Detlefs.tla
diff --git a/tlatools/test-model/pcal/Dijkstra1.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Dijkstra1.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Dijkstra1.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Dijkstra1.cfg
diff --git a/tlatools/test-model/pcal/Dijkstra1.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Dijkstra1.tla
similarity index 100%
rename from tlatools/test-model/pcal/Dijkstra1.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Dijkstra1.tla
diff --git a/tlatools/test-model/pcal/DiningPhilosophers.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/DiningPhilosophers.cfg
similarity index 100%
rename from tlatools/test-model/pcal/DiningPhilosophers.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/DiningPhilosophers.cfg
diff --git a/tlatools/test-model/pcal/DiningPhilosophers.tla b/tlatools/org.lamport.tlatools/test-model/pcal/DiningPhilosophers.tla
similarity index 100%
rename from tlatools/test-model/pcal/DiningPhilosophers.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/DiningPhilosophers.tla
diff --git a/tlatools/test-model/pcal/DiningPhilosophers2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/DiningPhilosophers2.tla
similarity index 100%
rename from tlatools/test-model/pcal/DiningPhilosophers2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/DiningPhilosophers2.tla
diff --git a/tlatools/test-model/pcal/Either1.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Either1.tla
similarity index 100%
rename from tlatools/test-model/pcal/Either1.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Either1.tla
diff --git a/tlatools/test-model/pcal/Either2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Either2.tla
similarity index 100%
rename from tlatools/test-model/pcal/Either2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Either2.tla
diff --git a/tlatools/test-model/pcal/Either3.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Either3.tla
similarity index 100%
rename from tlatools/test-model/pcal/Either3.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Either3.tla
diff --git a/tlatools/test-model/pcal/Either4.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Either4.tla
similarity index 100%
rename from tlatools/test-model/pcal/Either4.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Either4.tla
diff --git a/tlatools/test-model/pcal/Either5.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Either5.tla
similarity index 100%
rename from tlatools/test-model/pcal/Either5.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Either5.tla
diff --git a/tlatools/test-model/pcal/Euclid.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Euclid.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Euclid.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Euclid.cfg
diff --git a/tlatools/test-model/pcal/Euclid.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Euclid.tla
similarity index 100%
rename from tlatools/test-model/pcal/Euclid.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Euclid.tla
diff --git a/tlatools/test-model/pcal/Euclid2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Euclid2.tla
similarity index 100%
rename from tlatools/test-model/pcal/Euclid2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Euclid2.tla
diff --git a/tlatools/test-model/pcal/Euclid3.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Euclid3.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Euclid3.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Euclid3.cfg
diff --git a/tlatools/test-model/pcal/Euclid3.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Euclid3.tla
similarity index 100%
rename from tlatools/test-model/pcal/Euclid3.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Euclid3.tla
diff --git a/tlatools/test-model/pcal/EvenOdd.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/EvenOdd.cfg
similarity index 100%
rename from tlatools/test-model/pcal/EvenOdd.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/EvenOdd.cfg
diff --git a/tlatools/test-model/pcal/EvenOdd.tla b/tlatools/org.lamport.tlatools/test-model/pcal/EvenOdd.tla
similarity index 100%
rename from tlatools/test-model/pcal/EvenOdd.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/EvenOdd.tla
diff --git a/tlatools/test-model/pcal/EvenOddBad.tla b/tlatools/org.lamport.tlatools/test-model/pcal/EvenOddBad.tla
similarity index 100%
rename from tlatools/test-model/pcal/EvenOddBad.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/EvenOddBad.tla
diff --git a/tlatools/test-model/pcal/Factorial.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Factorial.tla
similarity index 100%
rename from tlatools/test-model/pcal/Factorial.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Factorial.tla
diff --git a/tlatools/test-model/pcal/Factorial2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Factorial2.tla
similarity index 100%
rename from tlatools/test-model/pcal/Factorial2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Factorial2.tla
diff --git a/tlatools/test-model/pcal/FairSeq.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/FairSeq.cfg
similarity index 100%
rename from tlatools/test-model/pcal/FairSeq.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/FairSeq.cfg
diff --git a/tlatools/test-model/pcal/FairSeq.tla b/tlatools/org.lamport.tlatools/test-model/pcal/FairSeq.tla
similarity index 100%
rename from tlatools/test-model/pcal/FairSeq.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/FairSeq.tla
diff --git a/tlatools/test-model/pcal/FairSeq2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/FairSeq2.tla
similarity index 100%
rename from tlatools/test-model/pcal/FairSeq2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/FairSeq2.tla
diff --git a/tlatools/test-model/pcal/FastMutex.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutex.cfg
similarity index 100%
rename from tlatools/test-model/pcal/FastMutex.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutex.cfg
diff --git a/tlatools/test-model/pcal/FastMutex.tla b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutex.tla
similarity index 100%
rename from tlatools/test-model/pcal/FastMutex.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutex.tla
diff --git a/tlatools/test-model/pcal/FastMutex2.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutex2.cfg
similarity index 100%
rename from tlatools/test-model/pcal/FastMutex2.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutex2.cfg
diff --git a/tlatools/test-model/pcal/FastMutex2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutex2.tla
similarity index 100%
rename from tlatools/test-model/pcal/FastMutex2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutex2.tla
diff --git a/tlatools/test-model/pcal/FastMutex3.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutex3.cfg
similarity index 100%
rename from tlatools/test-model/pcal/FastMutex3.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutex3.cfg
diff --git a/tlatools/test-model/pcal/FastMutex3.tla b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutex3.tla
similarity index 100%
rename from tlatools/test-model/pcal/FastMutex3.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutex3.tla
diff --git a/tlatools/test-model/pcal/FastMutexWithGoto.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto.cfg
similarity index 100%
rename from tlatools/test-model/pcal/FastMutexWithGoto.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto.cfg
diff --git a/tlatools/test-model/pcal/FastMutexWithGoto.tla b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto.tla
similarity index 100%
rename from tlatools/test-model/pcal/FastMutexWithGoto.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto.tla
diff --git a/tlatools/test-model/pcal/FastMutexWithGoto2.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto2.cfg
similarity index 100%
rename from tlatools/test-model/pcal/FastMutexWithGoto2.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto2.cfg
diff --git a/tlatools/test-model/pcal/FastMutexWithGoto2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto2.tla
similarity index 100%
rename from tlatools/test-model/pcal/FastMutexWithGoto2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/FastMutexWithGoto2.tla
diff --git a/tlatools/test-model/pcal/Fischer.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Fischer.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Fischer.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Fischer.cfg
diff --git a/tlatools/test-model/pcal/Fischer.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Fischer.tla
similarity index 100%
rename from tlatools/test-model/pcal/Fischer.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Fischer.tla
diff --git a/tlatools/test-model/pcal/InnerLabeledIf.tla b/tlatools/org.lamport.tlatools/test-model/pcal/InnerLabeledIf.tla
similarity index 100%
rename from tlatools/test-model/pcal/InnerLabeledIf.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/InnerLabeledIf.tla
diff --git a/tlatools/test-model/pcal/MPFactorial.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MPFactorial.tla
similarity index 100%
rename from tlatools/test-model/pcal/MPFactorial.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MPFactorial.tla
diff --git a/tlatools/test-model/pcal/MPFactorial2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MPFactorial2.tla
similarity index 100%
rename from tlatools/test-model/pcal/MPFactorial2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MPFactorial2.tla
diff --git a/tlatools/test-model/pcal/MPNoParams.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MPNoParams.tla
similarity index 100%
rename from tlatools/test-model/pcal/MPNoParams.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MPNoParams.tla
diff --git a/tlatools/test-model/pcal/MacroQuicksort.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/MacroQuicksort.cfg
similarity index 100%
rename from tlatools/test-model/pcal/MacroQuicksort.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/MacroQuicksort.cfg
diff --git a/tlatools/test-model/pcal/MacroQuicksort.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MacroQuicksort.tla
similarity index 100%
rename from tlatools/test-model/pcal/MacroQuicksort.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MacroQuicksort.tla
diff --git a/tlatools/test-model/pcal/MacroRealQuicksort.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/MacroRealQuicksort.cfg
similarity index 100%
rename from tlatools/test-model/pcal/MacroRealQuicksort.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/MacroRealQuicksort.cfg
diff --git a/tlatools/test-model/pcal/MacroRealQuicksort.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MacroRealQuicksort.tla
similarity index 100%
rename from tlatools/test-model/pcal/MacroRealQuicksort.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MacroRealQuicksort.tla
diff --git a/tlatools/test-model/pcal/MergeSort.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/MergeSort.cfg
similarity index 100%
rename from tlatools/test-model/pcal/MergeSort.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/MergeSort.cfg
diff --git a/tlatools/test-model/pcal/MergeSort.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MergeSort.tla
similarity index 100%
rename from tlatools/test-model/pcal/MergeSort.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MergeSort.tla
diff --git a/tlatools/test-model/pcal/MultiAssignment.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MultiAssignment.tla
similarity index 100%
rename from tlatools/test-model/pcal/MultiAssignment.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MultiAssignment.tla
diff --git a/tlatools/test-model/pcal/MultiProc2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MultiProc2.tla
similarity index 100%
rename from tlatools/test-model/pcal/MultiProc2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MultiProc2.tla
diff --git a/tlatools/test-model/pcal/MultiprocDefine.tla b/tlatools/org.lamport.tlatools/test-model/pcal/MultiprocDefine.tla
similarity index 100%
rename from tlatools/test-model/pcal/MultiprocDefine.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/MultiprocDefine.tla
diff --git a/tlatools/test-model/pcal/NestedMacros.tla b/tlatools/org.lamport.tlatools/test-model/pcal/NestedMacros.tla
similarity index 100%
rename from tlatools/test-model/pcal/NestedMacros.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/NestedMacros.tla
diff --git a/tlatools/test-model/pcal/NoLoop.tla b/tlatools/org.lamport.tlatools/test-model/pcal/NoLoop.tla
similarity index 100%
rename from tlatools/test-model/pcal/NoLoop.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/NoLoop.tla
diff --git a/tlatools/test-model/pcal/NoLoop2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/NoLoop2.tla
similarity index 100%
rename from tlatools/test-model/pcal/NoLoop2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/NoLoop2.tla
diff --git a/tlatools/test-model/pcal/NoParams.tla b/tlatools/org.lamport.tlatools/test-model/pcal/NoParams.tla
similarity index 100%
rename from tlatools/test-model/pcal/NoParams.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/NoParams.tla
diff --git a/tlatools/test-model/pcal/NotSoSimpleLoop.tla b/tlatools/org.lamport.tlatools/test-model/pcal/NotSoSimpleLoop.tla
similarity index 100%
rename from tlatools/test-model/pcal/NotSoSimpleLoop.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/NotSoSimpleLoop.tla
diff --git a/tlatools/test-model/pcal/PcalPaxos.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/PcalPaxos.cfg
similarity index 100%
rename from tlatools/test-model/pcal/PcalPaxos.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/PcalPaxos.cfg
diff --git a/tlatools/test-model/pcal/PcalPaxos.tla b/tlatools/org.lamport.tlatools/test-model/pcal/PcalPaxos.tla
similarity index 100%
rename from tlatools/test-model/pcal/PcalPaxos.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/PcalPaxos.tla
diff --git a/tlatools/test-model/pcal/Peterson.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Peterson.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Peterson.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Peterson.cfg
diff --git a/tlatools/test-model/pcal/Peterson.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Peterson.tla
similarity index 100%
rename from tlatools/test-model/pcal/Peterson.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Peterson.tla
diff --git a/tlatools/test-model/pcal/Quicksort.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Quicksort.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Quicksort.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Quicksort.cfg
diff --git a/tlatools/test-model/pcal/Quicksort.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Quicksort.tla
similarity index 100%
rename from tlatools/test-model/pcal/Quicksort.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Quicksort.tla
diff --git a/tlatools/test-model/pcal/Quicksort2Procs.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/Quicksort2Procs.cfg
similarity index 100%
rename from tlatools/test-model/pcal/Quicksort2Procs.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/Quicksort2Procs.cfg
diff --git a/tlatools/test-model/pcal/Quicksort2Procs.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Quicksort2Procs.tla
similarity index 100%
rename from tlatools/test-model/pcal/Quicksort2Procs.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Quicksort2Procs.tla
diff --git a/tlatools/test-model/pcal/QuicksortMacro.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/QuicksortMacro.cfg
similarity index 100%
rename from tlatools/test-model/pcal/QuicksortMacro.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/QuicksortMacro.cfg
diff --git a/tlatools/test-model/pcal/QuicksortMacro.tla b/tlatools/org.lamport.tlatools/test-model/pcal/QuicksortMacro.tla
similarity index 100%
rename from tlatools/test-model/pcal/QuicksortMacro.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/QuicksortMacro.tla
diff --git a/tlatools/test-model/pcal/RAB.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/RAB.cfg
similarity index 100%
rename from tlatools/test-model/pcal/RAB.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/RAB.cfg
diff --git a/tlatools/test-model/pcal/RAB.tla b/tlatools/org.lamport.tlatools/test-model/pcal/RAB.tla
similarity index 100%
rename from tlatools/test-model/pcal/RAB.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/RAB.tla
diff --git a/tlatools/test-model/pcal/RealQuicksort.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort.cfg
similarity index 100%
rename from tlatools/test-model/pcal/RealQuicksort.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort.cfg
diff --git a/tlatools/test-model/pcal/RealQuicksort.tla b/tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort.tla
similarity index 100%
rename from tlatools/test-model/pcal/RealQuicksort.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort.tla
diff --git a/tlatools/test-model/pcal/RealQuicksort2.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort2.cfg
similarity index 100%
rename from tlatools/test-model/pcal/RealQuicksort2.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort2.cfg
diff --git a/tlatools/test-model/pcal/RealQuicksort2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort2.tla
similarity index 100%
rename from tlatools/test-model/pcal/RealQuicksort2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/RealQuicksort2.tla
diff --git a/tlatools/test-model/pcal/ReallySimpleMultiProc.tla b/tlatools/org.lamport.tlatools/test-model/pcal/ReallySimpleMultiProc.tla
similarity index 100%
rename from tlatools/test-model/pcal/ReallySimpleMultiProc.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/ReallySimpleMultiProc.tla
diff --git a/tlatools/test-model/pcal/SBB.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/SBB.cfg
similarity index 100%
rename from tlatools/test-model/pcal/SBB.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/SBB.cfg
diff --git a/tlatools/test-model/pcal/SBB.tla b/tlatools/org.lamport.tlatools/test-model/pcal/SBB.tla
similarity index 100%
rename from tlatools/test-model/pcal/SBB.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/SBB.tla
diff --git a/tlatools/test-model/pcal/SemaphoreMutex.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/SemaphoreMutex.cfg
similarity index 100%
rename from tlatools/test-model/pcal/SemaphoreMutex.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/SemaphoreMutex.cfg
diff --git a/tlatools/test-model/pcal/SemaphoreMutex.tla b/tlatools/org.lamport.tlatools/test-model/pcal/SemaphoreMutex.tla
similarity index 100%
rename from tlatools/test-model/pcal/SemaphoreMutex.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/SemaphoreMutex.tla
diff --git a/tlatools/test-model/pcal/SimpleLoop.tla b/tlatools/org.lamport.tlatools/test-model/pcal/SimpleLoop.tla
similarity index 100%
rename from tlatools/test-model/pcal/SimpleLoop.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/SimpleLoop.tla
diff --git a/tlatools/test-model/pcal/SimpleLoopWithProcedure.tla b/tlatools/org.lamport.tlatools/test-model/pcal/SimpleLoopWithProcedure.tla
similarity index 100%
rename from tlatools/test-model/pcal/SimpleLoopWithProcedure.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/SimpleLoopWithProcedure.tla
diff --git a/tlatools/test-model/pcal/SimpleMultiProc.tla b/tlatools/org.lamport.tlatools/test-model/pcal/SimpleMultiProc.tla
similarity index 100%
rename from tlatools/test-model/pcal/SimpleMultiProc.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/SimpleMultiProc.tla
diff --git a/tlatools/test-model/pcal/StackTest.tla b/tlatools/org.lamport.tlatools/test-model/pcal/StackTest.tla
similarity index 100%
rename from tlatools/test-model/pcal/StackTest.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/StackTest.tla
diff --git a/tlatools/test-model/pcal/StarkMutex.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/StarkMutex.cfg
similarity index 100%
rename from tlatools/test-model/pcal/StarkMutex.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/StarkMutex.cfg
diff --git a/tlatools/test-model/pcal/StarkMutex.tla b/tlatools/org.lamport.tlatools/test-model/pcal/StarkMutex.tla
similarity index 100%
rename from tlatools/test-model/pcal/StarkMutex.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/StarkMutex.tla
diff --git a/tlatools/test-model/pcal/SubSub.tla b/tlatools/org.lamport.tlatools/test-model/pcal/SubSub.tla
similarity index 100%
rename from tlatools/test-model/pcal/SubSub.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/SubSub.tla
diff --git a/tlatools/test-model/pcal/SyncCons.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/SyncCons.cfg
similarity index 100%
rename from tlatools/test-model/pcal/SyncCons.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/SyncCons.cfg
diff --git a/tlatools/test-model/pcal/SyncCons.tla b/tlatools/org.lamport.tlatools/test-model/pcal/SyncCons.tla
similarity index 100%
rename from tlatools/test-model/pcal/SyncCons.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/SyncCons.tla
diff --git a/tlatools/test-model/pcal/Test.tla b/tlatools/org.lamport.tlatools/test-model/pcal/Test.tla
similarity index 100%
rename from tlatools/test-model/pcal/Test.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/Test.tla
diff --git a/tlatools/test-model/pcal/TestReplace.tla b/tlatools/org.lamport.tlatools/test-model/pcal/TestReplace.tla
similarity index 100%
rename from tlatools/test-model/pcal/TestReplace.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/TestReplace.tla
diff --git a/tlatools/test-model/pcal/TestTabs.tla b/tlatools/org.lamport.tlatools/test-model/pcal/TestTabs.tla
similarity index 100%
rename from tlatools/test-model/pcal/TestTabs.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/TestTabs.tla
diff --git a/tlatools/test-model/pcal/TreeBarrier.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/TreeBarrier.cfg
similarity index 100%
rename from tlatools/test-model/pcal/TreeBarrier.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/TreeBarrier.cfg
diff --git a/tlatools/test-model/pcal/TreeBarrier.tla b/tlatools/org.lamport.tlatools/test-model/pcal/TreeBarrier.tla
similarity index 100%
rename from tlatools/test-model/pcal/TreeBarrier.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/TreeBarrier.tla
diff --git a/tlatools/test-model/pcal/ULBakery.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/ULBakery.cfg
similarity index 100%
rename from tlatools/test-model/pcal/ULBakery.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULBakery.cfg
diff --git a/tlatools/test-model/pcal/ULCallReturn1.tla b/tlatools/org.lamport.tlatools/test-model/pcal/ULCallReturn1.tla
similarity index 100%
rename from tlatools/test-model/pcal/ULCallReturn1.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULCallReturn1.tla
diff --git a/tlatools/test-model/pcal/ULEuclid.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/ULEuclid.cfg
similarity index 100%
rename from tlatools/test-model/pcal/ULEuclid.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULEuclid.cfg
diff --git a/tlatools/test-model/pcal/ULEuclid.tla b/tlatools/org.lamport.tlatools/test-model/pcal/ULEuclid.tla
similarity index 100%
rename from tlatools/test-model/pcal/ULEuclid.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULEuclid.tla
diff --git a/tlatools/test-model/pcal/ULEvenOdd.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/ULEvenOdd.cfg
similarity index 100%
rename from tlatools/test-model/pcal/ULEvenOdd.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULEvenOdd.cfg
diff --git a/tlatools/test-model/pcal/ULEvenOdd.tla b/tlatools/org.lamport.tlatools/test-model/pcal/ULEvenOdd.tla
similarity index 100%
rename from tlatools/test-model/pcal/ULEvenOdd.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULEvenOdd.tla
diff --git a/tlatools/test-model/pcal/ULFactorial2.tla b/tlatools/org.lamport.tlatools/test-model/pcal/ULFactorial2.tla
similarity index 100%
rename from tlatools/test-model/pcal/ULFactorial2.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULFactorial2.tla
diff --git a/tlatools/test-model/pcal/ULQuicksortMacro.cfg b/tlatools/org.lamport.tlatools/test-model/pcal/ULQuicksortMacro.cfg
similarity index 100%
rename from tlatools/test-model/pcal/ULQuicksortMacro.cfg
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULQuicksortMacro.cfg
diff --git a/tlatools/test-model/pcal/ULQuicksortMacro.tla b/tlatools/org.lamport.tlatools/test-model/pcal/ULQuicksortMacro.tla
similarity index 100%
rename from tlatools/test-model/pcal/ULQuicksortMacro.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/ULQuicksortMacro.tla
diff --git a/tlatools/test-model/pcal/UniprocDefine.tla b/tlatools/org.lamport.tlatools/test-model/pcal/UniprocDefine.tla
similarity index 100%
rename from tlatools/test-model/pcal/UniprocDefine.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/UniprocDefine.tla
diff --git a/tlatools/test-model/pcal/bug-05-12-10.tla b/tlatools/org.lamport.tlatools/test-model/pcal/bug-05-12-10.tla
similarity index 100%
rename from tlatools/test-model/pcal/bug-05-12-10.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/bug-05-12-10.tla
diff --git a/tlatools/test-model/pcal/bug_05_10_03.tla b/tlatools/org.lamport.tlatools/test-model/pcal/bug_05_10_03.tla
similarity index 100%
rename from tlatools/test-model/pcal/bug_05_10_03.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/bug_05_10_03.tla
diff --git a/tlatools/test-model/pcal/bug_05_12_10a.tla b/tlatools/org.lamport.tlatools/test-model/pcal/bug_05_12_10a.tla
similarity index 100%
rename from tlatools/test-model/pcal/bug_05_12_10a.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/bug_05_12_10a.tla
diff --git a/tlatools/test-model/pcal/bug_05_12_16b.tla b/tlatools/org.lamport.tlatools/test-model/pcal/bug_05_12_16b.tla
similarity index 100%
rename from tlatools/test-model/pcal/bug_05_12_16b.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/bug_05_12_16b.tla
diff --git a/tlatools/test-model/pcal/bug_05_12_31.tla b/tlatools/org.lamport.tlatools/test-model/pcal/bug_05_12_31.tla
similarity index 100%
rename from tlatools/test-model/pcal/bug_05_12_31.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/bug_05_12_31.tla
diff --git a/tlatools/test-model/pcal/bug_06_01_25.tla b/tlatools/org.lamport.tlatools/test-model/pcal/bug_06_01_25.tla
similarity index 100%
rename from tlatools/test-model/pcal/bug_06_01_25.tla
rename to tlatools/org.lamport.tlatools/test-model/pcal/bug_06_01_25.tla
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/BasicMultiTrace.tla b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/BasicMultiTrace.tla
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/BasicMultiTrace.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/BasicMultiTrace.tla
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MC.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MC.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MC.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCActionProp.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCActionProp.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCActionProp.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCActionProp.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCActionPropBadEval.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCActionPropBadEval.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCActionPropBadEval.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCActionPropBadEval.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCBadInvInitState.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCBadInvInitState.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCBadInvInitState.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCBadInvInitState.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCBadInvNonInitState.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCBadInvNonInitState.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCBadInvNonInitState.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCBadInvNonInitState.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCInv.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCInv.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCInv.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCInv.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCInvInitState.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCInvInitState.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCInvInitState.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCInvInitState.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCLivenessProp.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCLivenessProp.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCLivenessProp.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCLivenessProp.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecInit.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecInit.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecInit.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecInit.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecNext.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecNext.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecNext.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCUnderspecNext.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCWithActionConstraint.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCWithActionConstraint.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCWithActionConstraint.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCWithActionConstraint.cfg
diff --git a/tlatools/test-model/simulation/BasicMultiTrace/MCWithConstraint.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCWithConstraint.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BasicMultiTrace/MCWithConstraint.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BasicMultiTrace/MCWithConstraint.cfg
diff --git a/tlatools/test-model/simulation/BenchmarkSpec/BenchmarkSpec.tla b/tlatools/org.lamport.tlatools/test-model/simulation/BenchmarkSpec/BenchmarkSpec.tla
similarity index 100%
rename from tlatools/test-model/simulation/BenchmarkSpec/BenchmarkSpec.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/BenchmarkSpec/BenchmarkSpec.tla
diff --git a/tlatools/test-model/simulation/BenchmarkSpec/MCInv.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/BenchmarkSpec/MCInv.cfg
similarity index 100%
rename from tlatools/test-model/simulation/BenchmarkSpec/MCInv.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/BenchmarkSpec/MCInv.cfg
diff --git a/tlatools/test-model/simulation/Example1.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/Example1.cfg
similarity index 100%
rename from tlatools/test-model/simulation/Example1.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/Example1.cfg
diff --git a/tlatools/test-model/simulation/Example1.tla b/tlatools/org.lamport.tlatools/test-model/simulation/Example1.tla
similarity index 100%
rename from tlatools/test-model/simulation/Example1.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/Example1.tla
diff --git a/tlatools/test-model/simulation/Example2.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/Example2.cfg
similarity index 100%
rename from tlatools/test-model/simulation/Example2.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/Example2.cfg
diff --git a/tlatools/test-model/simulation/Example2.tla b/tlatools/org.lamport.tlatools/test-model/simulation/Example2.tla
similarity index 100%
rename from tlatools/test-model/simulation/Example2.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/Example2.tla
diff --git a/tlatools/test-model/simulation/NQSpec/MC.cfg b/tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/MC.cfg
similarity index 100%
rename from tlatools/test-model/simulation/NQSpec/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/MC.cfg
diff --git a/tlatools/test-model/simulation/NQSpec/MC.tla b/tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/MC.tla
similarity index 100%
rename from tlatools/test-model/simulation/NQSpec/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/MC.tla
diff --git a/tlatools/test-model/simulation/NQSpec/NQSpec.tla b/tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/NQSpec.tla
similarity index 100%
rename from tlatools/test-model/simulation/NQSpec/NQSpec.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/NQSpec.tla
diff --git a/tlatools/test-model/simulation/NQSpec/NQSpecImpliesQSpec.tla b/tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/NQSpecImpliesQSpec.tla
similarity index 100%
rename from tlatools/test-model/simulation/NQSpec/NQSpecImpliesQSpec.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/NQSpecImpliesQSpec.tla
diff --git a/tlatools/test-model/simulation/NQSpec/QSpec.tla b/tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/QSpec.tla
similarity index 100%
rename from tlatools/test-model/simulation/NQSpec/QSpec.tla
rename to tlatools/org.lamport.tlatools/test-model/simulation/NQSpec/QSpec.tla
diff --git a/tlatools/test-model/suite/etest1.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest1.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest1.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest1.cfg
diff --git a/tlatools/test-model/suite/etest1.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest1.tla
similarity index 100%
rename from tlatools/test-model/suite/etest1.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest1.tla
diff --git a/tlatools/test-model/suite/etest10.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest10.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest10.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest10.cfg
diff --git a/tlatools/test-model/suite/etest10.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest10.tla
similarity index 100%
rename from tlatools/test-model/suite/etest10.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest10.tla
diff --git a/tlatools/test-model/suite/etest11.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest11.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest11.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest11.cfg
diff --git a/tlatools/test-model/suite/etest11.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest11.tla
similarity index 100%
rename from tlatools/test-model/suite/etest11.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest11.tla
diff --git a/tlatools/test-model/suite/etest12.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest12.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest12.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest12.cfg
diff --git a/tlatools/test-model/suite/etest12.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest12.tla
similarity index 100%
rename from tlatools/test-model/suite/etest12.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest12.tla
diff --git a/tlatools/test-model/suite/etest13.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest13.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest13.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest13.cfg
diff --git a/tlatools/test-model/suite/etest13.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest13.tla
similarity index 100%
rename from tlatools/test-model/suite/etest13.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest13.tla
diff --git a/tlatools/test-model/suite/etest14.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest14.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest14.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest14.cfg
diff --git a/tlatools/test-model/suite/etest14.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest14.tla
similarity index 100%
rename from tlatools/test-model/suite/etest14.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest14.tla
diff --git a/tlatools/test-model/suite/etest15.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest15.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest15.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest15.cfg
diff --git a/tlatools/test-model/suite/etest15.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest15.tla
similarity index 100%
rename from tlatools/test-model/suite/etest15.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest15.tla
diff --git a/tlatools/test-model/suite/etest16.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest16.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest16.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest16.cfg
diff --git a/tlatools/test-model/suite/etest16.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest16.tla
similarity index 100%
rename from tlatools/test-model/suite/etest16.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest16.tla
diff --git a/tlatools/test-model/suite/etest2.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest2.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest2.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest2.cfg
diff --git a/tlatools/test-model/suite/etest2.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest2.tla
similarity index 100%
rename from tlatools/test-model/suite/etest2.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest2.tla
diff --git a/tlatools/test-model/suite/etest3.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest3.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest3.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest3.cfg
diff --git a/tlatools/test-model/suite/etest3.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest3.tla
similarity index 100%
rename from tlatools/test-model/suite/etest3.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest3.tla
diff --git a/tlatools/test-model/suite/etest4.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest4.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest4.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest4.cfg
diff --git a/tlatools/test-model/suite/etest4.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest4.tla
similarity index 100%
rename from tlatools/test-model/suite/etest4.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest4.tla
diff --git a/tlatools/test-model/suite/etest5.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest5.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest5.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest5.cfg
diff --git a/tlatools/test-model/suite/etest5.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest5.tla
similarity index 100%
rename from tlatools/test-model/suite/etest5.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest5.tla
diff --git a/tlatools/test-model/suite/etest6.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest6.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest6.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest6.cfg
diff --git a/tlatools/test-model/suite/etest6.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest6.tla
similarity index 100%
rename from tlatools/test-model/suite/etest6.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest6.tla
diff --git a/tlatools/test-model/suite/etest7.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest7.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest7.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest7.cfg
diff --git a/tlatools/test-model/suite/etest7.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest7.tla
similarity index 100%
rename from tlatools/test-model/suite/etest7.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest7.tla
diff --git a/tlatools/test-model/suite/etest8.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest8.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest8.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest8.cfg
diff --git a/tlatools/test-model/suite/etest8.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest8.tla
similarity index 100%
rename from tlatools/test-model/suite/etest8.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest8.tla
diff --git a/tlatools/test-model/suite/etest9.cfg b/tlatools/org.lamport.tlatools/test-model/suite/etest9.cfg
similarity index 100%
rename from tlatools/test-model/suite/etest9.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/etest9.cfg
diff --git a/tlatools/test-model/suite/etest9.tla b/tlatools/org.lamport.tlatools/test-model/suite/etest9.tla
similarity index 100%
rename from tlatools/test-model/suite/etest9.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/etest9.tla
diff --git a/tlatools/test-model/suite/test.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test.cfg
similarity index 100%
rename from tlatools/test-model/suite/test.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test.cfg
diff --git a/tlatools/test-model/suite/test.tla b/tlatools/org.lamport.tlatools/test-model/suite/test.tla
similarity index 100%
rename from tlatools/test-model/suite/test.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test.tla
diff --git a/tlatools/test-model/suite/test1.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test1.cfg
similarity index 100%
rename from tlatools/test-model/suite/test1.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test1.cfg
diff --git a/tlatools/test-model/suite/test1.tla b/tlatools/org.lamport.tlatools/test-model/suite/test1.tla
similarity index 100%
rename from tlatools/test-model/suite/test1.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test1.tla
diff --git a/tlatools/test-model/suite/test10.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test10.cfg
similarity index 100%
rename from tlatools/test-model/suite/test10.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test10.cfg
diff --git a/tlatools/test-model/suite/test10.tla b/tlatools/org.lamport.tlatools/test-model/suite/test10.tla
similarity index 100%
rename from tlatools/test-model/suite/test10.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test10.tla
diff --git a/tlatools/test-model/suite/test11.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test11.cfg
similarity index 100%
rename from tlatools/test-model/suite/test11.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test11.cfg
diff --git a/tlatools/test-model/suite/test11.tla b/tlatools/org.lamport.tlatools/test-model/suite/test11.tla
similarity index 100%
rename from tlatools/test-model/suite/test11.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test11.tla
diff --git a/tlatools/test-model/suite/test12.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test12.cfg
similarity index 100%
rename from tlatools/test-model/suite/test12.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test12.cfg
diff --git a/tlatools/test-model/suite/test12.tla b/tlatools/org.lamport.tlatools/test-model/suite/test12.tla
similarity index 100%
rename from tlatools/test-model/suite/test12.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test12.tla
diff --git a/tlatools/test-model/suite/test13.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test13.cfg
similarity index 100%
rename from tlatools/test-model/suite/test13.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test13.cfg
diff --git a/tlatools/test-model/suite/test13.tla b/tlatools/org.lamport.tlatools/test-model/suite/test13.tla
similarity index 100%
rename from tlatools/test-model/suite/test13.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test13.tla
diff --git a/tlatools/test-model/suite/test14.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test14.cfg
similarity index 100%
rename from tlatools/test-model/suite/test14.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test14.cfg
diff --git a/tlatools/test-model/suite/test14.tla b/tlatools/org.lamport.tlatools/test-model/suite/test14.tla
similarity index 100%
rename from tlatools/test-model/suite/test14.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test14.tla
diff --git a/tlatools/test-model/suite/test15.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test15.cfg
similarity index 100%
rename from tlatools/test-model/suite/test15.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test15.cfg
diff --git a/tlatools/test-model/suite/test15.tla b/tlatools/org.lamport.tlatools/test-model/suite/test15.tla
similarity index 100%
rename from tlatools/test-model/suite/test15.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test15.tla
diff --git a/tlatools/test-model/suite/test16.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test16.cfg
similarity index 100%
rename from tlatools/test-model/suite/test16.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test16.cfg
diff --git a/tlatools/test-model/suite/test16.tla b/tlatools/org.lamport.tlatools/test-model/suite/test16.tla
similarity index 100%
rename from tlatools/test-model/suite/test16.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test16.tla
diff --git a/tlatools/test-model/suite/test17.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test17.cfg
similarity index 100%
rename from tlatools/test-model/suite/test17.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test17.cfg
diff --git a/tlatools/test-model/suite/test17.tla b/tlatools/org.lamport.tlatools/test-model/suite/test17.tla
similarity index 100%
rename from tlatools/test-model/suite/test17.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test17.tla
diff --git a/tlatools/test-model/suite/test18.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test18.cfg
similarity index 100%
rename from tlatools/test-model/suite/test18.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test18.cfg
diff --git a/tlatools/test-model/suite/test18.tla b/tlatools/org.lamport.tlatools/test-model/suite/test18.tla
similarity index 100%
rename from tlatools/test-model/suite/test18.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test18.tla
diff --git a/tlatools/test-model/suite/test19.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test19.cfg
similarity index 100%
rename from tlatools/test-model/suite/test19.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test19.cfg
diff --git a/tlatools/test-model/suite/test19.tla b/tlatools/org.lamport.tlatools/test-model/suite/test19.tla
similarity index 100%
rename from tlatools/test-model/suite/test19.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test19.tla
diff --git a/tlatools/test-model/suite/test2.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test2.cfg
similarity index 100%
rename from tlatools/test-model/suite/test2.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test2.cfg
diff --git a/tlatools/test-model/suite/test2.tla b/tlatools/org.lamport.tlatools/test-model/suite/test2.tla
similarity index 100%
rename from tlatools/test-model/suite/test2.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test2.tla
diff --git a/tlatools/test-model/suite/test20.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test20.cfg
similarity index 100%
rename from tlatools/test-model/suite/test20.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test20.cfg
diff --git a/tlatools/test-model/suite/test20.tla b/tlatools/org.lamport.tlatools/test-model/suite/test20.tla
similarity index 100%
rename from tlatools/test-model/suite/test20.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test20.tla
diff --git a/tlatools/test-model/suite/test201.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test201.cfg
similarity index 100%
rename from tlatools/test-model/suite/test201.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test201.cfg
diff --git a/tlatools/test-model/suite/test201.tla b/tlatools/org.lamport.tlatools/test-model/suite/test201.tla
similarity index 100%
rename from tlatools/test-model/suite/test201.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test201.tla
diff --git a/tlatools/test-model/suite/test201a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test201a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test201a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test201a.cfg
diff --git a/tlatools/test-model/suite/test201a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test201a.tla
similarity index 100%
rename from tlatools/test-model/suite/test201a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test201a.tla
diff --git a/tlatools/test-model/suite/test202.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test202.cfg
similarity index 100%
rename from tlatools/test-model/suite/test202.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test202.cfg
diff --git a/tlatools/test-model/suite/test202.tla b/tlatools/org.lamport.tlatools/test-model/suite/test202.tla
similarity index 100%
rename from tlatools/test-model/suite/test202.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test202.tla
diff --git a/tlatools/test-model/suite/test203.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test203.cfg
similarity index 100%
rename from tlatools/test-model/suite/test203.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test203.cfg
diff --git a/tlatools/test-model/suite/test203.tla b/tlatools/org.lamport.tlatools/test-model/suite/test203.tla
similarity index 100%
rename from tlatools/test-model/suite/test203.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test203.tla
diff --git a/tlatools/test-model/suite/test203a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test203a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test203a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test203a.cfg
diff --git a/tlatools/test-model/suite/test203a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test203a.tla
similarity index 100%
rename from tlatools/test-model/suite/test203a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test203a.tla
diff --git a/tlatools/test-model/suite/test204.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test204.cfg
similarity index 100%
rename from tlatools/test-model/suite/test204.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test204.cfg
diff --git a/tlatools/test-model/suite/test204.tla b/tlatools/org.lamport.tlatools/test-model/suite/test204.tla
similarity index 100%
rename from tlatools/test-model/suite/test204.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test204.tla
diff --git a/tlatools/test-model/suite/test205.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test205.cfg
similarity index 100%
rename from tlatools/test-model/suite/test205.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test205.cfg
diff --git a/tlatools/test-model/suite/test205.tla b/tlatools/org.lamport.tlatools/test-model/suite/test205.tla
similarity index 100%
rename from tlatools/test-model/suite/test205.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test205.tla
diff --git a/tlatools/test-model/suite/test206.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test206.cfg
similarity index 100%
rename from tlatools/test-model/suite/test206.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test206.cfg
diff --git a/tlatools/test-model/suite/test206.tla b/tlatools/org.lamport.tlatools/test-model/suite/test206.tla
similarity index 100%
rename from tlatools/test-model/suite/test206.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test206.tla
diff --git a/tlatools/test-model/suite/test206a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test206a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test206a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test206a.cfg
diff --git a/tlatools/test-model/suite/test206a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test206a.tla
similarity index 100%
rename from tlatools/test-model/suite/test206a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test206a.tla
diff --git a/tlatools/test-model/suite/test207.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test207.cfg
similarity index 100%
rename from tlatools/test-model/suite/test207.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test207.cfg
diff --git a/tlatools/test-model/suite/test207.tla b/tlatools/org.lamport.tlatools/test-model/suite/test207.tla
similarity index 100%
rename from tlatools/test-model/suite/test207.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test207.tla
diff --git a/tlatools/test-model/suite/test208.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test208.cfg
similarity index 100%
rename from tlatools/test-model/suite/test208.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test208.cfg
diff --git a/tlatools/test-model/suite/test208.tla b/tlatools/org.lamport.tlatools/test-model/suite/test208.tla
similarity index 100%
rename from tlatools/test-model/suite/test208.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test208.tla
diff --git a/tlatools/test-model/suite/test209.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test209.cfg
similarity index 100%
rename from tlatools/test-model/suite/test209.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test209.cfg
diff --git a/tlatools/test-model/suite/test209.tla b/tlatools/org.lamport.tlatools/test-model/suite/test209.tla
similarity index 100%
rename from tlatools/test-model/suite/test209.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test209.tla
diff --git a/tlatools/test-model/suite/test21.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test21.cfg
similarity index 100%
rename from tlatools/test-model/suite/test21.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test21.cfg
diff --git a/tlatools/test-model/suite/test21.tla b/tlatools/org.lamport.tlatools/test-model/suite/test21.tla
similarity index 100%
rename from tlatools/test-model/suite/test21.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test21.tla
diff --git a/tlatools/test-model/suite/test210.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test210.cfg
similarity index 100%
rename from tlatools/test-model/suite/test210.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test210.cfg
diff --git a/tlatools/test-model/suite/test210.tla b/tlatools/org.lamport.tlatools/test-model/suite/test210.tla
similarity index 100%
rename from tlatools/test-model/suite/test210.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test210.tla
diff --git a/tlatools/test-model/suite/test211.tla b/tlatools/org.lamport.tlatools/test-model/suite/test211.tla
similarity index 100%
rename from tlatools/test-model/suite/test211.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test211.tla
diff --git a/tlatools/test-model/suite/test212.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test212.cfg
similarity index 100%
rename from tlatools/test-model/suite/test212.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test212.cfg
diff --git a/tlatools/test-model/suite/test212.tla b/tlatools/org.lamport.tlatools/test-model/suite/test212.tla
similarity index 100%
rename from tlatools/test-model/suite/test212.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test212.tla
diff --git a/tlatools/test-model/suite/test212a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test212a.tla
similarity index 100%
rename from tlatools/test-model/suite/test212a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test212a.tla
diff --git a/tlatools/test-model/suite/test212b.tla b/tlatools/org.lamport.tlatools/test-model/suite/test212b.tla
similarity index 100%
rename from tlatools/test-model/suite/test212b.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test212b.tla
diff --git a/tlatools/test-model/suite/test213.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test213.cfg
similarity index 100%
rename from tlatools/test-model/suite/test213.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test213.cfg
diff --git a/tlatools/test-model/suite/test213.tla b/tlatools/org.lamport.tlatools/test-model/suite/test213.tla
similarity index 100%
rename from tlatools/test-model/suite/test213.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test213.tla
diff --git a/tlatools/test-model/suite/test213b.tla b/tlatools/org.lamport.tlatools/test-model/suite/test213b.tla
similarity index 100%
rename from tlatools/test-model/suite/test213b.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test213b.tla
diff --git a/tlatools/test-model/suite/test214.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test214.cfg
similarity index 100%
rename from tlatools/test-model/suite/test214.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test214.cfg
diff --git a/tlatools/test-model/suite/test214.tla b/tlatools/org.lamport.tlatools/test-model/suite/test214.tla
similarity index 100%
rename from tlatools/test-model/suite/test214.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test214.tla
diff --git a/tlatools/test-model/suite/test215.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test215.cfg
similarity index 100%
rename from tlatools/test-model/suite/test215.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test215.cfg
diff --git a/tlatools/test-model/suite/test215.tla b/tlatools/org.lamport.tlatools/test-model/suite/test215.tla
similarity index 100%
rename from tlatools/test-model/suite/test215.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test215.tla
diff --git a/tlatools/test-model/suite/test216.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test216.cfg
similarity index 100%
rename from tlatools/test-model/suite/test216.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test216.cfg
diff --git a/tlatools/test-model/suite/test216.tla b/tlatools/org.lamport.tlatools/test-model/suite/test216.tla
similarity index 100%
rename from tlatools/test-model/suite/test216.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test216.tla
diff --git a/tlatools/test-model/suite/test216a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test216a.tla
similarity index 100%
rename from tlatools/test-model/suite/test216a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test216a.tla
diff --git a/tlatools/test-model/suite/test216b.tla b/tlatools/org.lamport.tlatools/test-model/suite/test216b.tla
similarity index 100%
rename from tlatools/test-model/suite/test216b.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test216b.tla
diff --git a/tlatools/test-model/suite/test216c.tla b/tlatools/org.lamport.tlatools/test-model/suite/test216c.tla
similarity index 100%
rename from tlatools/test-model/suite/test216c.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test216c.tla
diff --git a/tlatools/test-model/suite/test217.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test217.cfg
similarity index 100%
rename from tlatools/test-model/suite/test217.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test217.cfg
diff --git a/tlatools/test-model/suite/test217.tla b/tlatools/org.lamport.tlatools/test-model/suite/test217.tla
similarity index 100%
rename from tlatools/test-model/suite/test217.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test217.tla
diff --git a/tlatools/test-model/suite/test217a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test217a.tla
similarity index 100%
rename from tlatools/test-model/suite/test217a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test217a.tla
diff --git a/tlatools/test-model/suite/test218.tla b/tlatools/org.lamport.tlatools/test-model/suite/test218.tla
similarity index 100%
rename from tlatools/test-model/suite/test218.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test218.tla
diff --git a/tlatools/test-model/suite/test219.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test219.cfg
similarity index 100%
rename from tlatools/test-model/suite/test219.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test219.cfg
diff --git a/tlatools/test-model/suite/test219.tla b/tlatools/org.lamport.tlatools/test-model/suite/test219.tla
similarity index 100%
rename from tlatools/test-model/suite/test219.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test219.tla
diff --git a/tlatools/test-model/suite/test219a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test219a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test219a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test219a.cfg
diff --git a/tlatools/test-model/suite/test219a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test219a.tla
similarity index 100%
rename from tlatools/test-model/suite/test219a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test219a.tla
diff --git a/tlatools/test-model/suite/test22.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test22.cfg
similarity index 100%
rename from tlatools/test-model/suite/test22.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test22.cfg
diff --git a/tlatools/test-model/suite/test22.tla b/tlatools/org.lamport.tlatools/test-model/suite/test22.tla
similarity index 100%
rename from tlatools/test-model/suite/test22.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test22.tla
diff --git a/tlatools/test-model/suite/test23.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test23.cfg
similarity index 100%
rename from tlatools/test-model/suite/test23.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test23.cfg
diff --git a/tlatools/test-model/suite/test23.tla b/tlatools/org.lamport.tlatools/test-model/suite/test23.tla
similarity index 100%
rename from tlatools/test-model/suite/test23.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test23.tla
diff --git a/tlatools/test-model/suite/test23bis.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test23bis.cfg
similarity index 100%
rename from tlatools/test-model/suite/test23bis.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test23bis.cfg
diff --git a/tlatools/test-model/suite/test23bis.tla b/tlatools/org.lamport.tlatools/test-model/suite/test23bis.tla
similarity index 100%
rename from tlatools/test-model/suite/test23bis.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test23bis.tla
diff --git a/tlatools/test-model/suite/test24.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test24.cfg
similarity index 100%
rename from tlatools/test-model/suite/test24.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test24.cfg
diff --git a/tlatools/test-model/suite/test24.tla b/tlatools/org.lamport.tlatools/test-model/suite/test24.tla
similarity index 100%
rename from tlatools/test-model/suite/test24.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test24.tla
diff --git a/tlatools/test-model/suite/test25.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test25.cfg
similarity index 100%
rename from tlatools/test-model/suite/test25.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test25.cfg
diff --git a/tlatools/test-model/suite/test25.tla b/tlatools/org.lamport.tlatools/test-model/suite/test25.tla
similarity index 100%
rename from tlatools/test-model/suite/test25.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test25.tla
diff --git a/tlatools/test-model/suite/test26.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test26.cfg
similarity index 100%
rename from tlatools/test-model/suite/test26.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test26.cfg
diff --git a/tlatools/test-model/suite/test26.tla b/tlatools/org.lamport.tlatools/test-model/suite/test26.tla
similarity index 100%
rename from tlatools/test-model/suite/test26.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test26.tla
diff --git a/tlatools/test-model/suite/test27.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test27.cfg
similarity index 100%
rename from tlatools/test-model/suite/test27.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test27.cfg
diff --git a/tlatools/test-model/suite/test27.tla b/tlatools/org.lamport.tlatools/test-model/suite/test27.tla
similarity index 100%
rename from tlatools/test-model/suite/test27.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test27.tla
diff --git a/tlatools/test-model/suite/test28.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test28.cfg
similarity index 100%
rename from tlatools/test-model/suite/test28.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test28.cfg
diff --git a/tlatools/test-model/suite/test28.tla b/tlatools/org.lamport.tlatools/test-model/suite/test28.tla
similarity index 100%
rename from tlatools/test-model/suite/test28.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test28.tla
diff --git a/tlatools/test-model/suite/test29.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test29.cfg
similarity index 100%
rename from tlatools/test-model/suite/test29.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test29.cfg
diff --git a/tlatools/test-model/suite/test29.tla b/tlatools/org.lamport.tlatools/test-model/suite/test29.tla
similarity index 100%
rename from tlatools/test-model/suite/test29.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test29.tla
diff --git a/tlatools/test-model/suite/test3.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test3.cfg
similarity index 100%
rename from tlatools/test-model/suite/test3.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test3.cfg
diff --git a/tlatools/test-model/suite/test3.tla b/tlatools/org.lamport.tlatools/test-model/suite/test3.tla
similarity index 100%
rename from tlatools/test-model/suite/test3.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test3.tla
diff --git a/tlatools/test-model/suite/test30-true.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test30-true.cfg
similarity index 100%
rename from tlatools/test-model/suite/test30-true.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test30-true.cfg
diff --git a/tlatools/test-model/suite/test30-true.tla b/tlatools/org.lamport.tlatools/test-model/suite/test30-true.tla
similarity index 100%
rename from tlatools/test-model/suite/test30-true.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test30-true.tla
diff --git a/tlatools/test-model/suite/test30.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test30.cfg
similarity index 100%
rename from tlatools/test-model/suite/test30.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test30.cfg
diff --git a/tlatools/test-model/suite/test30.tla b/tlatools/org.lamport.tlatools/test-model/suite/test30.tla
similarity index 100%
rename from tlatools/test-model/suite/test30.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test30.tla
diff --git a/tlatools/test-model/suite/test31.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test31.cfg
similarity index 100%
rename from tlatools/test-model/suite/test31.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test31.cfg
diff --git a/tlatools/test-model/suite/test31.tla b/tlatools/org.lamport.tlatools/test-model/suite/test31.tla
similarity index 100%
rename from tlatools/test-model/suite/test31.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test31.tla
diff --git a/tlatools/test-model/suite/test32.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test32.cfg
similarity index 100%
rename from tlatools/test-model/suite/test32.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test32.cfg
diff --git a/tlatools/test-model/suite/test32.tla b/tlatools/org.lamport.tlatools/test-model/suite/test32.tla
similarity index 100%
rename from tlatools/test-model/suite/test32.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test32.tla
diff --git a/tlatools/test-model/suite/test33.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test33.cfg
similarity index 100%
rename from tlatools/test-model/suite/test33.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test33.cfg
diff --git a/tlatools/test-model/suite/test33.tla b/tlatools/org.lamport.tlatools/test-model/suite/test33.tla
similarity index 100%
rename from tlatools/test-model/suite/test33.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test33.tla
diff --git a/tlatools/test-model/suite/test34.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test34.cfg
similarity index 100%
rename from tlatools/test-model/suite/test34.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test34.cfg
diff --git a/tlatools/test-model/suite/test34.tla b/tlatools/org.lamport.tlatools/test-model/suite/test34.tla
similarity index 100%
rename from tlatools/test-model/suite/test34.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test34.tla
diff --git a/tlatools/test-model/suite/test35.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test35.cfg
similarity index 100%
rename from tlatools/test-model/suite/test35.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test35.cfg
diff --git a/tlatools/test-model/suite/test35.tla b/tlatools/org.lamport.tlatools/test-model/suite/test35.tla
similarity index 100%
rename from tlatools/test-model/suite/test35.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test35.tla
diff --git a/tlatools/test-model/suite/test36.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test36.cfg
similarity index 100%
rename from tlatools/test-model/suite/test36.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test36.cfg
diff --git a/tlatools/test-model/suite/test36.tla b/tlatools/org.lamport.tlatools/test-model/suite/test36.tla
similarity index 100%
rename from tlatools/test-model/suite/test36.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test36.tla
diff --git a/tlatools/test-model/suite/test37.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test37.cfg
similarity index 100%
rename from tlatools/test-model/suite/test37.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test37.cfg
diff --git a/tlatools/test-model/suite/test37.tla b/tlatools/org.lamport.tlatools/test-model/suite/test37.tla
similarity index 100%
rename from tlatools/test-model/suite/test37.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test37.tla
diff --git a/tlatools/test-model/suite/test38.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test38.cfg
similarity index 100%
rename from tlatools/test-model/suite/test38.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test38.cfg
diff --git a/tlatools/test-model/suite/test38.tla b/tlatools/org.lamport.tlatools/test-model/suite/test38.tla
similarity index 100%
rename from tlatools/test-model/suite/test38.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test38.tla
diff --git a/tlatools/test-model/suite/test38a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test38a.tla
similarity index 100%
rename from tlatools/test-model/suite/test38a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test38a.tla
diff --git a/tlatools/test-model/suite/test39.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test39.cfg
similarity index 100%
rename from tlatools/test-model/suite/test39.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test39.cfg
diff --git a/tlatools/test-model/suite/test39.tla b/tlatools/org.lamport.tlatools/test-model/suite/test39.tla
similarity index 100%
rename from tlatools/test-model/suite/test39.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test39.tla
diff --git a/tlatools/test-model/suite/test4.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test4.cfg
similarity index 100%
rename from tlatools/test-model/suite/test4.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test4.cfg
diff --git a/tlatools/test-model/suite/test4.tla b/tlatools/org.lamport.tlatools/test-model/suite/test4.tla
similarity index 100%
rename from tlatools/test-model/suite/test4.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test4.tla
diff --git a/tlatools/test-model/suite/test40.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test40.cfg
similarity index 100%
rename from tlatools/test-model/suite/test40.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test40.cfg
diff --git a/tlatools/test-model/suite/test40.tla b/tlatools/org.lamport.tlatools/test-model/suite/test40.tla
similarity index 100%
rename from tlatools/test-model/suite/test40.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test40.tla
diff --git a/tlatools/test-model/suite/test41.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test41.cfg
similarity index 100%
rename from tlatools/test-model/suite/test41.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test41.cfg
diff --git a/tlatools/test-model/suite/test41.tla b/tlatools/org.lamport.tlatools/test-model/suite/test41.tla
similarity index 100%
rename from tlatools/test-model/suite/test41.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test41.tla
diff --git a/tlatools/test-model/suite/test42.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test42.cfg
similarity index 100%
rename from tlatools/test-model/suite/test42.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test42.cfg
diff --git a/tlatools/test-model/suite/test42.tla b/tlatools/org.lamport.tlatools/test-model/suite/test42.tla
similarity index 100%
rename from tlatools/test-model/suite/test42.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test42.tla
diff --git a/tlatools/test-model/suite/test43.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test43.cfg
similarity index 100%
rename from tlatools/test-model/suite/test43.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test43.cfg
diff --git a/tlatools/test-model/suite/test43.tla b/tlatools/org.lamport.tlatools/test-model/suite/test43.tla
similarity index 100%
rename from tlatools/test-model/suite/test43.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test43.tla
diff --git a/tlatools/test-model/suite/test44.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test44.cfg
similarity index 100%
rename from tlatools/test-model/suite/test44.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test44.cfg
diff --git a/tlatools/test-model/suite/test44.tla b/tlatools/org.lamport.tlatools/test-model/suite/test44.tla
similarity index 100%
rename from tlatools/test-model/suite/test44.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test44.tla
diff --git a/tlatools/test-model/suite/test45.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test45.cfg
similarity index 100%
rename from tlatools/test-model/suite/test45.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test45.cfg
diff --git a/tlatools/test-model/suite/test45.tla b/tlatools/org.lamport.tlatools/test-model/suite/test45.tla
similarity index 100%
rename from tlatools/test-model/suite/test45.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test45.tla
diff --git a/tlatools/test-model/suite/test46.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test46.cfg
similarity index 100%
rename from tlatools/test-model/suite/test46.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test46.cfg
diff --git a/tlatools/test-model/suite/test46.tla b/tlatools/org.lamport.tlatools/test-model/suite/test46.tla
similarity index 100%
rename from tlatools/test-model/suite/test46.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test46.tla
diff --git a/tlatools/test-model/suite/test47.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test47.cfg
similarity index 100%
rename from tlatools/test-model/suite/test47.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test47.cfg
diff --git a/tlatools/test-model/suite/test47.tla b/tlatools/org.lamport.tlatools/test-model/suite/test47.tla
similarity index 100%
rename from tlatools/test-model/suite/test47.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test47.tla
diff --git a/tlatools/test-model/suite/test47a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test47a.tla
similarity index 100%
rename from tlatools/test-model/suite/test47a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test47a.tla
diff --git a/tlatools/test-model/suite/test48.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test48.cfg
similarity index 100%
rename from tlatools/test-model/suite/test48.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test48.cfg
diff --git a/tlatools/test-model/suite/test48.tla b/tlatools/org.lamport.tlatools/test-model/suite/test48.tla
similarity index 100%
rename from tlatools/test-model/suite/test48.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test48.tla
diff --git a/tlatools/test-model/suite/test49.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test49.cfg
similarity index 100%
rename from tlatools/test-model/suite/test49.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test49.cfg
diff --git a/tlatools/test-model/suite/test49.tla b/tlatools/org.lamport.tlatools/test-model/suite/test49.tla
similarity index 100%
rename from tlatools/test-model/suite/test49.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test49.tla
diff --git a/tlatools/test-model/suite/test49a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test49a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test49a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test49a.cfg
diff --git a/tlatools/test-model/suite/test49a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test49a.tla
similarity index 100%
rename from tlatools/test-model/suite/test49a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test49a.tla
diff --git a/tlatools/test-model/suite/test49b.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test49b.cfg
similarity index 100%
rename from tlatools/test-model/suite/test49b.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test49b.cfg
diff --git a/tlatools/test-model/suite/test49b.tla b/tlatools/org.lamport.tlatools/test-model/suite/test49b.tla
similarity index 100%
rename from tlatools/test-model/suite/test49b.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test49b.tla
diff --git a/tlatools/test-model/suite/test49c.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test49c.cfg
similarity index 100%
rename from tlatools/test-model/suite/test49c.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test49c.cfg
diff --git a/tlatools/test-model/suite/test49c.tla b/tlatools/org.lamport.tlatools/test-model/suite/test49c.tla
similarity index 100%
rename from tlatools/test-model/suite/test49c.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test49c.tla
diff --git a/tlatools/test-model/suite/test5.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test5.cfg
similarity index 100%
rename from tlatools/test-model/suite/test5.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test5.cfg
diff --git a/tlatools/test-model/suite/test5.tla b/tlatools/org.lamport.tlatools/test-model/suite/test5.tla
similarity index 100%
rename from tlatools/test-model/suite/test5.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test5.tla
diff --git a/tlatools/test-model/suite/test50.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test50.cfg
similarity index 100%
rename from tlatools/test-model/suite/test50.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test50.cfg
diff --git a/tlatools/test-model/suite/test50.tla b/tlatools/org.lamport.tlatools/test-model/suite/test50.tla
similarity index 100%
rename from tlatools/test-model/suite/test50.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test50.tla
diff --git a/tlatools/test-model/suite/test51.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test51.cfg
similarity index 100%
rename from tlatools/test-model/suite/test51.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test51.cfg
diff --git a/tlatools/test-model/suite/test51.tla b/tlatools/org.lamport.tlatools/test-model/suite/test51.tla
similarity index 100%
rename from tlatools/test-model/suite/test51.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test51.tla
diff --git a/tlatools/test-model/suite/test51a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test51a.tla
similarity index 100%
rename from tlatools/test-model/suite/test51a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test51a.tla
diff --git a/tlatools/test-model/suite/test51b.tla b/tlatools/org.lamport.tlatools/test-model/suite/test51b.tla
similarity index 100%
rename from tlatools/test-model/suite/test51b.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test51b.tla
diff --git a/tlatools/test-model/suite/test52.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test52.cfg
similarity index 100%
rename from tlatools/test-model/suite/test52.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test52.cfg
diff --git a/tlatools/test-model/suite/test52.tla b/tlatools/org.lamport.tlatools/test-model/suite/test52.tla
similarity index 100%
rename from tlatools/test-model/suite/test52.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test52.tla
diff --git a/tlatools/test-model/suite/test53.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test53.cfg
similarity index 100%
rename from tlatools/test-model/suite/test53.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test53.cfg
diff --git a/tlatools/test-model/suite/test53.tla b/tlatools/org.lamport.tlatools/test-model/suite/test53.tla
similarity index 100%
rename from tlatools/test-model/suite/test53.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test53.tla
diff --git a/tlatools/test-model/suite/test54.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test54.cfg
similarity index 100%
rename from tlatools/test-model/suite/test54.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test54.cfg
diff --git a/tlatools/test-model/suite/test54.tla b/tlatools/org.lamport.tlatools/test-model/suite/test54.tla
similarity index 100%
rename from tlatools/test-model/suite/test54.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test54.tla
diff --git a/tlatools/test-model/suite/test55.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test55.cfg
similarity index 100%
rename from tlatools/test-model/suite/test55.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test55.cfg
diff --git a/tlatools/test-model/suite/test55.tla b/tlatools/org.lamport.tlatools/test-model/suite/test55.tla
similarity index 100%
rename from tlatools/test-model/suite/test55.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test55.tla
diff --git a/tlatools/test-model/suite/test55a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test55a.tla
similarity index 100%
rename from tlatools/test-model/suite/test55a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test55a.tla
diff --git a/tlatools/test-model/suite/test56.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test56.cfg
similarity index 100%
rename from tlatools/test-model/suite/test56.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test56.cfg
diff --git a/tlatools/test-model/suite/test56.tla b/tlatools/org.lamport.tlatools/test-model/suite/test56.tla
similarity index 100%
rename from tlatools/test-model/suite/test56.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test56.tla
diff --git a/tlatools/test-model/suite/test56a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test56a.tla
similarity index 100%
rename from tlatools/test-model/suite/test56a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test56a.tla
diff --git a/tlatools/test-model/suite/test57.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test57.cfg
similarity index 100%
rename from tlatools/test-model/suite/test57.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test57.cfg
diff --git a/tlatools/test-model/suite/test57.tla b/tlatools/org.lamport.tlatools/test-model/suite/test57.tla
similarity index 100%
rename from tlatools/test-model/suite/test57.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test57.tla
diff --git a/tlatools/test-model/suite/test57a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test57a.tla
similarity index 100%
rename from tlatools/test-model/suite/test57a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test57a.tla
diff --git a/tlatools/test-model/suite/test58.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test58.cfg
similarity index 100%
rename from tlatools/test-model/suite/test58.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test58.cfg
diff --git a/tlatools/test-model/suite/test58.tla b/tlatools/org.lamport.tlatools/test-model/suite/test58.tla
similarity index 100%
rename from tlatools/test-model/suite/test58.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test58.tla
diff --git a/tlatools/test-model/suite/test59.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test59.cfg
similarity index 100%
rename from tlatools/test-model/suite/test59.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test59.cfg
diff --git a/tlatools/test-model/suite/test59.tla b/tlatools/org.lamport.tlatools/test-model/suite/test59.tla
similarity index 100%
rename from tlatools/test-model/suite/test59.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test59.tla
diff --git a/tlatools/test-model/suite/test59a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test59a.tla
similarity index 100%
rename from tlatools/test-model/suite/test59a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test59a.tla
diff --git a/tlatools/test-model/suite/test6.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test6.cfg
similarity index 100%
rename from tlatools/test-model/suite/test6.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test6.cfg
diff --git a/tlatools/test-model/suite/test6.tla b/tlatools/org.lamport.tlatools/test-model/suite/test6.tla
similarity index 100%
rename from tlatools/test-model/suite/test6.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test6.tla
diff --git a/tlatools/test-model/suite/test60.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test60.cfg
similarity index 100%
rename from tlatools/test-model/suite/test60.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test60.cfg
diff --git a/tlatools/test-model/suite/test60.tla b/tlatools/org.lamport.tlatools/test-model/suite/test60.tla
similarity index 100%
rename from tlatools/test-model/suite/test60.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test60.tla
diff --git a/tlatools/test-model/suite/test61.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test61.cfg
similarity index 100%
rename from tlatools/test-model/suite/test61.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test61.cfg
diff --git a/tlatools/test-model/suite/test61.tla b/tlatools/org.lamport.tlatools/test-model/suite/test61.tla
similarity index 100%
rename from tlatools/test-model/suite/test61.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test61.tla
diff --git a/tlatools/test-model/suite/test61a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test61a.tla
similarity index 100%
rename from tlatools/test-model/suite/test61a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test61a.tla
diff --git a/tlatools/test-model/suite/test62.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test62.cfg
similarity index 100%
rename from tlatools/test-model/suite/test62.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test62.cfg
diff --git a/tlatools/test-model/suite/test62.tla b/tlatools/org.lamport.tlatools/test-model/suite/test62.tla
similarity index 100%
rename from tlatools/test-model/suite/test62.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test62.tla
diff --git a/tlatools/test-model/suite/test63.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test63.cfg
similarity index 100%
rename from tlatools/test-model/suite/test63.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test63.cfg
diff --git a/tlatools/test-model/suite/test63.tla b/tlatools/org.lamport.tlatools/test-model/suite/test63.tla
similarity index 100%
rename from tlatools/test-model/suite/test63.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test63.tla
diff --git a/tlatools/test-model/suite/test63a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test63a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test63a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test63a.cfg
diff --git a/tlatools/test-model/suite/test63a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test63a.tla
similarity index 100%
rename from tlatools/test-model/suite/test63a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test63a.tla
diff --git a/tlatools/test-model/suite/test64.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test64.cfg
similarity index 100%
rename from tlatools/test-model/suite/test64.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test64.cfg
diff --git a/tlatools/test-model/suite/test64.tla b/tlatools/org.lamport.tlatools/test-model/suite/test64.tla
similarity index 100%
rename from tlatools/test-model/suite/test64.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test64.tla
diff --git a/tlatools/test-model/suite/test64a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test64a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test64a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test64a.cfg
diff --git a/tlatools/test-model/suite/test64a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test64a.tla
similarity index 100%
rename from tlatools/test-model/suite/test64a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test64a.tla
diff --git a/tlatools/test-model/suite/test65.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test65.cfg
similarity index 100%
rename from tlatools/test-model/suite/test65.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test65.cfg
diff --git a/tlatools/test-model/suite/test65.tla b/tlatools/org.lamport.tlatools/test-model/suite/test65.tla
similarity index 100%
rename from tlatools/test-model/suite/test65.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test65.tla
diff --git a/tlatools/test-model/suite/test65a.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test65a.cfg
similarity index 100%
rename from tlatools/test-model/suite/test65a.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test65a.cfg
diff --git a/tlatools/test-model/suite/test65a.tla b/tlatools/org.lamport.tlatools/test-model/suite/test65a.tla
similarity index 100%
rename from tlatools/test-model/suite/test65a.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test65a.tla
diff --git a/tlatools/test-model/suite/test7.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test7.cfg
similarity index 100%
rename from tlatools/test-model/suite/test7.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test7.cfg
diff --git a/tlatools/test-model/suite/test7.tla b/tlatools/org.lamport.tlatools/test-model/suite/test7.tla
similarity index 100%
rename from tlatools/test-model/suite/test7.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test7.tla
diff --git a/tlatools/test-model/suite/test8.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test8.cfg
similarity index 100%
rename from tlatools/test-model/suite/test8.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test8.cfg
diff --git a/tlatools/test-model/suite/test8.tla b/tlatools/org.lamport.tlatools/test-model/suite/test8.tla
similarity index 100%
rename from tlatools/test-model/suite/test8.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test8.tla
diff --git a/tlatools/test-model/suite/test9.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test9.cfg
similarity index 100%
rename from tlatools/test-model/suite/test9.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test9.cfg
diff --git a/tlatools/test-model/suite/test9.tla b/tlatools/org.lamport.tlatools/test-model/suite/test9.tla
similarity index 100%
rename from tlatools/test-model/suite/test9.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test9.tla
diff --git a/tlatools/test-model/suite/test99.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test99.cfg
similarity index 100%
rename from tlatools/test-model/suite/test99.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test99.cfg
diff --git a/tlatools/test-model/suite/test99.tla b/tlatools/org.lamport.tlatools/test-model/suite/test99.tla
similarity index 100%
rename from tlatools/test-model/suite/test99.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test99.tla
diff --git a/tlatools/test-model/suite/test999.cfg b/tlatools/org.lamport.tlatools/test-model/suite/test999.cfg
similarity index 100%
rename from tlatools/test-model/suite/test999.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/test999.cfg
diff --git a/tlatools/test-model/suite/test999.tla b/tlatools/org.lamport.tlatools/test-model/suite/test999.tla
similarity index 100%
rename from tlatools/test-model/suite/test999.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/test999.tla
diff --git a/tlatools/test-model/suite/testa.cfg b/tlatools/org.lamport.tlatools/test-model/suite/testa.cfg
similarity index 100%
rename from tlatools/test-model/suite/testa.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/testa.cfg
diff --git a/tlatools/test-model/suite/testa.tla b/tlatools/org.lamport.tlatools/test-model/suite/testa.tla
similarity index 100%
rename from tlatools/test-model/suite/testa.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/testa.tla
diff --git a/tlatools/test-model/suite/testfoo.cfg b/tlatools/org.lamport.tlatools/test-model/suite/testfoo.cfg
similarity index 100%
rename from tlatools/test-model/suite/testfoo.cfg
rename to tlatools/org.lamport.tlatools/test-model/suite/testfoo.cfg
diff --git a/tlatools/test-model/suite/testfoo.tla b/tlatools/org.lamport.tlatools/test-model/suite/testfoo.tla
similarity index 100%
rename from tlatools/test-model/suite/testfoo.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/testfoo.tla
diff --git a/tlatools/test-model/suite/testt37.tla b/tlatools/org.lamport.tlatools/test-model/suite/testt37.tla
similarity index 100%
rename from tlatools/test-model/suite/testt37.tla
rename to tlatools/org.lamport.tlatools/test-model/suite/testt37.tla
diff --git a/tlatools/test-model/symmetry/April20a.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April20a.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April20a.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April20a.tla
diff --git a/tlatools/test-model/symmetry/April20aMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/April20aMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/April20aMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April20aMC.cfg
diff --git a/tlatools/test-model/symmetry/April20aMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April20aMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April20aMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April20aMC.tla
diff --git a/tlatools/test-model/symmetry/April20b.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April20b.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April20b.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April20b.tla
diff --git a/tlatools/test-model/symmetry/April20bMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/April20bMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/April20bMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April20bMC.cfg
diff --git a/tlatools/test-model/symmetry/April20bMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April20bMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April20bMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April20bMC.tla
diff --git a/tlatools/test-model/symmetry/April21.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April21.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April21.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April21.tla
diff --git a/tlatools/test-model/symmetry/April21MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/April21MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/April21MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April21MC.cfg
diff --git a/tlatools/test-model/symmetry/April21MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April21MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April21MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April21MC.tla
diff --git a/tlatools/test-model/symmetry/April22.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April22.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April22.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April22.tla
diff --git a/tlatools/test-model/symmetry/April22MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/April22MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/April22MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April22MC.cfg
diff --git a/tlatools/test-model/symmetry/April22MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April22MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April22MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April22MC.tla
diff --git a/tlatools/test-model/symmetry/April25.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April25.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April25.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April25.tla
diff --git a/tlatools/test-model/symmetry/April25MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/April25MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/April25MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April25MC.cfg
diff --git a/tlatools/test-model/symmetry/April25MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April25MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April25MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April25MC.tla
diff --git a/tlatools/test-model/symmetry/April25NoSymmetry.dot b/tlatools/org.lamport.tlatools/test-model/symmetry/April25NoSymmetry.dot
similarity index 100%
rename from tlatools/test-model/symmetry/April25NoSymmetry.dot
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April25NoSymmetry.dot
diff --git a/tlatools/test-model/symmetry/April25WithSymmetry.dot b/tlatools/org.lamport.tlatools/test-model/symmetry/April25WithSymmetry.dot
similarity index 100%
rename from tlatools/test-model/symmetry/April25WithSymmetry.dot
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April25WithSymmetry.dot
diff --git a/tlatools/test-model/symmetry/April29.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April29.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April29.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April29.tla
diff --git a/tlatools/test-model/symmetry/April29MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/April29MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/April29MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April29MC.cfg
diff --git a/tlatools/test-model/symmetry/April29MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April29MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April29MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April29MC.tla
diff --git a/tlatools/test-model/symmetry/April29dMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/April29dMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/April29dMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April29dMC.cfg
diff --git a/tlatools/test-model/symmetry/April29dMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/April29dMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/April29dMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/April29dMC.tla
diff --git a/tlatools/test-model/symmetry/ChooseTableauSymmetry.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetry.tla
similarity index 100%
rename from tlatools/test-model/symmetry/ChooseTableauSymmetry.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetry.tla
diff --git a/tlatools/test-model/symmetry/ChooseTableauSymmetryMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/ChooseTableauSymmetryMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMC.cfg
diff --git a/tlatools/test-model/symmetry/ChooseTableauSymmetryMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/ChooseTableauSymmetryMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMC.tla
diff --git a/tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.cfg
diff --git a/tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.tla
similarity index 100%
rename from tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ChooseTableauSymmetryMCa.tla
diff --git a/tlatools/test-model/symmetry/ErrorTraceConstruction.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstruction.tla
similarity index 100%
rename from tlatools/test-model/symmetry/ErrorTraceConstruction.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstruction.tla
diff --git a/tlatools/test-model/symmetry/ErrorTraceConstructionMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstructionMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/ErrorTraceConstructionMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstructionMC.cfg
diff --git a/tlatools/test-model/symmetry/ErrorTraceConstructionMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstructionMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/ErrorTraceConstructionMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstructionMC.tla
diff --git a/tlatools/test-model/symmetry/ErrorTraceConstructionPhases.png b/tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstructionPhases.png
similarity index 100%
rename from tlatools/test-model/symmetry/ErrorTraceConstructionPhases.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/ErrorTraceConstructionPhases.png
diff --git a/tlatools/test-model/symmetry/LongMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/LongMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/LongMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/LongMC.cfg
diff --git a/tlatools/test-model/symmetry/LongMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/LongMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/LongMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/LongMC.tla
diff --git a/tlatools/test-model/symmetry/LongMCa.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/LongMCa.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/LongMCa.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/LongMCa.cfg
diff --git a/tlatools/test-model/symmetry/LongMCa.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/LongMCa.tla
similarity index 100%
rename from tlatools/test-model/symmetry/LongMCa.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/LongMCa.tla
diff --git a/tlatools/test-model/symmetry/MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/MC.cfg
diff --git a/tlatools/test-model/symmetry/MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/MC.tla
diff --git a/tlatools/test-model/symmetry/MC_Graph.png b/tlatools/org.lamport.tlatools/test-model/symmetry/MC_Graph.png
similarity index 100%
rename from tlatools/test-model/symmetry/MC_Graph.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/MC_Graph.png
diff --git a/tlatools/test-model/symmetry/MCa.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/MCa.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/MCa.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/MCa.cfg
diff --git a/tlatools/test-model/symmetry/MCa.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/MCa.tla
similarity index 100%
rename from tlatools/test-model/symmetry/MCa.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/MCa.tla
diff --git a/tlatools/test-model/symmetry/MCa_Graph.png b/tlatools/org.lamport.tlatools/test-model/symmetry/MCa_Graph.png
similarity index 100%
rename from tlatools/test-model/symmetry/MCa_Graph.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/MCa_Graph.png
diff --git a/tlatools/test-model/symmetry/May09.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/May09.tla
similarity index 100%
rename from tlatools/test-model/symmetry/May09.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/May09.tla
diff --git a/tlatools/test-model/symmetry/May09MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/May09MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/May09MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/May09MC.cfg
diff --git a/tlatools/test-model/symmetry/May09MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/May09MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/May09MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/May09MC.tla
diff --git a/tlatools/test-model/symmetry/May09dMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/May09dMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/May09dMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/May09dMC.cfg
diff --git a/tlatools/test-model/symmetry/May09dMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/May09dMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/May09dMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/May09dMC.tla
diff --git a/tlatools/test-model/symmetry/NQ/MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/NQ/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MC.cfg
diff --git a/tlatools/test-model/symmetry/NQ/MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/NQ/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MC.tla
diff --git a/tlatools/test-model/symmetry/NQ/MCa.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MCa.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/NQ/MCa.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MCa.cfg
diff --git a/tlatools/test-model/symmetry/NQ/MCa.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MCa.tla
similarity index 100%
rename from tlatools/test-model/symmetry/NQ/MCa.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/NQ/MCa.tla
diff --git a/tlatools/test-model/symmetry/NQ/NQSpec.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/NQ/NQSpec.tla
similarity index 100%
rename from tlatools/test-model/symmetry/NQ/NQSpec.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/NQ/NQSpec.tla
diff --git a/tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.cfg
diff --git a/tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/NoSymmetryLivenessTableauMC.tla
diff --git a/tlatools/test-model/symmetry/OneBitMutex/OneBitMutex.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutex.tla
similarity index 100%
rename from tlatools/test-model/symmetry/OneBitMutex/OneBitMutex.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutex.tla
diff --git a/tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.cfg
diff --git a/tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexMC.tla
diff --git a/tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.cfg
diff --git a/tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/OneBitMutex/OneBitMutexNoSymmetryMC.tla
diff --git a/tlatools/test-model/symmetry/SymmetryLiveness3.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLiveness3.tla
similarity index 100%
rename from tlatools/test-model/symmetry/SymmetryLiveness3.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLiveness3.tla
diff --git a/tlatools/test-model/symmetry/SymmetryLivenessLong.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessLong.tla
similarity index 100%
rename from tlatools/test-model/symmetry/SymmetryLivenessLong.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessLong.tla
diff --git a/tlatools/test-model/symmetry/SymmetryLivenessTableau.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessTableau.tla
similarity index 100%
rename from tlatools/test-model/symmetry/SymmetryLivenessTableau.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessTableau.tla
diff --git a/tlatools/test-model/symmetry/SymmetryLivenessTableauMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessTableauMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/SymmetryLivenessTableauMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessTableauMC.cfg
diff --git a/tlatools/test-model/symmetry/SymmetryLivenessTableauMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessTableauMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/SymmetryLivenessTableauMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/SymmetryLivenessTableauMC.tla
diff --git a/tlatools/test-model/symmetry/TableauSymmetry.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetry.tla
similarity index 100%
rename from tlatools/test-model/symmetry/TableauSymmetry.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetry.tla
diff --git a/tlatools/test-model/symmetry/TableauSymmetryDisabled.png b/tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetryDisabled.png
similarity index 100%
rename from tlatools/test-model/symmetry/TableauSymmetryDisabled.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetryDisabled.png
diff --git a/tlatools/test-model/symmetry/TableauSymmetryMC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetryMC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/TableauSymmetryMC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetryMC.cfg
diff --git a/tlatools/test-model/symmetry/TableauSymmetryMC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetryMC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/TableauSymmetryMC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TableauSymmetryMC.tla
diff --git a/tlatools/test-model/symmetry/TwoPhaseCommit/DistributedCommit.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/DistributedCommit.tla
similarity index 100%
rename from tlatools/test-model/symmetry/TwoPhaseCommit/DistributedCommit.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/DistributedCommit.tla
diff --git a/tlatools/test-model/symmetry/TwoPhaseCommit/MC.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/MC.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/TwoPhaseCommit/MC.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/MC.cfg
diff --git a/tlatools/test-model/symmetry/TwoPhaseCommit/MC.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/MC.tla
similarity index 100%
rename from tlatools/test-model/symmetry/TwoPhaseCommit/MC.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/MC.tla
diff --git a/tlatools/test-model/symmetry/TwoPhaseCommit/TwoPhaseCommit.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/TwoPhaseCommit.tla
similarity index 100%
rename from tlatools/test-model/symmetry/TwoPhaseCommit/TwoPhaseCommit.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/TwoPhaseCommit/TwoPhaseCommit.tla
diff --git a/tlatools/test-model/symmetry/Unsymmetric.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/Unsymmetric.tla
similarity index 100%
rename from tlatools/test-model/symmetry/Unsymmetric.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/Unsymmetric.tla
diff --git a/tlatools/test-model/symmetry/UnsymmetricAWithSymmetry.png b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricAWithSymmetry.png
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricAWithSymmetry.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricAWithSymmetry.png
diff --git a/tlatools/test-model/symmetry/UnsymmetricAWithoutSymmetry.png b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricAWithoutSymmetry.png
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricAWithoutSymmetry.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricAWithoutSymmetry.png
diff --git a/tlatools/test-model/symmetry/UnsymmetricBWithSymmetry.png b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricBWithSymmetry.png
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricBWithSymmetry.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricBWithSymmetry.png
diff --git a/tlatools/test-model/symmetry/UnsymmetricBWithoutSymmetry.png b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricBWithoutSymmetry.png
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricBWithoutSymmetry.png
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricBWithoutSymmetry.png
diff --git a/tlatools/test-model/symmetry/UnsymmetricMCA.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCA.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricMCA.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCA.cfg
diff --git a/tlatools/test-model/symmetry/UnsymmetricMCA.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCA.tla
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricMCA.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCA.tla
diff --git a/tlatools/test-model/symmetry/UnsymmetricMCB.cfg b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCB.cfg
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricMCB.cfg
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCB.cfg
diff --git a/tlatools/test-model/symmetry/UnsymmetricMCB.tla b/tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCB.tla
similarity index 100%
rename from tlatools/test-model/symmetry/UnsymmetricMCB.tla
rename to tlatools/org.lamport.tlatools/test-model/symmetry/UnsymmetricMCB.tla
diff --git a/tlatools/test-model/testinvalidinvariant.cfg b/tlatools/org.lamport.tlatools/test-model/testinvalidinvariant.cfg
similarity index 100%
rename from tlatools/test-model/testinvalidinvariant.cfg
rename to tlatools/org.lamport.tlatools/test-model/testinvalidinvariant.cfg
diff --git a/tlatools/test-model/testinvalidinvariant.tla b/tlatools/org.lamport.tlatools/test-model/testinvalidinvariant.tla
similarity index 100%
rename from tlatools/test-model/testinvalidinvariant.tla
rename to tlatools/org.lamport.tlatools/test-model/testinvalidinvariant.tla
diff --git a/tlatools/test-model/tlc2/overrides/TLCOverrides.class b/tlatools/org.lamport.tlatools/test-model/tlc2/overrides/TLCOverrides.class
similarity index 100%
rename from tlatools/test-model/tlc2/overrides/TLCOverrides.class
rename to tlatools/org.lamport.tlatools/test-model/tlc2/overrides/TLCOverrides.class
diff --git a/tlatools/test-model/tlc2/overrides/TLCOverrides.java b/tlatools/org.lamport.tlatools/test-model/tlc2/overrides/TLCOverrides.java
similarity index 100%
rename from tlatools/test-model/tlc2/overrides/TLCOverrides.java
rename to tlatools/org.lamport.tlatools/test-model/tlc2/overrides/TLCOverrides.java
diff --git a/tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.class b/tlatools/org.lamport.tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.class
similarity index 100%
rename from tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.class
rename to tlatools/org.lamport.tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.class
diff --git a/tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.java b/tlatools/org.lamport.tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.java
similarity index 100%
rename from tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.java
rename to tlatools/org.lamport.tlatools/test-model/tlc2/overrides/UserModuleOverrideAnnotationImpl.java
diff --git a/tlatools/test-verify/README.txt b/tlatools/org.lamport.tlatools/test-verify/README.txt
similarity index 100%
rename from tlatools/test-verify/README.txt
rename to tlatools/org.lamport.tlatools/test-verify/README.txt
diff --git a/tlatools/test-verify/jpf.properties b/tlatools/org.lamport.tlatools/test-verify/jpf.properties
similarity index 100%
rename from tlatools/test-verify/jpf.properties
rename to tlatools/org.lamport.tlatools/test-verify/jpf.properties
diff --git a/tlatools/test-verify/tlc2/tool/fp/OffHeapDiskFPSetJPFTest.java b/tlatools/org.lamport.tlatools/test-verify/tlc2/tool/fp/OffHeapDiskFPSetJPFTest.java
similarity index 100%
rename from tlatools/test-verify/tlc2/tool/fp/OffHeapDiskFPSetJPFTest.java
rename to tlatools/org.lamport.tlatools/test-verify/tlc2/tool/fp/OffHeapDiskFPSetJPFTest.java
diff --git a/tlatools/test-verify/tlc2/tool/queue/StateQueueJFP.launch b/tlatools/org.lamport.tlatools/test-verify/tlc2/tool/queue/StateQueueJFP.launch
similarity index 100%
rename from tlatools/test-verify/tlc2/tool/queue/StateQueueJFP.launch
rename to tlatools/org.lamport.tlatools/test-verify/tlc2/tool/queue/StateQueueJFP.launch
diff --git a/tlatools/test-verify/tlc2/tool/queue/StateQueueJPFStandalone.jpf b/tlatools/org.lamport.tlatools/test-verify/tlc2/tool/queue/StateQueueJPFStandalone.jpf
similarity index 100%
rename from tlatools/test-verify/tlc2/tool/queue/StateQueueJPFStandalone.jpf
rename to tlatools/org.lamport.tlatools/test-verify/tlc2/tool/queue/StateQueueJPFStandalone.jpf
diff --git a/tlatools/test-verify/tlc2/tool/queue/StateQueueJPFTest.java b/tlatools/org.lamport.tlatools/test-verify/tlc2/tool/queue/StateQueueJPFTest.java
similarity index 100%
rename from tlatools/test-verify/tlc2/tool/queue/StateQueueJPFTest.java
rename to tlatools/org.lamport.tlatools/test-verify/tlc2/tool/queue/StateQueueJPFTest.java
diff --git a/tlatools/test/pcal/AssignmentToUndeclaredVariableTest.java b/tlatools/org.lamport.tlatools/test/pcal/AssignmentToUndeclaredVariableTest.java
similarity index 100%
rename from tlatools/test/pcal/AssignmentToUndeclaredVariableTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/AssignmentToUndeclaredVariableTest.java
diff --git a/tlatools/test/pcal/BakeryTest.java b/tlatools/org.lamport.tlatools/test/pcal/BakeryTest.java
similarity index 100%
rename from tlatools/test/pcal/BakeryTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/BakeryTest.java
diff --git a/tlatools/test/pcal/Bug051003Test.java b/tlatools/org.lamport.tlatools/test/pcal/Bug051003Test.java
similarity index 100%
rename from tlatools/test/pcal/Bug051003Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Bug051003Test.java
diff --git a/tlatools/test/pcal/Bug051210aTest.java b/tlatools/org.lamport.tlatools/test/pcal/Bug051210aTest.java
similarity index 100%
rename from tlatools/test/pcal/Bug051210aTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/Bug051210aTest.java
diff --git a/tlatools/test/pcal/Bug051216bTest.java b/tlatools/org.lamport.tlatools/test/pcal/Bug051216bTest.java
similarity index 100%
rename from tlatools/test/pcal/Bug051216bTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/Bug051216bTest.java
diff --git a/tlatools/test/pcal/Bug051231Test.java b/tlatools/org.lamport.tlatools/test/pcal/Bug051231Test.java
similarity index 100%
rename from tlatools/test/pcal/Bug051231Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Bug051231Test.java
diff --git a/tlatools/test/pcal/Bug060125Test.java b/tlatools/org.lamport.tlatools/test/pcal/Bug060125Test.java
similarity index 100%
rename from tlatools/test/pcal/Bug060125Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Bug060125Test.java
diff --git a/tlatools/test/pcal/CBakeryTest.java b/tlatools/org.lamport.tlatools/test/pcal/CBakeryTest.java
similarity index 100%
rename from tlatools/test/pcal/CBakeryTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/CBakeryTest.java
diff --git a/tlatools/test/pcal/CCallReturn1Test.java b/tlatools/org.lamport.tlatools/test/pcal/CCallReturn1Test.java
similarity index 100%
rename from tlatools/test/pcal/CCallReturn1Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/CCallReturn1Test.java
diff --git a/tlatools/test/pcal/CDiningPhilosophersTest.java b/tlatools/org.lamport.tlatools/test/pcal/CDiningPhilosophersTest.java
similarity index 100%
rename from tlatools/test/pcal/CDiningPhilosophersTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/CDiningPhilosophersTest.java
diff --git a/tlatools/test/pcal/CEither1Test.java b/tlatools/org.lamport.tlatools/test/pcal/CEither1Test.java
similarity index 100%
rename from tlatools/test/pcal/CEither1Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/CEither1Test.java
diff --git a/tlatools/test/pcal/CMultiprocDefineTest.java b/tlatools/org.lamport.tlatools/test/pcal/CMultiprocDefineTest.java
similarity index 100%
rename from tlatools/test/pcal/CMultiprocDefineTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/CMultiprocDefineTest.java
diff --git a/tlatools/test/pcal/CallGotoUnlabeledTest.java b/tlatools/org.lamport.tlatools/test/pcal/CallGotoUnlabeledTest.java
similarity index 100%
rename from tlatools/test/pcal/CallGotoUnlabeledTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/CallGotoUnlabeledTest.java
diff --git a/tlatools/test/pcal/CallReturn1Test.java b/tlatools/org.lamport.tlatools/test/pcal/CallReturn1Test.java
similarity index 100%
rename from tlatools/test/pcal/CallReturn1Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/CallReturn1Test.java
diff --git a/tlatools/test/pcal/CallReturn2Test.java b/tlatools/org.lamport.tlatools/test/pcal/CallReturn2Test.java
similarity index 100%
rename from tlatools/test/pcal/CallReturn2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/CallReturn2Test.java
diff --git a/tlatools/test/pcal/DetlefSpecTest.java b/tlatools/org.lamport.tlatools/test/pcal/DetlefSpecTest.java
similarity index 100%
rename from tlatools/test/pcal/DetlefSpecTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/DetlefSpecTest.java
diff --git a/tlatools/test/pcal/DetlefsTest.java b/tlatools/org.lamport.tlatools/test/pcal/DetlefsTest.java
similarity index 100%
rename from tlatools/test/pcal/DetlefsTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/DetlefsTest.java
diff --git a/tlatools/test/pcal/Dijkstra1Test.java b/tlatools/org.lamport.tlatools/test/pcal/Dijkstra1Test.java
similarity index 100%
rename from tlatools/test/pcal/Dijkstra1Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Dijkstra1Test.java
diff --git a/tlatools/test/pcal/DiningPhilosophersTest.java b/tlatools/org.lamport.tlatools/test/pcal/DiningPhilosophersTest.java
similarity index 100%
rename from tlatools/test/pcal/DiningPhilosophersTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/DiningPhilosophersTest.java
diff --git a/tlatools/test/pcal/Either1Test.java b/tlatools/org.lamport.tlatools/test/pcal/Either1Test.java
similarity index 100%
rename from tlatools/test/pcal/Either1Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Either1Test.java
diff --git a/tlatools/test/pcal/Either2Test.java b/tlatools/org.lamport.tlatools/test/pcal/Either2Test.java
similarity index 100%
rename from tlatools/test/pcal/Either2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Either2Test.java
diff --git a/tlatools/test/pcal/Either3Test.java b/tlatools/org.lamport.tlatools/test/pcal/Either3Test.java
similarity index 100%
rename from tlatools/test/pcal/Either3Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Either3Test.java
diff --git a/tlatools/test/pcal/Either4Test.java b/tlatools/org.lamport.tlatools/test/pcal/Either4Test.java
similarity index 100%
rename from tlatools/test/pcal/Either4Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Either4Test.java
diff --git a/tlatools/test/pcal/Either5Test.java b/tlatools/org.lamport.tlatools/test/pcal/Either5Test.java
similarity index 100%
rename from tlatools/test/pcal/Either5Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Either5Test.java
diff --git a/tlatools/test/pcal/Euclid2Test.java b/tlatools/org.lamport.tlatools/test/pcal/Euclid2Test.java
similarity index 100%
rename from tlatools/test/pcal/Euclid2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Euclid2Test.java
diff --git a/tlatools/test/pcal/Euclid3Test.java b/tlatools/org.lamport.tlatools/test/pcal/Euclid3Test.java
similarity index 100%
rename from tlatools/test/pcal/Euclid3Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Euclid3Test.java
diff --git a/tlatools/test/pcal/EuclidTest.java b/tlatools/org.lamport.tlatools/test/pcal/EuclidTest.java
similarity index 100%
rename from tlatools/test/pcal/EuclidTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/EuclidTest.java
diff --git a/tlatools/test/pcal/EvenOddBadTest.java b/tlatools/org.lamport.tlatools/test/pcal/EvenOddBadTest.java
similarity index 100%
rename from tlatools/test/pcal/EvenOddBadTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/EvenOddBadTest.java
diff --git a/tlatools/test/pcal/EvenOddTest.java b/tlatools/org.lamport.tlatools/test/pcal/EvenOddTest.java
similarity index 100%
rename from tlatools/test/pcal/EvenOddTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/EvenOddTest.java
diff --git a/tlatools/test/pcal/Factorial2Test.java b/tlatools/org.lamport.tlatools/test/pcal/Factorial2Test.java
similarity index 100%
rename from tlatools/test/pcal/Factorial2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/Factorial2Test.java
diff --git a/tlatools/test/pcal/FactorialTest.java b/tlatools/org.lamport.tlatools/test/pcal/FactorialTest.java
similarity index 100%
rename from tlatools/test/pcal/FactorialTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/FactorialTest.java
diff --git a/tlatools/test/pcal/FairSeq2Test.java b/tlatools/org.lamport.tlatools/test/pcal/FairSeq2Test.java
similarity index 100%
rename from tlatools/test/pcal/FairSeq2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/FairSeq2Test.java
diff --git a/tlatools/test/pcal/FairSeqTest.java b/tlatools/org.lamport.tlatools/test/pcal/FairSeqTest.java
similarity index 100%
rename from tlatools/test/pcal/FairSeqTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/FairSeqTest.java
diff --git a/tlatools/test/pcal/FastMutex2Test.java b/tlatools/org.lamport.tlatools/test/pcal/FastMutex2Test.java
similarity index 100%
rename from tlatools/test/pcal/FastMutex2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/FastMutex2Test.java
diff --git a/tlatools/test/pcal/FastMutex3Test.java b/tlatools/org.lamport.tlatools/test/pcal/FastMutex3Test.java
similarity index 100%
rename from tlatools/test/pcal/FastMutex3Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/FastMutex3Test.java
diff --git a/tlatools/test/pcal/FastMutexTest.java b/tlatools/org.lamport.tlatools/test/pcal/FastMutexTest.java
similarity index 100%
rename from tlatools/test/pcal/FastMutexTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/FastMutexTest.java
diff --git a/tlatools/test/pcal/FastMutexWithGoto2Test.java b/tlatools/org.lamport.tlatools/test/pcal/FastMutexWithGoto2Test.java
similarity index 100%
rename from tlatools/test/pcal/FastMutexWithGoto2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/FastMutexWithGoto2Test.java
diff --git a/tlatools/test/pcal/FastMutexWithGotoTest.java b/tlatools/org.lamport.tlatools/test/pcal/FastMutexWithGotoTest.java
similarity index 100%
rename from tlatools/test/pcal/FastMutexWithGotoTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/FastMutexWithGotoTest.java
diff --git a/tlatools/test/pcal/FischerTest.java b/tlatools/org.lamport.tlatools/test/pcal/FischerTest.java
similarity index 100%
rename from tlatools/test/pcal/FischerTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/FischerTest.java
diff --git a/tlatools/test/pcal/InnerLabeledIfTest.java b/tlatools/org.lamport.tlatools/test/pcal/InnerLabeledIfTest.java
similarity index 100%
rename from tlatools/test/pcal/InnerLabeledIfTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/InnerLabeledIfTest.java
diff --git a/tlatools/test/pcal/MPFactorial2Test.java b/tlatools/org.lamport.tlatools/test/pcal/MPFactorial2Test.java
similarity index 100%
rename from tlatools/test/pcal/MPFactorial2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/MPFactorial2Test.java
diff --git a/tlatools/test/pcal/MPFactorialTest.java b/tlatools/org.lamport.tlatools/test/pcal/MPFactorialTest.java
similarity index 100%
rename from tlatools/test/pcal/MPFactorialTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MPFactorialTest.java
diff --git a/tlatools/test/pcal/MPNoParamsTest.java b/tlatools/org.lamport.tlatools/test/pcal/MPNoParamsTest.java
similarity index 100%
rename from tlatools/test/pcal/MPNoParamsTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MPNoParamsTest.java
diff --git a/tlatools/test/pcal/MacroQuicksortTest.java b/tlatools/org.lamport.tlatools/test/pcal/MacroQuicksortTest.java
similarity index 100%
rename from tlatools/test/pcal/MacroQuicksortTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MacroQuicksortTest.java
diff --git a/tlatools/test/pcal/MacroRealQuicksortTest.java b/tlatools/org.lamport.tlatools/test/pcal/MacroRealQuicksortTest.java
similarity index 100%
rename from tlatools/test/pcal/MacroRealQuicksortTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MacroRealQuicksortTest.java
diff --git a/tlatools/test/pcal/MergeSortTest.java b/tlatools/org.lamport.tlatools/test/pcal/MergeSortTest.java
similarity index 100%
rename from tlatools/test/pcal/MergeSortTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MergeSortTest.java
diff --git a/tlatools/test/pcal/MissingBodyInWhileTest.java b/tlatools/org.lamport.tlatools/test/pcal/MissingBodyInWhileTest.java
similarity index 100%
rename from tlatools/test/pcal/MissingBodyInWhileTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MissingBodyInWhileTest.java
diff --git a/tlatools/test/pcal/MissingBodyInWithTest.java b/tlatools/org.lamport.tlatools/test/pcal/MissingBodyInWithTest.java
similarity index 100%
rename from tlatools/test/pcal/MissingBodyInWithTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MissingBodyInWithTest.java
diff --git a/tlatools/test/pcal/MultiAssignmentTest.java b/tlatools/org.lamport.tlatools/test/pcal/MultiAssignmentTest.java
similarity index 100%
rename from tlatools/test/pcal/MultiAssignmentTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MultiAssignmentTest.java
diff --git a/tlatools/test/pcal/MultiProc2Test.java b/tlatools/org.lamport.tlatools/test/pcal/MultiProc2Test.java
similarity index 100%
rename from tlatools/test/pcal/MultiProc2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/MultiProc2Test.java
diff --git a/tlatools/test/pcal/MultiprocDefineTest.java b/tlatools/org.lamport.tlatools/test/pcal/MultiprocDefineTest.java
similarity index 100%
rename from tlatools/test/pcal/MultiprocDefineTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/MultiprocDefineTest.java
diff --git a/tlatools/test/pcal/NestedMacrosTest.java b/tlatools/org.lamport.tlatools/test/pcal/NestedMacrosTest.java
similarity index 100%
rename from tlatools/test/pcal/NestedMacrosTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/NestedMacrosTest.java
diff --git a/tlatools/test/pcal/NoLoop2Test.java b/tlatools/org.lamport.tlatools/test/pcal/NoLoop2Test.java
similarity index 100%
rename from tlatools/test/pcal/NoLoop2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/NoLoop2Test.java
diff --git a/tlatools/test/pcal/NoLoopTest.java b/tlatools/org.lamport.tlatools/test/pcal/NoLoopTest.java
similarity index 100%
rename from tlatools/test/pcal/NoLoopTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/NoLoopTest.java
diff --git a/tlatools/test/pcal/NoParamsTest.java b/tlatools/org.lamport.tlatools/test/pcal/NoParamsTest.java
similarity index 100%
rename from tlatools/test/pcal/NoParamsTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/NoParamsTest.java
diff --git a/tlatools/test/pcal/NotSoSimpleLoopTest.java b/tlatools/org.lamport.tlatools/test/pcal/NotSoSimpleLoopTest.java
similarity index 100%
rename from tlatools/test/pcal/NotSoSimpleLoopTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/NotSoSimpleLoopTest.java
diff --git a/tlatools/test/pcal/OptionalSemicolonTest.java b/tlatools/org.lamport.tlatools/test/pcal/OptionalSemicolonTest.java
similarity index 100%
rename from tlatools/test/pcal/OptionalSemicolonTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/OptionalSemicolonTest.java
diff --git a/tlatools/test/pcal/PCalModelCheckerTestCase.java b/tlatools/org.lamport.tlatools/test/pcal/PCalModelCheckerTestCase.java
similarity index 100%
rename from tlatools/test/pcal/PCalModelCheckerTestCase.java
rename to tlatools/org.lamport.tlatools/test/pcal/PCalModelCheckerTestCase.java
diff --git a/tlatools/test/pcal/PCalTest.java b/tlatools/org.lamport.tlatools/test/pcal/PCalTest.java
similarity index 100%
rename from tlatools/test/pcal/PCalTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/PCalTest.java
diff --git a/tlatools/test/pcal/PcalPaxosTest.java b/tlatools/org.lamport.tlatools/test/pcal/PcalPaxosTest.java
similarity index 100%
rename from tlatools/test/pcal/PcalPaxosTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/PcalPaxosTest.java
diff --git a/tlatools/test/pcal/PetersonTest.java b/tlatools/org.lamport.tlatools/test/pcal/PetersonTest.java
similarity index 100%
rename from tlatools/test/pcal/PetersonTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/PetersonTest.java
diff --git a/tlatools/test/pcal/Quicksort2ProcsTest.java b/tlatools/org.lamport.tlatools/test/pcal/Quicksort2ProcsTest.java
similarity index 100%
rename from tlatools/test/pcal/Quicksort2ProcsTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/Quicksort2ProcsTest.java
diff --git a/tlatools/test/pcal/QuicksortMacroTest.java b/tlatools/org.lamport.tlatools/test/pcal/QuicksortMacroTest.java
similarity index 100%
rename from tlatools/test/pcal/QuicksortMacroTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/QuicksortMacroTest.java
diff --git a/tlatools/test/pcal/QuicksortTest.java b/tlatools/org.lamport.tlatools/test/pcal/QuicksortTest.java
similarity index 100%
rename from tlatools/test/pcal/QuicksortTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/QuicksortTest.java
diff --git a/tlatools/test/pcal/RABTest.java b/tlatools/org.lamport.tlatools/test/pcal/RABTest.java
similarity index 100%
rename from tlatools/test/pcal/RABTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/RABTest.java
diff --git a/tlatools/test/pcal/RealQuicksort2Test.java b/tlatools/org.lamport.tlatools/test/pcal/RealQuicksort2Test.java
similarity index 100%
rename from tlatools/test/pcal/RealQuicksort2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/RealQuicksort2Test.java
diff --git a/tlatools/test/pcal/RealQuicksortTest.java b/tlatools/org.lamport.tlatools/test/pcal/RealQuicksortTest.java
similarity index 100%
rename from tlatools/test/pcal/RealQuicksortTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/RealQuicksortTest.java
diff --git a/tlatools/test/pcal/ReallySimpleMultiProcTest.java b/tlatools/org.lamport.tlatools/test/pcal/ReallySimpleMultiProcTest.java
similarity index 100%
rename from tlatools/test/pcal/ReallySimpleMultiProcTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/ReallySimpleMultiProcTest.java
diff --git a/tlatools/test/pcal/SBBTest.java b/tlatools/org.lamport.tlatools/test/pcal/SBBTest.java
similarity index 100%
rename from tlatools/test/pcal/SBBTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/SBBTest.java
diff --git a/tlatools/test/pcal/SemaphoreMutexTest.java b/tlatools/org.lamport.tlatools/test/pcal/SemaphoreMutexTest.java
similarity index 100%
rename from tlatools/test/pcal/SemaphoreMutexTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/SemaphoreMutexTest.java
diff --git a/tlatools/test/pcal/SimpleLoopTest.java b/tlatools/org.lamport.tlatools/test/pcal/SimpleLoopTest.java
similarity index 100%
rename from tlatools/test/pcal/SimpleLoopTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/SimpleLoopTest.java
diff --git a/tlatools/test/pcal/SimpleLoopWithProcedureTest.java b/tlatools/org.lamport.tlatools/test/pcal/SimpleLoopWithProcedureTest.java
similarity index 100%
rename from tlatools/test/pcal/SimpleLoopWithProcedureTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/SimpleLoopWithProcedureTest.java
diff --git a/tlatools/test/pcal/SimpleMultiProcTest.java b/tlatools/org.lamport.tlatools/test/pcal/SimpleMultiProcTest.java
similarity index 100%
rename from tlatools/test/pcal/SimpleMultiProcTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/SimpleMultiProcTest.java
diff --git a/tlatools/test/pcal/StackTestTest.java b/tlatools/org.lamport.tlatools/test/pcal/StackTestTest.java
similarity index 100%
rename from tlatools/test/pcal/StackTestTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/StackTestTest.java
diff --git a/tlatools/test/pcal/StarkMutexTest.java b/tlatools/org.lamport.tlatools/test/pcal/StarkMutexTest.java
similarity index 100%
rename from tlatools/test/pcal/StarkMutexTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/StarkMutexTest.java
diff --git a/tlatools/test/pcal/SubSubTest.java b/tlatools/org.lamport.tlatools/test/pcal/SubSubTest.java
similarity index 100%
rename from tlatools/test/pcal/SubSubTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/SubSubTest.java
diff --git a/tlatools/test/pcal/SyncConsTest.java b/tlatools/org.lamport.tlatools/test/pcal/SyncConsTest.java
similarity index 100%
rename from tlatools/test/pcal/SyncConsTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/SyncConsTest.java
diff --git a/tlatools/test/pcal/TestPCandStackTest.java b/tlatools/org.lamport.tlatools/test/pcal/TestPCandStackTest.java
similarity index 100%
rename from tlatools/test/pcal/TestPCandStackTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/TestPCandStackTest.java
diff --git a/tlatools/test/pcal/TestReplaceTest.java b/tlatools/org.lamport.tlatools/test/pcal/TestReplaceTest.java
similarity index 100%
rename from tlatools/test/pcal/TestReplaceTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/TestReplaceTest.java
diff --git a/tlatools/test/pcal/TestTabsTest.java b/tlatools/org.lamport.tlatools/test/pcal/TestTabsTest.java
similarity index 100%
rename from tlatools/test/pcal/TestTabsTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/TestTabsTest.java
diff --git a/tlatools/test/pcal/TestTest.java b/tlatools/org.lamport.tlatools/test/pcal/TestTest.java
similarity index 100%
rename from tlatools/test/pcal/TestTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/TestTest.java
diff --git a/tlatools/test/pcal/TreeBarrierTest.java b/tlatools/org.lamport.tlatools/test/pcal/TreeBarrierTest.java
similarity index 100%
rename from tlatools/test/pcal/TreeBarrierTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/TreeBarrierTest.java
diff --git a/tlatools/test/pcal/ULCallReturn1Test.java b/tlatools/org.lamport.tlatools/test/pcal/ULCallReturn1Test.java
similarity index 100%
rename from tlatools/test/pcal/ULCallReturn1Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/ULCallReturn1Test.java
diff --git a/tlatools/test/pcal/ULEuclidTest.java b/tlatools/org.lamport.tlatools/test/pcal/ULEuclidTest.java
similarity index 100%
rename from tlatools/test/pcal/ULEuclidTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/ULEuclidTest.java
diff --git a/tlatools/test/pcal/ULEvenOddTest.java b/tlatools/org.lamport.tlatools/test/pcal/ULEvenOddTest.java
similarity index 100%
rename from tlatools/test/pcal/ULEvenOddTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/ULEvenOddTest.java
diff --git a/tlatools/test/pcal/ULFactorial2Test.java b/tlatools/org.lamport.tlatools/test/pcal/ULFactorial2Test.java
similarity index 100%
rename from tlatools/test/pcal/ULFactorial2Test.java
rename to tlatools/org.lamport.tlatools/test/pcal/ULFactorial2Test.java
diff --git a/tlatools/test/pcal/ULQuicksortMacroTest.java b/tlatools/org.lamport.tlatools/test/pcal/ULQuicksortMacroTest.java
similarity index 100%
rename from tlatools/test/pcal/ULQuicksortMacroTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/ULQuicksortMacroTest.java
diff --git a/tlatools/test/pcal/UnhandledInvalidSyntaxTest.java b/tlatools/org.lamport.tlatools/test/pcal/UnhandledInvalidSyntaxTest.java
similarity index 100%
rename from tlatools/test/pcal/UnhandledInvalidSyntaxTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/UnhandledInvalidSyntaxTest.java
diff --git a/tlatools/test/pcal/UniprocDefineTest.java b/tlatools/org.lamport.tlatools/test/pcal/UniprocDefineTest.java
similarity index 100%
rename from tlatools/test/pcal/UniprocDefineTest.java
rename to tlatools/org.lamport.tlatools/test/pcal/UniprocDefineTest.java
diff --git a/tlatools/test/pcal/ValidatorPerformance.java b/tlatools/org.lamport.tlatools/test/pcal/ValidatorPerformance.java
similarity index 100%
rename from tlatools/test/pcal/ValidatorPerformance.java
rename to tlatools/org.lamport.tlatools/test/pcal/ValidatorPerformance.java
diff --git a/tlatools/test/tla2sany/drivers/Bug156TEStackOverflowTest.java b/tlatools/org.lamport.tlatools/test/tla2sany/drivers/Bug156TEStackOverflowTest.java
similarity index 100%
rename from tlatools/test/tla2sany/drivers/Bug156TEStackOverflowTest.java
rename to tlatools/org.lamport.tlatools/test/tla2sany/drivers/Bug156TEStackOverflowTest.java
diff --git a/tlatools/test/tla2sany/drivers/Github429Test.java b/tlatools/org.lamport.tlatools/test/tla2sany/drivers/Github429Test.java
similarity index 100%
rename from tlatools/test/tla2sany/drivers/Github429Test.java
rename to tlatools/org.lamport.tlatools/test/tla2sany/drivers/Github429Test.java
diff --git a/tlatools/test/tla2sany/drivers/IllegalOperatorTest.java b/tlatools/org.lamport.tlatools/test/tla2sany/drivers/IllegalOperatorTest.java
similarity index 100%
rename from tlatools/test/tla2sany/drivers/IllegalOperatorTest.java
rename to tlatools/org.lamport.tlatools/test/tla2sany/drivers/IllegalOperatorTest.java
diff --git a/tlatools/test/tla2sany/st/LocationTest.java b/tlatools/org.lamport.tlatools/test/tla2sany/st/LocationTest.java
similarity index 100%
rename from tlatools/test/tla2sany/st/LocationTest.java
rename to tlatools/org.lamport.tlatools/test/tla2sany/st/LocationTest.java
diff --git a/tlatools/test/tlc2/TLCTest.java b/tlatools/org.lamport.tlatools/test/tlc2/TLCTest.java
similarity index 100%
rename from tlatools/test/tlc2/TLCTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/TLCTest.java
diff --git a/tlatools/test/tlc2/TestDriver.java b/tlatools/org.lamport.tlatools/test/tlc2/TestDriver.java
similarity index 100%
rename from tlatools/test/tlc2/TestDriver.java
rename to tlatools/org.lamport.tlatools/test/tlc2/TestDriver.java
diff --git a/tlatools/test/tlc2/TestMPRecorder.java b/tlatools/org.lamport.tlatools/test/tlc2/TestMPRecorder.java
similarity index 100%
rename from tlatools/test/tlc2/TestMPRecorder.java
rename to tlatools/org.lamport.tlatools/test/tlc2/TestMPRecorder.java
diff --git a/tlatools/test/tlc2/model/AssignmentTest.java b/tlatools/org.lamport.tlatools/test/tlc2/model/AssignmentTest.java
similarity index 100%
rename from tlatools/test/tlc2/model/AssignmentTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/model/AssignmentTest.java
diff --git a/tlatools/test/tlc2/model/FormulaTest.java b/tlatools/org.lamport.tlatools/test/tlc2/model/FormulaTest.java
similarity index 100%
rename from tlatools/test/tlc2/model/FormulaTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/model/FormulaTest.java
diff --git a/tlatools/test/tlc2/model/TypedSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/model/TypedSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/model/TypedSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/model/TypedSetTest.java
diff --git a/tlatools/test/tlc2/module/RandomizationTest.java b/tlatools/org.lamport.tlatools/test/tlc2/module/RandomizationTest.java
similarity index 100%
rename from tlatools/test/tlc2/module/RandomizationTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/module/RandomizationTest.java
diff --git a/tlatools/test/tlc2/module/SequencesTest.java b/tlatools/org.lamport.tlatools/test/tlc2/module/SequencesTest.java
similarity index 100%
rename from tlatools/test/tlc2/module/SequencesTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/module/SequencesTest.java
diff --git a/tlatools/test/tlc2/module/TLCTest.java b/tlatools/org.lamport.tlatools/test/tlc2/module/TLCTest.java
similarity index 100%
rename from tlatools/test/tlc2/module/TLCTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/module/TLCTest.java
diff --git a/tlatools/test/tlc2/output/CFGCopierTest.java b/tlatools/org.lamport.tlatools/test/tlc2/output/CFGCopierTest.java
similarity index 100%
rename from tlatools/test/tlc2/output/CFGCopierTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/output/CFGCopierTest.java
diff --git a/tlatools/test/tlc2/output/MPTest.java b/tlatools/org.lamport.tlatools/test/tlc2/output/MPTest.java
similarity index 100%
rename from tlatools/test/tlc2/output/MPTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/output/MPTest.java
diff --git a/tlatools/test/tlc2/output/SpecTraceExpressionWriterTest.java b/tlatools/org.lamport.tlatools/test/tlc2/output/SpecTraceExpressionWriterTest.java
similarity index 100%
rename from tlatools/test/tlc2/output/SpecTraceExpressionWriterTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/output/SpecTraceExpressionWriterTest.java
diff --git a/tlatools/test/tlc2/output/TLACopierTest.java b/tlatools/org.lamport.tlatools/test/tlc2/output/TLACopierTest.java
similarity index 100%
rename from tlatools/test/tlc2/output/TLACopierTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/output/TLACopierTest.java
diff --git a/tlatools/test/tlc2/tool/.gitattributes b/tlatools/org.lamport.tlatools/test/tlc2/tool/.gitattributes
similarity index 100%
rename from tlatools/test/tlc2/tool/.gitattributes
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/.gitattributes
diff --git a/tlatools/test/tlc2/tool/ASTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/ASTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/ASTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/ASTest.java
diff --git a/tlatools/test/tlc2/tool/AbsoluteSpecPathTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AbsoluteSpecPathTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AbsoluteSpecPathTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AbsoluteSpecPathTest.java
diff --git a/tlatools/test/tlc2/tool/AssertExpressionStack.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AssertExpressionStack.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AssertExpressionStack.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AssertExpressionStack.java
diff --git a/tlatools/test/tlc2/tool/AssignmentInitExpensiveTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentInitExpensiveTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AssignmentInitExpensiveTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentInitExpensiveTest.java
diff --git a/tlatools/test/tlc2/tool/AssignmentInitNegTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentInitNegTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AssignmentInitNegTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentInitNegTest.java
diff --git a/tlatools/test/tlc2/tool/AssignmentInitTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentInitTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AssignmentInitTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentInitTest.java
diff --git a/tlatools/test/tlc2/tool/AssignmentNext2Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentNext2Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AssignmentNext2Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentNext2Test.java
diff --git a/tlatools/test/tlc2/tool/AssignmentNext3Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentNext3Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AssignmentNext3Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentNext3Test.java
diff --git a/tlatools/test/tlc2/tool/AssignmentNextTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentNextTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/AssignmentNextTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/AssignmentNextTest.java
diff --git a/tlatools/test/tlc2/tool/BagsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/BagsTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/BagsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/BagsTest.java
diff --git a/tlatools/test/tlc2/tool/BugzillaBug279Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/BugzillaBug279Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/BugzillaBug279Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/BugzillaBug279Test.java
diff --git a/tlatools/test/tlc2/tool/CodePlexBug21Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/CodePlexBug21Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/CodePlexBug21Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/CodePlexBug21Test.java
diff --git a/tlatools/test/tlc2/tool/CommonTestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/CommonTestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/CommonTestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/CommonTestCase.java
diff --git a/tlatools/test/tlc2/tool/ContinueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/ContinueTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/ContinueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/ContinueTest.java
diff --git a/tlatools/test/tlc2/tool/DepthFirstDieHardTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/DepthFirstDieHardTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/DepthFirstDieHardTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/DepthFirstDieHardTest.java
diff --git a/tlatools/test/tlc2/tool/DepthFirstErrorTraceTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/DepthFirstErrorTraceTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/DepthFirstErrorTraceTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/DepthFirstErrorTraceTest.java
diff --git a/tlatools/test/tlc2/tool/DepthFirstTerminate.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/DepthFirstTerminate.java
similarity index 100%
rename from tlatools/test/tlc2/tool/DepthFirstTerminate.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/DepthFirstTerminate.java
diff --git a/tlatools/test/tlc2/tool/DiameterTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/DiameterTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/DiameterTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/DiameterTest.java
diff --git a/tlatools/test/tlc2/tool/DistributedTrace.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/DistributedTrace.java
similarity index 100%
rename from tlatools/test/tlc2/tool/DistributedTrace.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/DistributedTrace.java
diff --git a/tlatools/test/tlc2/tool/DumpAsDotTest.dot b/tlatools/org.lamport.tlatools/test/tlc2/tool/DumpAsDotTest.dot
similarity index 100%
rename from tlatools/test/tlc2/tool/DumpAsDotTest.dot
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/DumpAsDotTest.dot
diff --git a/tlatools/test/tlc2/tool/DumpAsDotTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/DumpAsDotTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/DumpAsDotTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/DumpAsDotTest.java
diff --git a/tlatools/test/tlc2/tool/EmptySubsetEqTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/EmptySubsetEqTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/EmptySubsetEqTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/EmptySubsetEqTest.java
diff --git a/tlatools/test/tlc2/tool/EmptyTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/EmptyTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/EmptyTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/EmptyTest.java
diff --git a/tlatools/test/tlc2/tool/EvalControlTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/EvalControlTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/EvalControlTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/EvalControlTest.java
diff --git a/tlatools/test/tlc2/tool/FingerprintExceptionInitTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/FingerprintExceptionInitTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/FingerprintExceptionInitTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/FingerprintExceptionInitTest.java
diff --git a/tlatools/test/tlc2/tool/FingerprintExceptionNextTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/FingerprintExceptionNextTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/FingerprintExceptionNextTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/FingerprintExceptionNextTest.java
diff --git a/tlatools/test/tlc2/tool/Github179aTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github179aTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/Github179aTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github179aTest.java
diff --git a/tlatools/test/tlc2/tool/Github179bTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github179bTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/Github179bTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github179bTest.java
diff --git a/tlatools/test/tlc2/tool/Github179cTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github179cTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/Github179cTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github179cTest.java
diff --git a/tlatools/test/tlc2/tool/Github361Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github361Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/Github361Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github361Test.java
diff --git a/tlatools/test/tlc2/tool/Github391Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github391Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/Github391Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github391Test.java
diff --git a/tlatools/test/tlc2/tool/Github407.dump b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github407.dump
similarity index 100%
rename from tlatools/test/tlc2/tool/Github407.dump
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github407.dump
diff --git a/tlatools/test/tlc2/tool/Github407Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github407Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/Github407Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github407Test.java
diff --git a/tlatools/test/tlc2/tool/Github432Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/Github432Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/Github432Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/Github432Test.java
diff --git a/tlatools/test/tlc2/tool/IncompleteNextMultipleActionsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/IncompleteNextMultipleActionsTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/IncompleteNextMultipleActionsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/IncompleteNextMultipleActionsTest.java
diff --git a/tlatools/test/tlc2/tool/IncompleteNextTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/IncompleteNextTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/IncompleteNextTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/IncompleteNextTest.java
diff --git a/tlatools/test/tlc2/tool/InliningTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/InliningTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/InliningTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/InliningTest.java
diff --git a/tlatools/test/tlc2/tool/MinimalSetOfInitStatesTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/MinimalSetOfInitStatesTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/MinimalSetOfInitStatesTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/MinimalSetOfInitStatesTest.java
diff --git a/tlatools/test/tlc2/tool/MinimalSetOfNextStatesTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/MinimalSetOfNextStatesTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/MinimalSetOfNextStatesTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/MinimalSetOfNextStatesTest.java
diff --git a/tlatools/test/tlc2/tool/MinimumDiameterTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/MinimumDiameterTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/MinimumDiameterTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/MinimumDiameterTest.java
diff --git a/tlatools/test/tlc2/tool/PrintTraceRaceTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/PrintTraceRaceTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/PrintTraceRaceTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/PrintTraceRaceTest.java
diff --git a/tlatools/test/tlc2/tool/RandomElementT4Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomElementT4Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomElementT4Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomElementT4Test.java
diff --git a/tlatools/test/tlc2/tool/RandomElementTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomElementTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomElementTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomElementTest.java
diff --git a/tlatools/test/tlc2/tool/RandomElementXandYTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomElementXandYTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomElementXandYTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomElementXandYTest.java
diff --git a/tlatools/test/tlc2/tool/RandomSubset.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubset.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomSubset.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubset.java
diff --git a/tlatools/test/tlc2/tool/RandomSubsetATest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetATest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomSubsetATest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetATest.java
diff --git a/tlatools/test/tlc2/tool/RandomSubsetBTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetBTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomSubsetBTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetBTest.java
diff --git a/tlatools/test/tlc2/tool/RandomSubsetNextT4Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetNextT4Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomSubsetNextT4Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetNextT4Test.java
diff --git a/tlatools/test/tlc2/tool/RandomSubsetNextTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetNextTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomSubsetNextTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetNextTest.java
diff --git a/tlatools/test/tlc2/tool/RandomSubsetSetOfFcnsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetSetOfFcnsTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomSubsetSetOfFcnsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetSetOfFcnsTest.java
diff --git a/tlatools/test/tlc2/tool/RandomSubsetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/RandomSubsetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/RandomSubsetTest.java
diff --git a/tlatools/test/tlc2/tool/SetOfStatesTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/SetOfStatesTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/SetOfStatesTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/SetOfStatesTest.java
diff --git a/tlatools/test/tlc2/tool/SetPredValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/SetPredValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/SetPredValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/SetPredValueTest.java
diff --git a/tlatools/test/tlc2/tool/StandardModulesTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/StandardModulesTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/StandardModulesTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/StandardModulesTest.java
diff --git a/tlatools/test/tlc2/tool/SubsetEqTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/SubsetEqTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/SubsetEqTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/SubsetEqTest.java
diff --git a/tlatools/test/tlc2/tool/TLCGetLevelTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TLCGetLevelTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TLCGetLevelTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TLCGetLevelTest.java
diff --git a/tlatools/test/tlc2/tool/TLCGetNamedUndefinedTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TLCGetNamedUndefinedTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TLCGetNamedUndefinedTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TLCGetNamedUndefinedTest.java
diff --git a/tlatools/test/tlc2/tool/TLCGetNonDeterminismTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TLCGetNonDeterminismTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TLCGetNonDeterminismTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TLCGetNonDeterminismTest.java
diff --git a/tlatools/test/tlc2/tool/TLCSetInitTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TLCSetInitTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TLCSetInitTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TLCSetInitTest.java
diff --git a/tlatools/test/tlc2/tool/TLCSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TLCSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TLCSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TLCSetTest.java
diff --git a/tlatools/test/tlc2/tool/TLCStates.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TLCStates.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TLCStates.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TLCStates.java
diff --git a/tlatools/test/tlc2/tool/TSnapShotTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TSnapShotTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TSnapShotTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TSnapShotTest.java
diff --git a/tlatools/test/tlc2/tool/TraceWithLargeSetOfInitialStatesTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/TraceWithLargeSetOfInitialStatesTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/TraceWithLargeSetOfInitialStatesTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/TraceWithLargeSetOfInitialStatesTest.java
diff --git a/tlatools/test/tlc2/tool/UserModuleOverrideAnnotationTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/UserModuleOverrideAnnotationTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/UserModuleOverrideAnnotationTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/UserModuleOverrideAnnotationTest.java
diff --git a/tlatools/test/tlc2/tool/UserModuleOverrideFromJarTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/UserModuleOverrideFromJarTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/UserModuleOverrideFromJarTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/UserModuleOverrideFromJarTest.java
diff --git a/tlatools/test/tlc2/tool/UserModuleOverrideTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/UserModuleOverrideTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/UserModuleOverrideTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/UserModuleOverrideTest.java
diff --git a/tlatools/test/tlc2/tool/ViewMapTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/ViewMapTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/ViewMapTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/ViewMapTest.java
diff --git a/tlatools/test/tlc2/tool/checkpoint/CheckpointOnViolationTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/checkpoint/CheckpointOnViolationTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/checkpoint/CheckpointOnViolationTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/checkpoint/CheckpointOnViolationTest.java
diff --git a/tlatools/test/tlc2/tool/checkpoint/CheckpointWhenTimeBoundTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/checkpoint/CheckpointWhenTimeBoundTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/checkpoint/CheckpointWhenTimeBoundTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/checkpoint/CheckpointWhenTimeBoundTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/ACoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/ACoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/ACoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/ACoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/AbstractCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/AbstractCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/AbstractCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/AbstractCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/BCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/BCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/BCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/BCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/CCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/CCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/CCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/CCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/CoverageStatisticsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/CoverageStatisticsTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/CoverageStatisticsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/CoverageStatisticsTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/DCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/DCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/DCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/DCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/ECoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/ECoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/ECoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/ECoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/FCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/FCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/FCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/FCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/GCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/GCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/GCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/GCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/Github314CoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/Github314CoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/Github314CoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/Github314CoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/Github377CoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/Github377CoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/Github377CoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/Github377CoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/HCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/HCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/HCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/HCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/ICoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/ICoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/ICoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/ICoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/JCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/JCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/JCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/JCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/KCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/KCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/KCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/KCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/LCoverageTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/LCoverageTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/LCoverageTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/LCoverageTest.java
diff --git a/tlatools/test/tlc2/tool/coverage/OpApplNodeWrapperTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/OpApplNodeWrapperTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/coverage/OpApplNodeWrapperTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/coverage/OpApplNodeWrapperTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/DieHardDistributedTLCTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DieHardDistributedTLCTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/DieHardDistributedTLCTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DieHardDistributedTLCTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorEvalExceptionTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorEvalExceptionTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorEvalExceptionTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorEvalExceptionTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantContinueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantContinueTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantContinueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantContinueTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedDoInitFunctorInvariantTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/DistributedTLCTestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedTLCTestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/DistributedTLCTestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/DistributedTLCTestCase.java
diff --git a/tlatools/test/tlc2/tool/distributed/EWD840DistributedTLCTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/EWD840DistributedTLCTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/EWD840DistributedTLCTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/EWD840DistributedTLCTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/EWD840DistributedWithFPSetTLCTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/EWD840DistributedWithFPSetTLCTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/EWD840DistributedWithFPSetTLCTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/EWD840DistributedWithFPSetTLCTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/TLCServerTestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TLCServerTestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/TLCServerTestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TLCServerTestCase.java
diff --git a/tlatools/test/tlc2/tool/distributed/TLCSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TLCSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/TLCSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TLCSetTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/TLCWorkerSmartProxyTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TLCWorkerSmartProxyTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/TLCWorkerSmartProxyTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TLCWorkerSmartProxyTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/TSnapShotDistributedTLCTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TSnapShotDistributedTLCTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/TSnapShotDistributedTLCTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/TSnapShotDistributedTLCTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/fp/DynamicFPSetManagerTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/fp/DynamicFPSetManagerTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/fp/DynamicFPSetManagerTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/fp/DynamicFPSetManagerTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/fp/FPSetManagerTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/fp/FPSetManagerTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/fp/FPSetManagerTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/fp/FPSetManagerTest.java
diff --git a/tlatools/test/tlc2/tool/distributed/fp/FaultyFPSet.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/fp/FaultyFPSet.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/fp/FaultyFPSet.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/fp/FaultyFPSet.java
diff --git a/tlatools/test/tlc2/tool/distributed/selector/DummyTLCWorker.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/selector/DummyTLCWorker.java
similarity index 100%
rename from tlatools/test/tlc2/tool/distributed/selector/DummyTLCWorker.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/distributed/selector/DummyTLCWorker.java
diff --git a/tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorEvalExceptionTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorEvalExceptionTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorEvalExceptionTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorEvalExceptionTest.java
diff --git a/tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantContinueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantContinueTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantContinueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantContinueTest.java
diff --git a/tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantMinimalErrorStackTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantMinimalErrorStackTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantMinimalErrorStackTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantMinimalErrorStackTest.java
diff --git a/tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantNoContinueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantNoContinueTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantNoContinueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantNoContinueTest.java
diff --git a/tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorInvariantTest.java
diff --git a/tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorPropertyTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorPropertyTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorPropertyTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/doinitfunctor/DoInitFunctorPropertyTest.java
diff --git a/tlatools/test/tlc2/tool/evalorder/InitEvalOrder1Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder1Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/evalorder/InitEvalOrder1Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder1Test.java
diff --git a/tlatools/test/tlc2/tool/evalorder/InitEvalOrder2Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder2Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/evalorder/InitEvalOrder2Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder2Test.java
diff --git a/tlatools/test/tlc2/tool/evalorder/InitEvalOrder3Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder3Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/evalorder/InitEvalOrder3Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder3Test.java
diff --git a/tlatools/test/tlc2/tool/evalorder/InitEvalOrder4Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder4Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/evalorder/InitEvalOrder4Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrder4Test.java
diff --git a/tlatools/test/tlc2/tool/evalorder/InitEvalOrderBasicTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrderBasicTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/evalorder/InitEvalOrderBasicTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrderBasicTest.java
diff --git a/tlatools/test/tlc2/tool/evalorder/InitEvalOrderTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrderTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/evalorder/InitEvalOrderTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/evalorder/InitEvalOrderTest.java
diff --git a/tlatools/test/tlc2/tool/fp/AbstractFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/AbstractFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/AbstractFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/AbstractFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/AbstractHeapBasedDiskFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/AbstractHeapBasedDiskFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/AbstractHeapBasedDiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/AbstractHeapBasedDiskFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/Bug210DiskFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/Bug210DiskFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/Bug210DiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/Bug210DiskFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/Bug242DiskFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/Bug242DiskFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/Bug242DiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/Bug242DiskFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/Bug246DiskFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/Bug246DiskFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/Bug246DiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/Bug246DiskFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/DummyDiskFPSet.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/DummyDiskFPSet.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/DummyDiskFPSet.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/DummyDiskFPSet.java
diff --git a/tlatools/test/tlc2/tool/fp/DummyFPSetConfiguration.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/DummyFPSetConfiguration.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/DummyFPSetConfiguration.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/DummyFPSetConfiguration.java
diff --git a/tlatools/test/tlc2/tool/fp/FPSetFactoryTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/FPSetFactoryTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/FPSetFactoryTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/FPSetFactoryTest.java
diff --git a/tlatools/test/tlc2/tool/fp/LSBDiskFPsetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/LSBDiskFPsetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/LSBDiskFPsetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/LSBDiskFPsetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/LongArrayTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/LongArrayTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/LongArrayTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/LongArrayTest.java
diff --git a/tlatools/test/tlc2/tool/fp/LongArraysTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/LongArraysTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/LongArraysTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/LongArraysTest.java
diff --git a/tlatools/test/tlc2/tool/fp/MSBDiskFPSetTest2.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/MSBDiskFPSetTest2.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/MSBDiskFPSetTest2.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/MSBDiskFPSetTest2.java
diff --git a/tlatools/test/tlc2/tool/fp/MultiFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/MultiFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/MultiFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/MultiFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/OffHeapDiskFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/OffHeapDiskFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/OffHeapDiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/OffHeapDiskFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/OffHeapIndexerTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/OffHeapIndexerTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/OffHeapIndexerTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/OffHeapIndexerTest.java
diff --git a/tlatools/test/tlc2/tool/fp/OffHeapIteratorTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/OffHeapIteratorTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/OffHeapIteratorTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/OffHeapIteratorTest.java
diff --git a/tlatools/test/tlc2/tool/fp/ShortDiskFPSetTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/ShortDiskFPSetTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/ShortDiskFPSetTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/ShortDiskFPSetTest.java
diff --git a/tlatools/test/tlc2/tool/fp/iterator/TLCIterator1Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/iterator/TLCIterator1Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/iterator/TLCIterator1Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/iterator/TLCIterator1Test.java
diff --git a/tlatools/test/tlc2/tool/fp/iterator/TLCIterator2Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/iterator/TLCIterator2Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/iterator/TLCIterator2Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/iterator/TLCIterator2Test.java
diff --git a/tlatools/test/tlc2/tool/fp/iterator/TLCIteratorTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/fp/iterator/TLCIteratorTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/fp/iterator/TLCIteratorTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/fp/iterator/TLCIteratorTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/AbstractDiskGraph.JPG b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/AbstractDiskGraph.JPG
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/AbstractDiskGraph.JPG
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/AbstractDiskGraph.JPG
diff --git a/tlatools/test/tlc2/tool/liveness/April20aTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April20aTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/April20aTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April20aTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/April20bTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April20bTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/April20bTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April20bTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/April21Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April21Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/April21Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April21Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/April22Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April22Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/April22Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April22Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/April25Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April25Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/April25Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April25Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/April29Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April29Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/April29Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April29Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/April29dTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April29dTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/April29dTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/April29dTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BxTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BxTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BxTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1BxTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1ByTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1ByTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1ByTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1ByTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions1Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CxTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CxTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CxTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CxTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CyTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CyTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CyTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2CyTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/BidirectionalTransitions2Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTestA.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTestA.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTestA.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ChooseTableauSymmetryTestA.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08AgentRingTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08AgentRingTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08AgentRingTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08AgentRingTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL1Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL1Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL1Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL1Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2FromCheckpointTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2FromCheckpointTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2FromCheckpointTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2FromCheckpointTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL2Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL3Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL3Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL3Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL3Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL4Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL4Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL4Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08EWD840FL4Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/CodePlexBug08aTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08aTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/CodePlexBug08aTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/CodePlexBug08aTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/DiskGraphTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/DiskGraphTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/DiskGraphTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/DiskGraphTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/EmptyOrderOfSolutionsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/EmptyOrderOfSolutionsTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/EmptyOrderOfSolutionsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/EmptyOrderOfSolutionsTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/ErrorTraceConstructionTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ErrorTraceConstructionTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/ErrorTraceConstructionTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ErrorTraceConstructionTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/GraphNodeTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/GraphNodeTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/GraphNodeTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/GraphNodeTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/LivenessConstraintWarning.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LivenessConstraintWarning.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/LivenessConstraintWarning.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LivenessConstraintWarning.java
diff --git a/tlatools/test/tlc2/tool/liveness/LivenessSymmetryWarning.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LivenessSymmetryWarning.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/LivenessSymmetryWarning.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LivenessSymmetryWarning.java
diff --git a/tlatools/test/tlc2/tool/liveness/LoopTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LoopTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/LoopTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LoopTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/LoopTestForcedPartial.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LoopTestForcedPartial.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/LoopTestForcedPartial.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LoopTestForcedPartial.java
diff --git a/tlatools/test/tlc2/tool/liveness/LoopTestWeakFair.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LoopTestWeakFair.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/LoopTestWeakFair.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/LoopTestWeakFair.java
diff --git a/tlatools/test/tlc2/tool/liveness/May09Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/May09Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/May09Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/May09Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/May09dTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/May09dTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/May09dTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/May09dTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/ModelCheckerTestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ModelCheckerTestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/ModelCheckerTestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/ModelCheckerTestCase.java
diff --git a/tlatools/test/tlc2/tool/liveness/NQTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/NQTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/NQTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/NQTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/NQaTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/NQaTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/NQaTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/NQaTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/NoSymmetryTableauModelCheckerTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/NoSymmetryTableauModelCheckerTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/NoSymmetryTableauModelCheckerTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/NoSymmetryTableauModelCheckerTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/OneBitMutexNoSymmetryTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/OneBitMutexNoSymmetryTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/OneBitMutexNoSymmetryTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/OneBitMutexNoSymmetryTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/OneBitMutexTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/OneBitMutexTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/OneBitMutexTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/OneBitMutexTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3.java
diff --git a/tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3a.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3a.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3a.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTest3a.java
diff --git a/tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLong.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLong.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLong.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLong.java
diff --git a/tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLonga.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLonga.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLonga.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryModelCheckerTestLonga.java
diff --git a/tlatools/test/tlc2/tool/liveness/SymmetryTableauLiveCheckTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryTableauLiveCheckTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/SymmetryTableauLiveCheckTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryTableauLiveCheckTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/SymmetryTableauModelCheckerTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryTableauModelCheckerTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/SymmetryTableauModelCheckerTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/SymmetryTableauModelCheckerTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/TableauDiskGraphTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TableauDiskGraphTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/TableauDiskGraphTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TableauDiskGraphTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/TableauNodePtrTableTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TableauNodePtrTableTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/TableauNodePtrTableTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TableauNodePtrTableTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/TableauSymmetryTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TableauSymmetryTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/TableauSymmetryTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TableauSymmetryTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/Test3.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/Test3.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/Test3.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/Test3.java
diff --git a/tlatools/test/tlc2/tool/liveness/TwoPhaseCommitTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TwoPhaseCommitTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/TwoPhaseCommitTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/TwoPhaseCommitTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestA.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestA.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestA.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestA.java
diff --git a/tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestB.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestB.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestB.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/UnsymmetricModelCheckerTestB.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/AbstractExampleTestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/AbstractExampleTestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/AbstractExampleTestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/AbstractExampleTestCase.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/Example1Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/Example1Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/Example1Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/Example1Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/Example2Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/Example2Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/Example2Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/Example2Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample1Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample1Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample1Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample1Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample2Test.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample2Test.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample2Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckExample2Test.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2a.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2a.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2a.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckSimulationTest2a.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/LiveCheckTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/LiveCheckTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/LiveCheckTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2a.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2a.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2a.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/SimulationTest2a.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/StutteringTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/StutteringTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/StutteringTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/StutteringTest.java
diff --git a/tlatools/test/tlc2/tool/liveness/simulation/SuccessfulSimulationTestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/SuccessfulSimulationTestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/liveness/simulation/SuccessfulSimulationTestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/liveness/simulation/SuccessfulSimulationTestCase.java
diff --git a/tlatools/test/tlc2/tool/other/CheckFP.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/other/CheckFP.java
similarity index 100%
rename from tlatools/test/tlc2/tool/other/CheckFP.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/other/CheckFP.java
diff --git a/tlatools/test/tlc2/tool/other/CurrentDir.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/other/CurrentDir.java
similarity index 100%
rename from tlatools/test/tlc2/tool/other/CurrentDir.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/other/CurrentDir.java
diff --git a/tlatools/test/tlc2/tool/other/FileClassLoader.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/other/FileClassLoader.java
similarity index 100%
rename from tlatools/test/tlc2/tool/other/FileClassLoader.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/other/FileClassLoader.java
diff --git a/tlatools/test/tlc2/tool/queue/DummyTLCState.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/queue/DummyTLCState.java
similarity index 100%
rename from tlatools/test/tlc2/tool/queue/DummyTLCState.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/queue/DummyTLCState.java
diff --git a/tlatools/test/tlc2/tool/queue/StateQueueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/queue/StateQueueTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/queue/StateQueueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/queue/StateQueueTest.java
diff --git a/tlatools/test/tlc2/tool/simulation/NQSpecTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/NQSpecTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/simulation/NQSpecTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/NQSpecTest.java
diff --git a/tlatools/test/tlc2/tool/simulation/SimulationWorkerTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/SimulationWorkerTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/simulation/SimulationWorkerTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/SimulationWorkerTest.java
diff --git a/tlatools/test/tlc2/tool/simulation/SimulatorMultiThreadTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/SimulatorMultiThreadTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/simulation/SimulatorMultiThreadTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/SimulatorMultiThreadTest.java
diff --git a/tlatools/test/tlc2/tool/simulation/SimulatorTest.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/SimulatorTest.java
similarity index 100%
rename from tlatools/test/tlc2/tool/simulation/SimulatorTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/simulation/SimulatorTest.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest1.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest1.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest1.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest1.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest10.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest10.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest10.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest10.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest11.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest11.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest11.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest11.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest12.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest12.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest12.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest12.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest13.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest13.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest13.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest13.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest14.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest14.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest14.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest14.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest15.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest15.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest15.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest15.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest16.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest16.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest16.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest16.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest2.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest2.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest2.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest2.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest3.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest3.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest3.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest3.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest4.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest4.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest4.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest4.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest5.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest5.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest5.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest5.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest6.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest6.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest6.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest6.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest7.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest7.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest7.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest7.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest8.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest8.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest8.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest8.java
diff --git a/tlatools/test/tlc2/tool/suite/ETest9.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest9.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/ETest9.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/ETest9.java
diff --git a/tlatools/test/tlc2/tool/suite/SuiteETestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/SuiteETestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/SuiteETestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/SuiteETestCase.java
diff --git a/tlatools/test/tlc2/tool/suite/SuiteTestCase.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/SuiteTestCase.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/SuiteTestCase.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/SuiteTestCase.java
diff --git a/tlatools/test/tlc2/tool/suite/Test1.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test1.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test1.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test1.java
diff --git a/tlatools/test/tlc2/tool/suite/Test10.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test10.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test10.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test10.java
diff --git a/tlatools/test/tlc2/tool/suite/Test11.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test11.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test11.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test11.java
diff --git a/tlatools/test/tlc2/tool/suite/Test12.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test12.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test12.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test12.java
diff --git a/tlatools/test/tlc2/tool/suite/Test13.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test13.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test13.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test13.java
diff --git a/tlatools/test/tlc2/tool/suite/Test14.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test14.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test14.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test14.java
diff --git a/tlatools/test/tlc2/tool/suite/Test15.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test15.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test15.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test15.java
diff --git a/tlatools/test/tlc2/tool/suite/Test16.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test16.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test16.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test16.java
diff --git a/tlatools/test/tlc2/tool/suite/Test17.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test17.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test17.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test17.java
diff --git a/tlatools/test/tlc2/tool/suite/Test18.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test18.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test18.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test18.java
diff --git a/tlatools/test/tlc2/tool/suite/Test19.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test19.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test19.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test19.java
diff --git a/tlatools/test/tlc2/tool/suite/Test2.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test2.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test2.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test2.java
diff --git a/tlatools/test/tlc2/tool/suite/Test20.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test20.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test20.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test20.java
diff --git a/tlatools/test/tlc2/tool/suite/Test201.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test201.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test201.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test201.java
diff --git a/tlatools/test/tlc2/tool/suite/Test202.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test202.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test202.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test202.java
diff --git a/tlatools/test/tlc2/tool/suite/Test203.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test203.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test203.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test203.java
diff --git a/tlatools/test/tlc2/tool/suite/Test204.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test204.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test204.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test204.java
diff --git a/tlatools/test/tlc2/tool/suite/Test205.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test205.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test205.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test205.java
diff --git a/tlatools/test/tlc2/tool/suite/Test206.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test206.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test206.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test206.java
diff --git a/tlatools/test/tlc2/tool/suite/Test207.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test207.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test207.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test207.java
diff --git a/tlatools/test/tlc2/tool/suite/Test208.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test208.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test208.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test208.java
diff --git a/tlatools/test/tlc2/tool/suite/Test209.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test209.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test209.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test209.java
diff --git a/tlatools/test/tlc2/tool/suite/Test21.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test21.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test21.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test21.java
diff --git a/tlatools/test/tlc2/tool/suite/Test210.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test210.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test210.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test210.java
diff --git a/tlatools/test/tlc2/tool/suite/Test212.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test212.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test212.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test212.java
diff --git a/tlatools/test/tlc2/tool/suite/Test213.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test213.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test213.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test213.java
diff --git a/tlatools/test/tlc2/tool/suite/Test214.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test214.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test214.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test214.java
diff --git a/tlatools/test/tlc2/tool/suite/Test215.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test215.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test215.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test215.java
diff --git a/tlatools/test/tlc2/tool/suite/Test216.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test216.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test216.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test216.java
diff --git a/tlatools/test/tlc2/tool/suite/Test217.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test217.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test217.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test217.java
diff --git a/tlatools/test/tlc2/tool/suite/Test219.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test219.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test219.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test219.java
diff --git a/tlatools/test/tlc2/tool/suite/Test22.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test22.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test22.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test22.java
diff --git a/tlatools/test/tlc2/tool/suite/Test23.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test23.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test23.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test23.java
diff --git a/tlatools/test/tlc2/tool/suite/Test24.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test24.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test24.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test24.java
diff --git a/tlatools/test/tlc2/tool/suite/Test25.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test25.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test25.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test25.java
diff --git a/tlatools/test/tlc2/tool/suite/Test26.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test26.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test26.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test26.java
diff --git a/tlatools/test/tlc2/tool/suite/Test27.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test27.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test27.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test27.java
diff --git a/tlatools/test/tlc2/tool/suite/Test28.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test28.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test28.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test28.java
diff --git a/tlatools/test/tlc2/tool/suite/Test29.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test29.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test29.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test29.java
diff --git a/tlatools/test/tlc2/tool/suite/Test3.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test3.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test3.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test3.java
diff --git a/tlatools/test/tlc2/tool/suite/Test30.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test30.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test30.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test30.java
diff --git a/tlatools/test/tlc2/tool/suite/Test31.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test31.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test31.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test31.java
diff --git a/tlatools/test/tlc2/tool/suite/Test32.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test32.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test32.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test32.java
diff --git a/tlatools/test/tlc2/tool/suite/Test33.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test33.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test33.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test33.java
diff --git a/tlatools/test/tlc2/tool/suite/Test34.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test34.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test34.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test34.java
diff --git a/tlatools/test/tlc2/tool/suite/Test35.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test35.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test35.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test35.java
diff --git a/tlatools/test/tlc2/tool/suite/Test36.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test36.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test36.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test36.java
diff --git a/tlatools/test/tlc2/tool/suite/Test37.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test37.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test37.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test37.java
diff --git a/tlatools/test/tlc2/tool/suite/Test38.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test38.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test38.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test38.java
diff --git a/tlatools/test/tlc2/tool/suite/Test39.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test39.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test39.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test39.java
diff --git a/tlatools/test/tlc2/tool/suite/Test4.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test4.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test4.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test4.java
diff --git a/tlatools/test/tlc2/tool/suite/Test40.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test40.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test40.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test40.java
diff --git a/tlatools/test/tlc2/tool/suite/Test41.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test41.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test41.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test41.java
diff --git a/tlatools/test/tlc2/tool/suite/Test42.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test42.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test42.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test42.java
diff --git a/tlatools/test/tlc2/tool/suite/Test43.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test43.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test43.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test43.java
diff --git a/tlatools/test/tlc2/tool/suite/Test44.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test44.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test44.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test44.java
diff --git a/tlatools/test/tlc2/tool/suite/Test45.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test45.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test45.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test45.java
diff --git a/tlatools/test/tlc2/tool/suite/Test46.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test46.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test46.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test46.java
diff --git a/tlatools/test/tlc2/tool/suite/Test47.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test47.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test47.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test47.java
diff --git a/tlatools/test/tlc2/tool/suite/Test48.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test48.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test48.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test48.java
diff --git a/tlatools/test/tlc2/tool/suite/Test49.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test49.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test49.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test49.java
diff --git a/tlatools/test/tlc2/tool/suite/Test5.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test5.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test5.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test5.java
diff --git a/tlatools/test/tlc2/tool/suite/Test50.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test50.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test50.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test50.java
diff --git a/tlatools/test/tlc2/tool/suite/Test51.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test51.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test51.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test51.java
diff --git a/tlatools/test/tlc2/tool/suite/Test52.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test52.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test52.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test52.java
diff --git a/tlatools/test/tlc2/tool/suite/Test53.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test53.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test53.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test53.java
diff --git a/tlatools/test/tlc2/tool/suite/Test54.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test54.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test54.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test54.java
diff --git a/tlatools/test/tlc2/tool/suite/Test55.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test55.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test55.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test55.java
diff --git a/tlatools/test/tlc2/tool/suite/Test56.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test56.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test56.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test56.java
diff --git a/tlatools/test/tlc2/tool/suite/Test57.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test57.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test57.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test57.java
diff --git a/tlatools/test/tlc2/tool/suite/Test58.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test58.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test58.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test58.java
diff --git a/tlatools/test/tlc2/tool/suite/Test59.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test59.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test59.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test59.java
diff --git a/tlatools/test/tlc2/tool/suite/Test6.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test6.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test6.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test6.java
diff --git a/tlatools/test/tlc2/tool/suite/Test60.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test60.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test60.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test60.java
diff --git a/tlatools/test/tlc2/tool/suite/Test61.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test61.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test61.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test61.java
diff --git a/tlatools/test/tlc2/tool/suite/Test62.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test62.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test62.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test62.java
diff --git a/tlatools/test/tlc2/tool/suite/Test63.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test63.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test63.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test63.java
diff --git a/tlatools/test/tlc2/tool/suite/Test63a.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test63a.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test63a.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test63a.java
diff --git a/tlatools/test/tlc2/tool/suite/Test64.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test64.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test64.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test64.java
diff --git a/tlatools/test/tlc2/tool/suite/Test64a.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test64a.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test64a.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test64a.java
diff --git a/tlatools/test/tlc2/tool/suite/Test65.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test65.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test65.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test65.java
diff --git a/tlatools/test/tlc2/tool/suite/Test65a.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test65a.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test65a.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test65a.java
diff --git a/tlatools/test/tlc2/tool/suite/Test7.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test7.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test7.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test7.java
diff --git a/tlatools/test/tlc2/tool/suite/Test8.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test8.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test8.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test8.java
diff --git a/tlatools/test/tlc2/tool/suite/Test9.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test9.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test9.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test9.java
diff --git a/tlatools/test/tlc2/tool/suite/Test99.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test99.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test99.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test99.java
diff --git a/tlatools/test/tlc2/tool/suite/Test999.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test999.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/Test999.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/Test999.java
diff --git a/tlatools/test/tlc2/tool/suite/TestInvalidInvariant.java b/tlatools/org.lamport.tlatools/test/tlc2/tool/suite/TestInvalidInvariant.java
similarity index 100%
rename from tlatools/test/tlc2/tool/suite/TestInvalidInvariant.java
rename to tlatools/org.lamport.tlatools/test/tlc2/tool/suite/TestInvalidInvariant.java
diff --git a/tlatools/test/tlc2/util/BitVectorTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/BitVectorTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/BitVectorTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/BitVectorTest.java
diff --git a/tlatools/test/tlc2/util/BufferedRandomAccessFileTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/BufferedRandomAccessFileTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/BufferedRandomAccessFileTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/BufferedRandomAccessFileTest.java
diff --git a/tlatools/test/tlc2/util/ByteUtilsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/ByteUtilsTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/ByteUtilsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/ByteUtilsTest.java
diff --git a/tlatools/test/tlc2/util/CombinatoricsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/CombinatoricsTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/CombinatoricsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/CombinatoricsTest.java
diff --git a/tlatools/test/tlc2/util/ContextTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/ContextTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/ContextTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/ContextTest.java
diff --git a/tlatools/test/tlc2/util/FP64Test.java b/tlatools/org.lamport.tlatools/test/tlc2/util/FP64Test.java
similarity index 100%
rename from tlatools/test/tlc2/util/FP64Test.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/FP64Test.java
diff --git a/tlatools/test/tlc2/util/GrowingLongVecTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/GrowingLongVecTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/GrowingLongVecTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/GrowingLongVecTest.java
diff --git a/tlatools/test/tlc2/util/LongVecTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/LongVecTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/LongVecTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/LongVecTest.java
diff --git a/tlatools/test/tlc2/util/MemIntQueueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/MemIntQueueTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/MemIntQueueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/MemIntQueueTest.java
diff --git a/tlatools/test/tlc2/util/MemIntStackTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/MemIntStackTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/MemIntStackTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/MemIntStackTest.java
diff --git a/tlatools/test/tlc2/util/SynchronousDiskIntStackTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/SynchronousDiskIntStackTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/SynchronousDiskIntStackTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/SynchronousDiskIntStackTest.java
diff --git a/tlatools/test/tlc2/util/statistics/BucketStatisticsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/statistics/BucketStatisticsTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/statistics/BucketStatisticsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/statistics/BucketStatisticsTest.java
diff --git a/tlatools/test/tlc2/util/statistics/FixedSizedBucketStatisticsTest.java b/tlatools/org.lamport.tlatools/test/tlc2/util/statistics/FixedSizedBucketStatisticsTest.java
similarity index 100%
rename from tlatools/test/tlc2/util/statistics/FixedSizedBucketStatisticsTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/util/statistics/FixedSizedBucketStatisticsTest.java
diff --git a/tlatools/test/tlc2/value/ValueInputOutputStreamTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/ValueInputOutputStreamTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/ValueInputOutputStreamTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/ValueInputOutputStreamTest.java
diff --git a/tlatools/test/tlc2/value/impl/EnumerableValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/EnumerableValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/EnumerableValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/EnumerableValueTest.java
diff --git a/tlatools/test/tlc2/value/impl/InitializeValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/InitializeValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/InitializeValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/InitializeValueTest.java
diff --git a/tlatools/test/tlc2/value/impl/IntervalValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/IntervalValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/IntervalValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/IntervalValueTest.java
diff --git a/tlatools/test/tlc2/value/impl/RecordValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/RecordValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/RecordValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/RecordValueTest.java
diff --git a/tlatools/test/tlc2/value/impl/SetOfFcnsValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/SetOfFcnsValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/SetOfFcnsValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/SetOfFcnsValueTest.java
diff --git a/tlatools/test/tlc2/value/impl/SetOfRcrdValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/SetOfRcrdValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/SetOfRcrdValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/SetOfRcrdValueTest.java
diff --git a/tlatools/test/tlc2/value/impl/SetOfTuplesValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/SetOfTuplesValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/SetOfTuplesValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/SetOfTuplesValueTest.java
diff --git a/tlatools/test/tlc2/value/impl/SubsetEnumeratorTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/SubsetEnumeratorTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/SubsetEnumeratorTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/SubsetEnumeratorTest.java
diff --git a/tlatools/test/tlc2/value/impl/SubsetValueTest.java b/tlatools/org.lamport.tlatools/test/tlc2/value/impl/SubsetValueTest.java
similarity index 100%
rename from tlatools/test/tlc2/value/impl/SubsetValueTest.java
rename to tlatools/org.lamport.tlatools/test/tlc2/value/impl/SubsetValueTest.java
diff --git a/tlatools/test/util/ExecutionStatisticsCollectorTest.java b/tlatools/org.lamport.tlatools/test/util/ExecutionStatisticsCollectorTest.java
similarity index 100%
rename from tlatools/test/util/ExecutionStatisticsCollectorTest.java
rename to tlatools/org.lamport.tlatools/test/util/ExecutionStatisticsCollectorTest.java
diff --git a/tlatools/test/util/IsolatedTestCaseRunner.java b/tlatools/org.lamport.tlatools/test/util/IsolatedTestCaseRunner.java
similarity index 100%
rename from tlatools/test/util/IsolatedTestCaseRunner.java
rename to tlatools/org.lamport.tlatools/test/util/IsolatedTestCaseRunner.java
diff --git a/tlatools/test/util/SimpleFilenameToStreamTest.java b/tlatools/org.lamport.tlatools/test/util/SimpleFilenameToStreamTest.java
similarity index 100%
rename from tlatools/test/util/SimpleFilenameToStreamTest.java
rename to tlatools/org.lamport.tlatools/test/util/SimpleFilenameToStreamTest.java
diff --git a/tlatools/test/util/StringHelperTest.java b/tlatools/org.lamport.tlatools/test/util/StringHelperTest.java
similarity index 100%
rename from tlatools/test/util/StringHelperTest.java
rename to tlatools/org.lamport.tlatools/test/util/StringHelperTest.java
diff --git a/tlatools/test/util/TLCRuntimeTest.java b/tlatools/org.lamport.tlatools/test/util/TLCRuntimeTest.java
similarity index 100%
rename from tlatools/test/util/TLCRuntimeTest.java
rename to tlatools/org.lamport.tlatools/test/util/TLCRuntimeTest.java
diff --git a/tlatools/test/util/TestPrintStream.java b/tlatools/org.lamport.tlatools/test/util/TestPrintStream.java
similarity index 100%
rename from tlatools/test/util/TestPrintStream.java
rename to tlatools/org.lamport.tlatools/test/util/TestPrintStream.java
diff --git a/org.lamport.tla.toolbox.doc/.classpath b/toolbox/org.lamport.tla.toolbox.doc/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.doc/.classpath
rename to toolbox/org.lamport.tla.toolbox.doc/.classpath
diff --git a/org.lamport.tla.toolbox.doc/.project b/toolbox/org.lamport.tla.toolbox.doc/.project
similarity index 100%
rename from org.lamport.tla.toolbox.doc/.project
rename to toolbox/org.lamport.tla.toolbox.doc/.project
diff --git a/org.lamport.tla.toolbox.doc/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.doc/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.doc/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.doc/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.doc/.settings/org.eclipse.wst.html.core.prefs b/toolbox/org.lamport.tla.toolbox.doc/.settings/org.eclipse.wst.html.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.doc/.settings/org.eclipse.wst.html.core.prefs
rename to toolbox/org.lamport.tla.toolbox.doc/.settings/org.eclipse.wst.html.core.prefs
diff --git a/org.lamport.tla.toolbox.doc/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.doc/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.doc/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.doc/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.doc/build.properties b/toolbox/org.lamport.tla.toolbox.doc/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.doc/build.properties
rename to toolbox/org.lamport.tla.toolbox.doc/build.properties
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/EMailResult.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/EMailResult.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/EMailResult.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/EMailResult.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/FinalResultLoaded.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/FinalResultLoaded.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/FinalResultLoaded.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/FinalResultLoaded.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/LoadIntoResultPageB.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/LoadIntoResultPageB.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/LoadIntoResultPageB.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/LoadIntoResultPageB.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/LoadResultIntoToolbox.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/LoadResultIntoToolbox.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/LoadResultIntoToolbox.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/LoadResultIntoToolbox.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/MCoutInBrowser.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/MCoutInBrowser.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/MCoutInBrowser.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/MCoutInBrowser.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorA.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorA.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorA.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorA.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorB.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorB.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorB.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorB.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorC.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorC.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorC.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorC.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorD.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorD.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorD.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ModelEditorD.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBar.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBar.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBar.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBar.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBarFinal.png b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBarFinal.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBarFinal.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/ProgressBarFinal.png
diff --git a/org.lamport.tla.toolbox.doc/html/cloudtlc/index.html b/toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/index.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/cloudtlc/index.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/cloudtlc/index.html
diff --git a/org.lamport.tla.toolbox.doc/html/concepts/model.html b/toolbox/org.lamport.tla.toolbox.doc/html/concepts/model.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/concepts/model.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/concepts/model.html
diff --git a/org.lamport.tla.toolbox.doc/html/concepts/module.html b/toolbox/org.lamport.tla.toolbox.doc/html/concepts/module.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/concepts/module.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/concepts/module.html
diff --git a/org.lamport.tla.toolbox.doc/html/concepts/specification.html b/toolbox/org.lamport.tla.toolbox.doc/html/concepts/specification.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/concepts/specification.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/concepts/specification.html
diff --git a/org.lamport.tla.toolbox.doc/html/concepts/subconcepttext.html b/toolbox/org.lamport.tla.toolbox.doc/html/concepts/subconcepttext.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/concepts/subconcepttext.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/concepts/subconcepttext.html
diff --git a/org.lamport.tla.toolbox.doc/html/concepts/subspec1.html b/toolbox/org.lamport.tla.toolbox.doc/html/concepts/subspec1.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/concepts/subspec1.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/concepts/subspec1.html
diff --git a/org.lamport.tla.toolbox.doc/html/concepts/subspec2.html b/toolbox/org.lamport.tla.toolbox.doc/html/concepts/subspec2.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/concepts/subspec2.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/concepts/subspec2.html
diff --git a/org.lamport.tla.toolbox.doc/html/contents.html b/toolbox/org.lamport.tla.toolbox.doc/html/contents.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/contents.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/contents.html
diff --git a/org.lamport.tla.toolbox.doc/html/frontpage.html b/toolbox/org.lamport.tla.toolbox.doc/html/frontpage.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/frontpage.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/frontpage.html
diff --git a/org.lamport.tla.toolbox.doc/html/frontpage.xml b/toolbox/org.lamport.tla.toolbox.doc/html/frontpage.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/frontpage.xml
rename to toolbox/org.lamport.tla.toolbox.doc/html/frontpage.xml
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/default-help.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/default-help.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/default-help.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/default-help.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/eclipse-help-icon.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/eclipse-help-icon.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/eclipse-help-icon.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/eclipse-help-icon.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/folder-minimize.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/folder-minimize.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/folder-minimize.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/folder-minimize.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/folders.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/folders.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/folders.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/folders.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/gettingstarted.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/gettingstarted.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/gettingstarted.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/gettingstarted.html
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/help.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/help.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/help.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/help.html
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/left-right-arrows.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/left-right-arrows.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/left-right-arrows.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/left-right-arrows.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/maintopic.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/maintopic.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/maintopic.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/maintopic.html
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/minimized-folder.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/minimized-folder.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/minimized-folder.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/minimized-folder.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/module-editor-preferences.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/module-editor-preferences.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/module-editor-preferences.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/module-editor-preferences.html
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/preferences.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/preferences.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/preferences.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/preferences.html
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/question-mark.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/question-mark.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/question-mark.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/question-mark.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/resources.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/resources.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/resources.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/resources.html
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/tla-preferences.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/tla-preferences.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/tla-preferences.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/tla-preferences.html
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/unmaximize.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/unmaximize.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/unmaximize.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/unmaximize.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/useful-help.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/useful-help.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/useful-help.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/useful-help.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/view-tab.gif b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/view-tab.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/view-tab.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/view-tab.gif
diff --git a/org.lamport.tla.toolbox.doc/html/gettingstarted/views.html b/toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/views.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/gettingstarted/views.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/gettingstarted/views.html
diff --git a/org.lamport.tla.toolbox.doc/html/help-us/help-us.html b/toolbox/org.lamport.tla.toolbox.doc/html/help-us/help-us.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/help-us/help-us.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/help-us/help-us.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/about-models.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/about-models.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/about-models.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/about-models.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/added.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/added.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/added.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/added.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/changed.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/changed.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/changed.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/changed.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/clear-icon.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/clear-icon.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/clear-icon.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/clear-icon.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/creating-model.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/creating-model.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/creating-model.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/creating-model.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/distributed-mode.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/distributed-mode.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/distributed-mode.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/distributed-mode.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/drag.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/drag.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/drag.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/drag.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/error-balloon.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/error-balloon.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/error-balloon.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/error-balloon.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/ete_add_edit_explore.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/ete_add_edit_explore.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/ete_add_edit_explore.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/ete_add_edit_explore.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/evaluate-consant-expression.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/evaluate-consant-expression.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/evaluate-consant-expression.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/evaluate-consant-expression.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/executing-tlc.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/executing-tlc.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/executing-tlc.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/executing-tlc.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/model-editor-preferences.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/model-editor-preferences.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/model-editor-preferences.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/model-editor-preferences.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/model-preferences.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/model-preferences.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/model-preferences.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/model-preferences.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/model-values.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/model-values.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/model-values.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/model-values.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/model.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/model.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/model.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/model.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/overview-page.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/overview-page.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/overview-page.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/overview-page.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/profiler.png b/toolbox/org.lamport.tla.toolbox.doc/html/model/profiler.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/profiler.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/profiler.png
diff --git a/org.lamport.tla.toolbox.doc/html/model/profiling.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/profiling.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/profiling.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/profiling.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/removed.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/removed.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/removed.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/removed.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/results-page.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/results-page.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/results-page.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/results-page.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/run-icon.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/run-icon.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/run-icon.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/run-icon.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/running-tlc.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/running-tlc.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/running-tlc.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/running-tlc.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/spec-options-page.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/spec-options-page.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/spec-options-page.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/spec-options-page.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/stop-icon.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/stop-icon.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/stop-icon.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/stop-icon.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/tlc-options-page.html b/toolbox/org.lamport.tla.toolbox.doc/html/model/tlc-options-page.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/tlc-options-page.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/tlc-options-page.html
diff --git a/org.lamport.tla.toolbox.doc/html/model/validate-icon.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/validate-icon.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/validate-icon.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/validate-icon.gif
diff --git a/org.lamport.tla.toolbox.doc/html/model/warning.gif b/toolbox/org.lamport.tla.toolbox.doc/html/model/warning.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/model/warning.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/model/warning.gif
diff --git a/org.lamport.tla.toolbox.doc/html/pluscal/pluscal.html b/toolbox/org.lamport.tla.toolbox.doc/html/pluscal/pluscal.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/pluscal/pluscal.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/pluscal/pluscal.html
diff --git a/org.lamport.tla.toolbox.doc/html/prover/color-predicates.gif b/toolbox/org.lamport.tla.toolbox.doc/html/prover/color-predicates.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/prover/color-predicates.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/prover/color-predicates.gif
diff --git a/org.lamport.tla.toolbox.doc/html/prover/decompose.html b/toolbox/org.lamport.tla.toolbox.doc/html/prover/decompose.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/prover/decompose.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/prover/decompose.html
diff --git a/org.lamport.tla.toolbox.doc/html/prover/no_tlapm.png b/toolbox/org.lamport.tla.toolbox.doc/html/prover/no_tlapm.png
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/prover/no_tlapm.png
rename to toolbox/org.lamport.tla.toolbox.doc/html/prover/no_tlapm.png
diff --git a/org.lamport.tla.toolbox.doc/html/prover/old-decompose.html b/toolbox/org.lamport.tla.toolbox.doc/html/prover/old-decompose.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/prover/old-decompose.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/prover/old-decompose.html
diff --git a/org.lamport.tla.toolbox.doc/html/prover/prover.html b/toolbox/org.lamport.tla.toolbox.doc/html/prover/prover.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/prover/prover.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/prover/prover.html
diff --git a/org.lamport.tla.toolbox.doc/html/prover/reading.html b/toolbox/org.lamport.tla.toolbox.doc/html/prover/reading.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/prover/reading.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/prover/reading.html
diff --git a/org.lamport.tla.toolbox.doc/html/prover/runningTlaps.html b/toolbox/org.lamport.tla.toolbox.doc/html/prover/runningTlaps.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/prover/runningTlaps.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/prover/runningTlaps.html
diff --git a/org.lamport.tla.toolbox.doc/html/reference/maintopic.html b/toolbox/org.lamport.tla.toolbox.doc/html/reference/maintopic.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/reference/maintopic.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/reference/maintopic.html
diff --git a/org.lamport.tla.toolbox.doc/html/reference/subtopic.html b/toolbox/org.lamport.tla.toolbox.doc/html/reference/subtopic.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/reference/subtopic.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/reference/subtopic.html
diff --git a/org.lamport.tla.toolbox.doc/html/reference/subtopic2.html b/toolbox/org.lamport.tla.toolbox.doc/html/reference/subtopic2.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/reference/subtopic2.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/reference/subtopic2.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/editing-modules.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/editing-modules.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/editing-modules.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/editing-modules.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/help-print.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/help-print.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/help-print.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/help-print.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/opening-closing.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/opening-closing.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/opening-closing.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/opening-closing.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/parser-preferences.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/parser-preferences.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/parser-preferences.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/parser-preferences.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/parsing.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/parsing.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/parsing.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/parsing.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/pretty-printing.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/pretty-printing.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/pretty-printing.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/pretty-printing.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/spec-explorer-icon.gif b/toolbox/org.lamport.tla.toolbox.doc/html/spec/spec-explorer-icon.gif
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/spec-explorer-icon.gif
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/spec-explorer-icon.gif
diff --git a/org.lamport.tla.toolbox.doc/html/spec/spec.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/spec.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/spec.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/spec.html
diff --git a/org.lamport.tla.toolbox.doc/html/spec/what-is.html b/toolbox/org.lamport.tla.toolbox.doc/html/spec/what-is.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/spec/what-is.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/spec/what-is.html
diff --git a/org.lamport.tla.toolbox.doc/html/splash.bmp b/toolbox/org.lamport.tla.toolbox.doc/html/splash.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/splash.bmp
rename to toolbox/org.lamport.tla.toolbox.doc/html/splash.bmp
diff --git a/org.lamport.tla.toolbox.doc/html/style.css b/toolbox/org.lamport.tla.toolbox.doc/html/style.css
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/style.css
rename to toolbox/org.lamport.tla.toolbox.doc/html/style.css
diff --git a/org.lamport.tla.toolbox.doc/html/tasks/close_spec.html b/toolbox/org.lamport.tla.toolbox.doc/html/tasks/close_spec.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/tasks/close_spec.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/tasks/close_spec.html
diff --git a/org.lamport.tla.toolbox.doc/html/tasks/create_spec.html b/toolbox/org.lamport.tla.toolbox.doc/html/tasks/create_spec.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/tasks/create_spec.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/tasks/create_spec.html
diff --git a/org.lamport.tla.toolbox.doc/html/tasks/delete_spec.html b/toolbox/org.lamport.tla.toolbox.doc/html/tasks/delete_spec.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/tasks/delete_spec.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/tasks/delete_spec.html
diff --git a/org.lamport.tla.toolbox.doc/html/tasks/open_spec.html b/toolbox/org.lamport.tla.toolbox.doc/html/tasks/open_spec.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/tasks/open_spec.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/tasks/open_spec.html
diff --git a/org.lamport.tla.toolbox.doc/html/tasks/test.html b/toolbox/org.lamport.tla.toolbox.doc/html/tasks/test.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/tasks/test.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/tasks/test.html
diff --git a/org.lamport.tla.toolbox.doc/html/template.html b/toolbox/org.lamport.tla.toolbox.doc/html/template.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/template.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/template.html
diff --git a/org.lamport.tla.toolbox.doc/html/toc.html b/toolbox/org.lamport.tla.toolbox.doc/html/toc.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/toc.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/toc.html
diff --git a/org.lamport.tla.toolbox.doc/html/trouble/trouble.html b/toolbox/org.lamport.tla.toolbox.doc/html/trouble/trouble.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/trouble/trouble.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/trouble/trouble.html
diff --git a/org.lamport.tla.toolbox.doc/html/update/revert-update.html b/toolbox/org.lamport.tla.toolbox.doc/html/update/revert-update.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/update/revert-update.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/update/revert-update.html
diff --git a/org.lamport.tla.toolbox.doc/html/update/run-update.html b/toolbox/org.lamport.tla.toolbox.doc/html/update/run-update.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/update/run-update.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/update/run-update.html
diff --git a/org.lamport.tla.toolbox.doc/html/update/update-preferences.html b/toolbox/org.lamport.tla.toolbox.doc/html/update/update-preferences.html
similarity index 100%
rename from org.lamport.tla.toolbox.doc/html/update/update-preferences.html
rename to toolbox/org.lamport.tla.toolbox.doc/html/update/update-preferences.html
diff --git a/org.lamport.tla.toolbox.doc/pdfs/book-02-08-08.pdf b/toolbox/org.lamport.tla.toolbox.doc/pdfs/book-02-08-08.pdf
similarity index 100%
rename from org.lamport.tla.toolbox.doc/pdfs/book-02-08-08.pdf
rename to toolbox/org.lamport.tla.toolbox.doc/pdfs/book-02-08-08.pdf
diff --git a/org.lamport.tla.toolbox.doc/pdfs/c-manual.pdf b/toolbox/org.lamport.tla.toolbox.doc/pdfs/c-manual.pdf
similarity index 100%
rename from org.lamport.tla.toolbox.doc/pdfs/c-manual.pdf
rename to toolbox/org.lamport.tla.toolbox.doc/pdfs/c-manual.pdf
diff --git a/org.lamport.tla.toolbox.doc/pdfs/summary-standalone.pdf b/toolbox/org.lamport.tla.toolbox.doc/pdfs/summary-standalone.pdf
similarity index 100%
rename from org.lamport.tla.toolbox.doc/pdfs/summary-standalone.pdf
rename to toolbox/org.lamport.tla.toolbox.doc/pdfs/summary-standalone.pdf
diff --git a/org.lamport.tla.toolbox.doc/plugin.xml b/toolbox/org.lamport.tla.toolbox.doc/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.doc/plugin.xml
diff --git a/org.lamport.tla.toolbox.doc/pom.xml b/toolbox/org.lamport.tla.toolbox.doc/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.doc/pom.xml
rename to toolbox/org.lamport.tla.toolbox.doc/pom.xml
index e0ce78191a55234c9e1cda561549d96c0ce4164b..392aa326fe839ed3d03bfde185f139cd6f2c85cb 100644
--- a/org.lamport.tla.toolbox.doc/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.doc/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.doc</artifactId>
diff --git a/org.lamport.tla.toolbox.doc/src/.placeholder b/toolbox/org.lamport.tla.toolbox.doc/src/.placeholder
similarity index 100%
rename from org.lamport.tla.toolbox.doc/src/.placeholder
rename to toolbox/org.lamport.tla.toolbox.doc/src/.placeholder
diff --git a/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/HelpActivator.java b/toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/HelpActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/HelpActivator.java
rename to toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/HelpActivator.java
diff --git a/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpContentsHandler.java b/toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpContentsHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpContentsHandler.java
rename to toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpContentsHandler.java
diff --git a/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpPDFHandler.java b/toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpPDFHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpPDFHandler.java
rename to toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpPDFHandler.java
diff --git a/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpURLHandler.java b/toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpURLHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpURLHandler.java
rename to toolbox/org.lamport.tla.toolbox.doc/src/org/lamport/tla/toolbox/doc/handler/HelpURLHandler.java
diff --git a/org.lamport.tla.toolbox.doc/subconcept.xml b/toolbox/org.lamport.tla.toolbox.doc/subconcept.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/subconcept.xml
rename to toolbox/org.lamport.tla.toolbox.doc/subconcept.xml
diff --git a/org.lamport.tla.toolbox.doc/toc.xml b/toolbox/org.lamport.tla.toolbox.doc/toc.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/toc.xml
rename to toolbox/org.lamport.tla.toolbox.doc/toc.xml
diff --git a/org.lamport.tla.toolbox.doc/tocconcepts.xml b/toolbox/org.lamport.tla.toolbox.doc/tocconcepts.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/tocconcepts.xml
rename to toolbox/org.lamport.tla.toolbox.doc/tocconcepts.xml
diff --git a/org.lamport.tla.toolbox.doc/tocgettingstarted.xml b/toolbox/org.lamport.tla.toolbox.doc/tocgettingstarted.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/tocgettingstarted.xml
rename to toolbox/org.lamport.tla.toolbox.doc/tocgettingstarted.xml
diff --git a/org.lamport.tla.toolbox.doc/tocreference.xml b/toolbox/org.lamport.tla.toolbox.doc/tocreference.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/tocreference.xml
rename to toolbox/org.lamport.tla.toolbox.doc/tocreference.xml
diff --git a/org.lamport.tla.toolbox.doc/tocsamples.xml b/toolbox/org.lamport.tla.toolbox.doc/tocsamples.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/tocsamples.xml
rename to toolbox/org.lamport.tla.toolbox.doc/tocsamples.xml
diff --git a/org.lamport.tla.toolbox.doc/toctasks.xml b/toolbox/org.lamport.tla.toolbox.doc/toctasks.xml
similarity index 100%
rename from org.lamport.tla.toolbox.doc/toctasks.xml
rename to toolbox/org.lamport.tla.toolbox.doc/toctasks.xml
diff --git a/org.lamport.tla.toolbox.editor.basic/.classpath b/toolbox/org.lamport.tla.toolbox.editor.basic/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/.classpath
rename to toolbox/org.lamport.tla.toolbox.editor.basic/.classpath
diff --git a/org.lamport.tla.toolbox.editor.basic/.project b/toolbox/org.lamport.tla.toolbox.editor.basic/.project
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/.project
rename to toolbox/org.lamport.tla.toolbox.editor.basic/.project
diff --git a/org.lamport.tla.toolbox.editor.basic/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.editor.basic/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.editor.basic/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.editor.basic/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.editor.basic/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.editor.basic/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.editor.basic/build.properties b/toolbox/org.lamport.tla.toolbox.editor.basic/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/build.properties
rename to toolbox/org.lamport.tla.toolbox.editor.basic/build.properties
diff --git a/org.lamport.tla.toolbox.editor.basic/helpContexts.xml b/toolbox/org.lamport.tla.toolbox.editor.basic/helpContexts.xml
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/helpContexts.xml
rename to toolbox/org.lamport.tla.toolbox.editor.basic/helpContexts.xml
diff --git a/org.lamport.tla.toolbox.editor.basic/icons/root_file.gif b/toolbox/org.lamport.tla.toolbox.editor.basic/icons/root_file.gif
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/icons/root_file.gif
rename to toolbox/org.lamport.tla.toolbox.editor.basic/icons/root_file.gif
diff --git a/org.lamport.tla.toolbox.editor.basic/icons/tla_obj.gif b/toolbox/org.lamport.tla.toolbox.editor.basic/icons/tla_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/icons/tla_obj.gif
rename to toolbox/org.lamport.tla.toolbox.editor.basic/icons/tla_obj.gif
diff --git a/org.lamport.tla.toolbox.editor.basic/plugin.xml b/toolbox/org.lamport.tla.toolbox.editor.basic/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.editor.basic/plugin.xml
diff --git a/org.lamport.tla.toolbox.editor.basic/pom.xml b/toolbox/org.lamport.tla.toolbox.editor.basic/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox.editor.basic/pom.xml
rename to toolbox/org.lamport.tla.toolbox.editor.basic/pom.xml
index 601d5daf72c7817ba40c3638eb2167ded0c23e52..0abf8dadde2d8e5645d25c486e51379f32f82306 100644
--- a/org.lamport.tla.toolbox.editor.basic/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.editor.basic/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.editor.basic</artifactId>
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.properties b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.properties
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.properties
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/eclipse/jdt/internal/ui/actions/FoldingMessages.properties
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/PDFViewingPage.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/PDFViewingPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/PDFViewingPage.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/PDFViewingPage.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAColorProvider.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAColorProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAColorProvider.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAColorProvider.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLADocumentSetupParticipant.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLADocumentSetupParticipant.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLADocumentSetupParticipant.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLADocumentSetupParticipant.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditor.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditor.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditor.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditor.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActionContributor.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActionContributor.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActionContributor.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActionContributor.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActivator.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActivator.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorActivator.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorAndPDFViewer.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorAndPDFViewer.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorAndPDFViewer.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorAndPDFViewer.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.properties b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.properties
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.properties
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorMessages.properties
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorReadOnly.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorReadOnly.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorReadOnly.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAEditorReadOnly.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAFastPartitioner.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAFastPartitioner.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAFastPartitioner.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAFastPartitioner.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAMultiPageEditorActionBarContributor.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAMultiPageEditorActionBarContributor.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAMultiPageEditorActionBarContributor.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAMultiPageEditorActionBarContributor.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAPartitionScanner.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAPartitionScanner.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAPartitionScanner.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAPartitionScanner.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAReconcilingStrategy.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAReconcilingStrategy.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAReconcilingStrategy.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLAReconcilingStrategy.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLASourceViewerConfiguration.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLASourceViewerConfiguration.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLASourceViewerConfiguration.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/TLASourceViewerConfiguration.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxCompletionProcessor.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxCompletionProcessor.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxCompletionProcessor.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxCompletionProcessor.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxHover.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxHover.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxHover.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/ToolboxHover.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/DefineFoldingRegionAction.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/DefineFoldingRegionAction.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/DefineFoldingRegionAction.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/DefineFoldingRegionAction.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ExampleEditorAction.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ExampleEditorAction.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ExampleEditorAction.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ExampleEditorAction.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationAction.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationAction.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationAction.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationAction.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationInCurrentAction.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationInCurrentAction.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationInCurrentAction.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/OpenDeclarationInCurrentAction.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ProofFoldAction.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ProofFoldAction.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ProofFoldAction.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ProofFoldAction.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ToggleCommentAction.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ToggleCommentAction.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ToggleCommentAction.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/actions/ToggleCommentAction.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/BoxedCommentHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/BoxedCommentHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/BoxedCommentHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/BoxedCommentHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CommandPrefixDigitHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CommandPrefixDigitHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CommandPrefixDigitHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CommandPrefixDigitHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CursorMovementHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CursorMovementHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CursorMovementHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/CursorMovementHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/DecomposeProofHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/DecomposeProofHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/DecomposeProofHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/DecomposeProofHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExampleEditCommandHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExampleEditCommandHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExampleEditCommandHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExampleEditCommandHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExecuteNextCommandHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExecuteNextCommandHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExecuteNextCommandHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExecuteNextCommandHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExpandAllRegionsHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExpandAllRegionsHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExpandAllRegionsHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ExpandAllRegionsHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FocusOnStepHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FocusOnStepHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FocusOnStepHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FocusOnStepHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FoldAllRegionsHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FoldAllRegionsHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FoldAllRegionsHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/FoldAllRegionsHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoMatchingParenHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoMatchingParenHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoMatchingParenHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoMatchingParenHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoNextUseHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoNextUseHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoNextUseHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoNextUseHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPCalSourceHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPCalSourceHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPCalSourceHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPCalSourceHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPrevUseHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPrevUseHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPrevUseHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/GotoPrevUseHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideAllProofsHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideAllProofsHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideAllProofsHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideAllProofsHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideSubtreeHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideSubtreeHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideSubtreeHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/HideSubtreeHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/OldDecomposeProofHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/OldDecomposeProofHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/OldDecomposeProofHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/OldDecomposeProofHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateAutomaticallyHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateAutomaticallyHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateAutomaticallyHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateAutomaticallyHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateModuleHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateModuleHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateModuleHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/PCalTranslateModuleHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ProofFoldCommandHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ProofFoldCommandHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ProofFoldCommandHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ProofFoldCommandHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/RenumberProofHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/RenumberProofHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/RenumberProofHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/RenumberProofHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ReturnFromOpenDeclarationHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ReturnFromOpenDeclarationHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ReturnFromOpenDeclarationHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ReturnFromOpenDeclarationHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowAllProofsHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowAllProofsHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowAllProofsHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowAllProofsHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowChildrenOnlyHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowChildrenOnlyHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowChildrenOnlyHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowChildrenOnlyHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowDeclarationsHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowDeclarationsHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowDeclarationsHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowDeclarationsHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowSubtreeHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowSubtreeHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowSubtreeHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowSubtreeHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesHandler.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesHandler.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesHandler.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesParseResultListener.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesParseResultListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesParseResultListener.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/handlers/ShowUsesParseResultListener.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/IPCalReservedWords.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/IPCalReservedWords.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/IPCalReservedWords.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/IPCalReservedWords.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalCompletionProcessor.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalCompletionProcessor.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalCompletionProcessor.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalCompletionProcessor.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalHover.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalHover.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalHover.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalHover.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalTranslator.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalTranslator.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalTranslator.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalTranslator.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalWordDetector.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalWordDetector.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalWordDetector.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/pcal/PCalWordDetector.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/IProofFoldCommandIds.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/IProofFoldCommandIds.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/IProofFoldCommandIds.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/IProofFoldCommandIds.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofFoldingStructureProvider.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofFoldingStructureProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofFoldingStructureProvider.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofFoldingStructureProvider.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofPosition.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofPosition.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofPosition.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/proof/TLAProofPosition.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/ITLAReserveredWords.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/ITLAReserveredWords.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/ITLAReserveredWords.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/ITLAReserveredWords.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/PCALCodeScanner.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/PCALCodeScanner.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/PCALCodeScanner.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/PCALCodeScanner.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAAnnotationHover.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAAnnotationHover.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAAnnotationHover.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAAnnotationHover.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACodeScanner.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACodeScanner.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACodeScanner.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACodeScanner.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACompletionProcessor.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACompletionProcessor.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACompletionProcessor.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLACompletionProcessor.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAHyperlinkDetector.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAHyperlinkDetector.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAHyperlinkDetector.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAHyperlinkDetector.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWhitespaceDetector.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWhitespaceDetector.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWhitespaceDetector.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWhitespaceDetector.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWordDetector.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWordDetector.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWordDetector.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TLAWordDetector.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TokenSpec.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TokenSpec.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TokenSpec.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/tla/TokenSpec.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/BufferedDocumentScanner.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/BufferedDocumentScanner.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/BufferedDocumentScanner.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/BufferedDocumentScanner.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/DocumentHelper.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/DocumentHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/DocumentHelper.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/DocumentHelper.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/EditorUtil.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/EditorUtil.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/EditorUtil.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/EditorUtil.java
diff --git a/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/ElementStateAdapter.java b/toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/ElementStateAdapter.java
similarity index 100%
rename from org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/ElementStateAdapter.java
rename to toolbox/org.lamport.tla.toolbox.editor.basic/src/org/lamport/tla/toolbox/editor/basic/util/ElementStateAdapter.java
diff --git a/org.lamport.tla.toolbox.feature.base/.project b/toolbox/org.lamport.tla.toolbox.feature.base/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.base/.project
rename to toolbox/org.lamport.tla.toolbox.feature.base/.project
diff --git a/org.lamport.tla.toolbox.feature.editor/build.properties b/toolbox/org.lamport.tla.toolbox.feature.base/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.editor/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.base/build.properties
diff --git a/org.lamport.tla.toolbox.feature.base/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.base/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.base/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.base/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.base/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.base/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.feature.base/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.base/pom.xml
index d24eaf4809225fae3f13443d365d837dd939d7a7..a7066456e4c2da07eb182b13827008c5021ad968 100644
--- a/org.lamport.tla.toolbox.feature.base/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.base/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.base</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.branding/.project b/toolbox/org.lamport.tla.toolbox.feature.branding/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.branding/.project
rename to toolbox/org.lamport.tla.toolbox.feature.branding/.project
diff --git a/org.lamport.tla.toolbox.feature.branding/build.properties b/toolbox/org.lamport.tla.toolbox.feature.branding/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.branding/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.branding/build.properties
diff --git a/org.lamport.tla.toolbox.feature.branding/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.branding/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.branding/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.branding/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.branding/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.branding/pom.xml
similarity index 94%
rename from org.lamport.tla.toolbox.feature.branding/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.branding/pom.xml
index 4c95cf4e8fbe3090d1032d0e4424d78c481ba84e..72831dcd63adb900c3b4cabfa213f50ec8a7b956 100644
--- a/org.lamport.tla.toolbox.feature.branding/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.branding/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.branding</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.branding/rootfiles/splash.bmp b/toolbox/org.lamport.tla.toolbox.feature.branding/rootfiles/splash.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.feature.branding/rootfiles/splash.bmp
rename to toolbox/org.lamport.tla.toolbox.feature.branding/rootfiles/splash.bmp
diff --git a/org.lamport.tla.toolbox.feature.editor/.project b/toolbox/org.lamport.tla.toolbox.feature.editor/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.editor/.project
rename to toolbox/org.lamport.tla.toolbox.feature.editor/.project
diff --git a/org.lamport.tla.toolbox.feature.help/build.properties b/toolbox/org.lamport.tla.toolbox.feature.editor/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.help/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.editor/build.properties
diff --git a/org.lamport.tla.toolbox.feature.editor/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.editor/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.editor/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.editor/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.editor/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.editor/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.feature.editor/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.editor/pom.xml
index 6b9557a32249ec224385165ebdc2c3c6701b19b0..f02b5f7d5be6bbd5aadda4612443c372f1bf9149 100644
--- a/org.lamport.tla.toolbox.feature.editor/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.editor/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.editor</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.help/.project b/toolbox/org.lamport.tla.toolbox.feature.help/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.help/.project
rename to toolbox/org.lamport.tla.toolbox.feature.help/.project
diff --git a/org.lamport.tla.toolbox.feature.jclouds/build.properties b/toolbox/org.lamport.tla.toolbox.feature.help/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.jclouds/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.help/build.properties
diff --git a/org.lamport.tla.toolbox.feature.help/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.help/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.help/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.help/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.help/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.help/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.feature.help/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.help/pom.xml
index 0e64038ed3c02b970d08f85f506d8c9806b4f7e9..fe962a8fa26f911e7325d0882464a5a2966d299e 100644
--- a/org.lamport.tla.toolbox.feature.help/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.help/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.help</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.jclouds/.project b/toolbox/org.lamport.tla.toolbox.feature.jclouds/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.jclouds/.project
rename to toolbox/org.lamport.tla.toolbox.feature.jclouds/.project
diff --git a/org.lamport.tla.toolbox.feature.jnlp/build.properties b/toolbox/org.lamport.tla.toolbox.feature.jclouds/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.jnlp/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.jclouds/build.properties
diff --git a/org.lamport.tla.toolbox.feature.jclouds/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.jclouds/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.jclouds/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.jclouds/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.jclouds/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.jclouds/pom.xml
similarity index 94%
rename from org.lamport.tla.toolbox.feature.jclouds/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.jclouds/pom.xml
index 1ac8592d52b13757099164861ade0325dd006546..c4e239d3afd87abcf37f7f571fa10538f3f7e235 100644
--- a/org.lamport.tla.toolbox.feature.jclouds/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.jclouds/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.jclouds</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.jnlp/.project b/toolbox/org.lamport.tla.toolbox.feature.jnlp/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.jnlp/.project
rename to toolbox/org.lamport.tla.toolbox.feature.jnlp/.project
diff --git a/org.lamport.tla.toolbox.feature.prover/build.properties b/toolbox/org.lamport.tla.toolbox.feature.jnlp/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.prover/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.jnlp/build.properties
diff --git a/org.lamport.tla.toolbox.feature.jnlp/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.jnlp/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.jnlp/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.jnlp/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.jnlp/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.jnlp/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.feature.jnlp/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.jnlp/pom.xml
index cde05573b3466c78ce6cd07665693ea77edf9bb8..1562c26fe7b23f3a2210e78fc32fc12cb63193dd 100644
--- a/org.lamport.tla.toolbox.feature.jnlp/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.jnlp/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.jnlp</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.prover/.project b/toolbox/org.lamport.tla.toolbox.feature.prover/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.prover/.project
rename to toolbox/org.lamport.tla.toolbox.feature.prover/.project
diff --git a/org.lamport.tla.toolbox.feature.tla2tex/build.properties b/toolbox/org.lamport.tla.toolbox.feature.prover/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.tla2tex/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.prover/build.properties
diff --git a/org.lamport.tla.toolbox.feature.prover/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.prover/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.prover/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.prover/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.prover/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.prover/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.feature.prover/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.prover/pom.xml
index 8198c10e0b5e07810541155814a76fefdca7120d..54a93298cf1b3f781765bc8fb468755ce530bd5d 100644
--- a/org.lamport.tla.toolbox.feature.prover/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.prover/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.prover</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.standalone/.project b/toolbox/org.lamport.tla.toolbox.feature.standalone/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.standalone/.project
rename to toolbox/org.lamport.tla.toolbox.feature.standalone/.project
diff --git a/org.lamport.tla.toolbox.feature.standalone/build.properties b/toolbox/org.lamport.tla.toolbox.feature.standalone/build.properties
similarity index 58%
rename from org.lamport.tla.toolbox.feature.standalone/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.standalone/build.properties
index 8c396f81c4a9616e23ce948021f0846ae7dbdd18..23e22be7adeb8de382bd9768065d96522a1286d1 100644
--- a/org.lamport.tla.toolbox.feature.standalone/build.properties
+++ b/toolbox/org.lamport.tla.toolbox.feature.standalone/build.properties
@@ -1,5 +1,5 @@
bin.includes = feature.xml,\
build.properties
-root=file:../tlatools/dist/tla2tools.jar
+root=file:../../tlatools/org.lamport.tlatools/dist/tla2tools.jar
root.permissions.755=tla2tools.jar
diff --git a/org.lamport.tla.toolbox.feature.standalone/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.standalone/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.standalone/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.standalone/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.standalone/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.standalone/pom.xml
similarity index 94%
rename from org.lamport.tla.toolbox.feature.standalone/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.standalone/pom.xml
index ccb8245f66ca0b7719763b26d76dc1a0ae1582ad..c968faeb5007557fcce74562f1c0f4f5bcf8222a 100644
--- a/org.lamport.tla.toolbox.feature.standalone/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.standalone/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.standalone</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.tla2tex/.project b/toolbox/org.lamport.tla.toolbox.feature.tla2tex/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.tla2tex/.project
rename to toolbox/org.lamport.tla.toolbox.feature.tla2tex/.project
diff --git a/org.lamport.tla.toolbox.feature.tlc/build.properties b/toolbox/org.lamport.tla.toolbox.feature.tla2tex/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.tlc/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.tla2tex/build.properties
diff --git a/org.lamport.tla.toolbox.feature.tla2tex/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.tla2tex/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.tla2tex/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.tla2tex/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.tla2tex/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.tla2tex/pom.xml
similarity index 94%
rename from org.lamport.tla.toolbox.feature.tla2tex/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.tla2tex/pom.xml
index 705f70f8ce0a33ccce5e5033eddb121a66318ccd..6fd05549bfbef4a95588bc58dbdfacb2cb638674 100644
--- a/org.lamport.tla.toolbox.feature.tla2tex/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.tla2tex/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.tla2tex</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.tlc/.project b/toolbox/org.lamport.tla.toolbox.feature.tlc/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.tlc/.project
rename to toolbox/org.lamport.tla.toolbox.feature.tlc/.project
diff --git a/org.lamport.tla.toolbox.feature.uitest/build.properties b/toolbox/org.lamport.tla.toolbox.feature.tlc/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.feature.uitest/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.tlc/build.properties
diff --git a/org.lamport.tla.toolbox.feature.tlc/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.tlc/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.tlc/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.tlc/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.tlc/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.tlc/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.feature.tlc/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.tlc/pom.xml
index 7b82dd1fa889163066295995598cfcaaf678f59a..c758f3cf3d9fbb0cadd668ab90f68acd12876029 100644
--- a/org.lamport.tla.toolbox.feature.tlc/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.tlc/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.tlc</artifactId>
diff --git a/org.lamport.tla.toolbox.feature.uitest/.project b/toolbox/org.lamport.tla.toolbox.feature.uitest/.project
similarity index 100%
rename from org.lamport.tla.toolbox.feature.uitest/.project
rename to toolbox/org.lamport.tla.toolbox.feature.uitest/.project
diff --git a/org.lamport.tlatools.feature/build.properties b/toolbox/org.lamport.tla.toolbox.feature.uitest/build.properties
similarity index 100%
rename from org.lamport.tlatools.feature/build.properties
rename to toolbox/org.lamport.tla.toolbox.feature.uitest/build.properties
diff --git a/org.lamport.tla.toolbox.feature.uitest/feature.xml b/toolbox/org.lamport.tla.toolbox.feature.uitest/feature.xml
similarity index 100%
rename from org.lamport.tla.toolbox.feature.uitest/feature.xml
rename to toolbox/org.lamport.tla.toolbox.feature.uitest/feature.xml
diff --git a/org.lamport.tla.toolbox.feature.uitest/pom.xml b/toolbox/org.lamport.tla.toolbox.feature.uitest/pom.xml
similarity index 93%
rename from org.lamport.tla.toolbox.feature.uitest/pom.xml
rename to toolbox/org.lamport.tla.toolbox.feature.uitest/pom.xml
index aa8d5b4b53a15e7466426449147ef4819c7ba087..3c5d0de49e35951592dc41e1b4c86f182e4d2b2c 100644
--- a/org.lamport.tla.toolbox.feature.uitest/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.feature.uitest/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.feature.uitest</artifactId>
diff --git a/org.lamport.tla.toolbox.jclouds/.classpath b/toolbox/org.lamport.tla.toolbox.jclouds/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/.classpath
rename to toolbox/org.lamport.tla.toolbox.jclouds/.classpath
diff --git a/org.lamport.tla.toolbox.jclouds/.project b/toolbox/org.lamport.tla.toolbox.jclouds/.project
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/.project
rename to toolbox/org.lamport.tla.toolbox.jclouds/.project
diff --git a/org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.pde.core.prefs b/toolbox/org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.pde.core.prefs
rename to toolbox/org.lamport.tla.toolbox.jclouds/.settings/org.eclipse.pde.core.prefs
diff --git a/org.lamport.tla.toolbox.jclouds/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.jclouds/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.jclouds/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.jclouds/build.properties b/toolbox/org.lamport.tla.toolbox.jclouds/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/build.properties
rename to toolbox/org.lamport.tla.toolbox.jclouds/build.properties
diff --git a/org.lamport.tla.toolbox.jclouds/files/.keep b/toolbox/org.lamport.tla.toolbox.jclouds/files/.keep
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/files/.keep
rename to toolbox/org.lamport.tla.toolbox.jclouds/files/.keep
diff --git a/org.lamport.tla.toolbox.jclouds/plugin.xml b/toolbox/org.lamport.tla.toolbox.jclouds/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.jclouds/plugin.xml
diff --git a/org.lamport.tla.toolbox.jclouds/pom.xml b/toolbox/org.lamport.tla.toolbox.jclouds/pom.xml
similarity index 98%
rename from org.lamport.tla.toolbox.jclouds/pom.xml
rename to toolbox/org.lamport.tla.toolbox.jclouds/pom.xml
index ed14a700af4cf587a354ddc654a6383014aef945..e4e7c0ca806a0128c64878ea4722d309c6b503f0 100644
--- a/org.lamport.tla.toolbox.jclouds/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.jclouds/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.jclouds</artifactId>
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/Application.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/Application.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/Application.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/Application.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureARMCloudTLCInstanceParameters.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureARMCloudTLCInstanceParameters.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureARMCloudTLCInstanceParameters.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureARMCloudTLCInstanceParameters.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureCloudTLCInstanceParameters.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureCloudTLCInstanceParameters.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureCloudTLCInstanceParameters.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/AzureCloudTLCInstanceParameters.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudDistributedTLCJob.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudDistributedTLCJob.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudDistributedTLCJob.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudDistributedTLCJob.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCInstanceParameters.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCInstanceParameters.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCInstanceParameters.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCInstanceParameters.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCJobFactory.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCJobFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCJobFactory.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/CloudTLCJobFactory.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/EC2CloudTLCInstanceParameters.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/EC2CloudTLCInstanceParameters.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/EC2CloudTLCInstanceParameters.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/EC2CloudTLCInstanceParameters.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/JCloudActivator.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/JCloudActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/JCloudActivator.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/JCloudActivator.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PacketNetCloudTLCInstanceParameters.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PacketNetCloudTLCInstanceParameters.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PacketNetCloudTLCInstanceParameters.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PacketNetCloudTLCInstanceParameters.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PayloadHelper.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PayloadHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PayloadHelper.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/PayloadHelper.java
diff --git a/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/TLAAzureARMCloudTLCInstanceParameters.java b/toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/TLAAzureARMCloudTLCInstanceParameters.java
similarity index 100%
rename from org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/TLAAzureARMCloudTLCInstanceParameters.java
rename to toolbox/org.lamport.tla.toolbox.jclouds/src/org/lamport/tla/toolbox/jcloud/TLAAzureARMCloudTLCInstanceParameters.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/.classpath b/toolbox/org.lamport.tla.toolbox.jnlp/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/.classpath
rename to toolbox/org.lamport.tla.toolbox.jnlp/.classpath
diff --git a/org.lamport.tla.toolbox.jnlp/.project b/toolbox/org.lamport.tla.toolbox.jnlp/.project
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/.project
rename to toolbox/org.lamport.tla.toolbox.jnlp/.project
diff --git a/org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.pde.core.prefs b/toolbox/org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.pde.core.prefs
rename to toolbox/org.lamport.tla.toolbox.jnlp/.settings/org.eclipse.pde.core.prefs
diff --git a/org.lamport.tla.toolbox.jnlp/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.jnlp/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.jnlp/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.jnlp/build.properties b/toolbox/org.lamport.tla.toolbox.jnlp/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/build.properties
rename to toolbox/org.lamport.tla.toolbox.jnlp/build.properties
diff --git a/org.lamport.tla.toolbox.jnlp/files/animator.html b/toolbox/org.lamport.tla.toolbox.jnlp/files/animator.html
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/files/animator.html
rename to toolbox/org.lamport.tla.toolbox.jnlp/files/animator.html
diff --git a/org.lamport.tla.toolbox.jnlp/files/jquery.js b/toolbox/org.lamport.tla.toolbox.jnlp/files/jquery.js
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/files/jquery.js
rename to toolbox/org.lamport.tla.toolbox.jnlp/files/jquery.js
diff --git a/org.lamport.tla.toolbox.jnlp/files/webstart.gif b/toolbox/org.lamport.tla.toolbox.jnlp/files/webstart.gif
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/files/webstart.gif
rename to toolbox/org.lamport.tla.toolbox.jnlp/files/webstart.gif
diff --git a/org.lamport.tla.toolbox.jnlp/plugin.xml b/toolbox/org.lamport.tla.toolbox.jnlp/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.jnlp/plugin.xml
diff --git a/org.lamport.tla.toolbox.jnlp/pom.xml b/toolbox/org.lamport.tla.toolbox.jnlp/pom.xml
similarity index 98%
rename from org.lamport.tla.toolbox.jnlp/pom.xml
rename to toolbox/org.lamport.tla.toolbox.jnlp/pom.xml
index ac2cd70c463b10b9ed89710c8f74974f510cddda..3ec3e714b7c2d576929cdf1aba2d9fe705e2619f 100644
--- a/org.lamport.tla.toolbox.jnlp/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.jnlp/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.jnlp</artifactId>
@@ -143,7 +143,7 @@
<outputDirectory>${project.build.directory}/../files/</outputDirectory>
<resources>
<resource>
- <directory>${project.build.directory}/../../tlatools/dist/</directory>
+ <directory>${project.build.directory}/../../../tlatools/org.lamport.tlatools/dist/</directory>
<include>tla2tools.jar</include>
</resource>
</resources>
diff --git a/org.lamport.tla.toolbox.jnlp/src/assembly/config.ini b/toolbox/org.lamport.tla.toolbox.jnlp/src/assembly/config.ini
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/src/assembly/config.ini
rename to toolbox/org.lamport.tla.toolbox.jnlp/src/assembly/config.ini
diff --git a/org.lamport.tla.toolbox.jnlp/src/assembly/zip.xml b/toolbox/org.lamport.tla.toolbox.jnlp/src/assembly/zip.xml
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/src/assembly/zip.xml
rename to toolbox/org.lamport.tla.toolbox.jnlp/src/assembly/zip.xml
diff --git a/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/CombinedJNLPGeneratorServlet.java b/toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/CombinedJNLPGeneratorServlet.java
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/CombinedJNLPGeneratorServlet.java
rename to toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/CombinedJNLPGeneratorServlet.java
diff --git a/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/FPSetJNLPGeneratorServlet.java b/toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/FPSetJNLPGeneratorServlet.java
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/FPSetJNLPGeneratorServlet.java
rename to toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/FPSetJNLPGeneratorServlet.java
diff --git a/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java b/toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java
rename to toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/IndexServlet.java
diff --git a/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/JNLPGeneratorServlet.java b/toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/JNLPGeneratorServlet.java
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/JNLPGeneratorServlet.java
rename to toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/JNLPGeneratorServlet.java
diff --git a/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/URLHttpServlet.java b/toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/URLHttpServlet.java
similarity index 100%
rename from org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/URLHttpServlet.java
rename to toolbox/org.lamport.tla.toolbox.jnlp/src/org/lamport/tla/toolbox/distributed/URLHttpServlet.java
diff --git a/org.lamport.tla.toolbox.p2repository/.project b/toolbox/org.lamport.tla.toolbox.p2repository/.project
similarity index 100%
rename from org.lamport.tla.toolbox.p2repository/.project
rename to toolbox/org.lamport.tla.toolbox.p2repository/.project
diff --git a/org.lamport.tla.toolbox.p2repository/category.xml b/toolbox/org.lamport.tla.toolbox.p2repository/category.xml
similarity index 100%
rename from org.lamport.tla.toolbox.p2repository/category.xml
rename to toolbox/org.lamport.tla.toolbox.p2repository/category.xml
diff --git a/org.lamport.tla.toolbox.p2repository/pom.xml b/toolbox/org.lamport.tla.toolbox.p2repository/pom.xml
similarity index 94%
rename from org.lamport.tla.toolbox.p2repository/pom.xml
rename to toolbox/org.lamport.tla.toolbox.p2repository/pom.xml
index b653014bee563a13ff5485725c65dbf495409395..87c8b35f7c2ed6f954c1d0f502c4535bc0d34a4f 100644
--- a/org.lamport.tla.toolbox.p2repository/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.p2repository/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.p2repository</artifactId>
diff --git a/org.lamport.tla.toolbox.product.product/.project b/toolbox/org.lamport.tla.toolbox.product.product/.project
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/.project
rename to toolbox/org.lamport.tla.toolbox.product.product/.project
diff --git a/org.lamport.tla.toolbox.product.product/TLAToolbox.target b/toolbox/org.lamport.tla.toolbox.product.product/TLAToolbox.target
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/TLAToolbox.target
rename to toolbox/org.lamport.tla.toolbox.product.product/TLAToolbox.target
diff --git a/org.lamport.tla.toolbox.product.product/createAptRepo.sh b/toolbox/org.lamport.tla.toolbox.product.product/createAptRepo.sh
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/createAptRepo.sh
rename to toolbox/org.lamport.tla.toolbox.product.product/createAptRepo.sh
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_32bit.bmp b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_32bit.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_32bit.bmp
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_32bit.bmp
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_8bit.bmp b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_8bit.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_8bit.bmp
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-16_8bit.bmp
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-256.xpm b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-256.xpm
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-256.xpm
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-256.xpm
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-256_32bit.bmp b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-256_32bit.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-256_32bit.bmp
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-256_32bit.bmp
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_32bit.bmp b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_32bit.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_32bit.bmp
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_32bit.bmp
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_8bit.bmp b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_8bit.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_8bit.bmp
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-32_8bit.bmp
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_32bit.bmp b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_32bit.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_32bit.bmp
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_32bit.bmp
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_8bit.bmp b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_8bit.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_8bit.bmp
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application-48_8bit.bmp
diff --git a/org.lamport.tla.toolbox.product.product/icons/toolbox_application.icns b/toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application.icns
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/icons/toolbox_application.icns
rename to toolbox/org.lamport.tla.toolbox.product.product/icons/toolbox_application.icns
diff --git a/org.lamport.tla.toolbox.product.product/ide/TLAPlusToolboxMavenReleaseBuild.launch b/toolbox/org.lamport.tla.toolbox.product.product/ide/TLAPlusToolboxMavenReleaseBuild.launch
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/ide/TLAPlusToolboxMavenReleaseBuild.launch
rename to toolbox/org.lamport.tla.toolbox.product.product/ide/TLAPlusToolboxMavenReleaseBuild.launch
diff --git a/org.lamport.tla.toolbox.product.product/org.lamport.tla.toolbox.product.product.product b/toolbox/org.lamport.tla.toolbox.product.product/org.lamport.tla.toolbox.product.product.product
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/org.lamport.tla.toolbox.product.product.product
rename to toolbox/org.lamport.tla.toolbox.product.product/org.lamport.tla.toolbox.product.product.product
diff --git a/org.lamport.tla.toolbox.product.product/pom.xml b/toolbox/org.lamport.tla.toolbox.product.product/pom.xml
similarity index 99%
rename from org.lamport.tla.toolbox.product.product/pom.xml
rename to toolbox/org.lamport.tla.toolbox.product.product/pom.xml
index e4c70bc38bf5fa0f4fae4d220ba546c4c456995b..532718bc1fa2c9933ba60558e240551083a13b38 100644
--- a/org.lamport.tla.toolbox.product.product/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.product.product/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.product.product</artifactId>
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/control/control b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/control
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/control/control
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/control
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/control/postinst b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/postinst
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/control/postinst
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/postinst
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/control/postrm b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/postrm
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/control/postrm
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/postrm
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/control/preinst b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/preinst
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/control/preinst
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/preinst
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/control/prerm b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/prerm
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/control/prerm
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/control/prerm
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/usr/share/applications/tla+toolbox.desktop b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/applications/tla+toolbox.desktop
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/usr/share/applications/tla+toolbox.desktop
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/applications/tla+toolbox.desktop
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/32x32/apps/tla+toolbox.png b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/32x32/apps/tla+toolbox.png
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/32x32/apps/tla+toolbox.png
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/32x32/apps/tla+toolbox.png
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/48x48/apps/tla+toolbox.png b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/48x48/apps/tla+toolbox.png
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/48x48/apps/tla+toolbox.png
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/icons/hicolor/48x48/apps/tla+toolbox.png
diff --git a/org.lamport.tla.toolbox.product.product/src/deb/usr/share/mime/packages/tla+toolbox.xml b/toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/mime/packages/tla+toolbox.xml
similarity index 100%
rename from org.lamport.tla.toolbox.product.product/src/deb/usr/share/mime/packages/tla+toolbox.xml
rename to toolbox/org.lamport.tla.toolbox.product.product/src/deb/usr/share/mime/packages/tla+toolbox.xml
diff --git a/org.lamport.tla.toolbox.product.standalone/.classpath b/toolbox/org.lamport.tla.toolbox.product.standalone/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/.classpath
rename to toolbox/org.lamport.tla.toolbox.product.standalone/.classpath
diff --git a/org.lamport.tla.toolbox.product.standalone/.project b/toolbox/org.lamport.tla.toolbox.product.standalone/.project
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/.project
rename to toolbox/org.lamport.tla.toolbox.product.standalone/.project
diff --git a/org.lamport.tla.toolbox.product.standalone/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.product.standalone/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.product.standalone/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.product.standalone/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.product.standalone/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.product.standalone/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.product.standalone/build.properties b/toolbox/org.lamport.tla.toolbox.product.standalone/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/build.properties
rename to toolbox/org.lamport.tla.toolbox.product.standalone/build.properties
diff --git a/org.lamport.tla.toolbox.product.standalone/examples/DijkstraMutex.zip b/toolbox/org.lamport.tla.toolbox.product.standalone/examples/DijkstraMutex.zip
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/examples/DijkstraMutex.zip
rename to toolbox/org.lamport.tla.toolbox.product.standalone/examples/DijkstraMutex.zip
diff --git a/org.lamport.tla.toolbox.product.standalone/examples/EWD840.zip b/toolbox/org.lamport.tla.toolbox.product.standalone/examples/EWD840.zip
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/examples/EWD840.zip
rename to toolbox/org.lamport.tla.toolbox.product.standalone/examples/EWD840.zip
diff --git a/org.lamport.tla.toolbox.product.standalone/examples/MissionariesAndCannibals.zip b/toolbox/org.lamport.tla.toolbox.product.standalone/examples/MissionariesAndCannibals.zip
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/examples/MissionariesAndCannibals.zip
rename to toolbox/org.lamport.tla.toolbox.product.standalone/examples/MissionariesAndCannibals.zip
diff --git a/org.lamport.tla.toolbox.product.standalone/examples/Queens.zip b/toolbox/org.lamport.tla.toolbox.product.standalone/examples/Queens.zip
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/examples/Queens.zip
rename to toolbox/org.lamport.tla.toolbox.product.standalone/examples/Queens.zip
diff --git a/org.lamport.tla.toolbox.product.standalone/icons/full/etool16/tla_launch_check_wiz.gif b/toolbox/org.lamport.tla.toolbox.product.standalone/icons/full/etool16/tla_launch_check_wiz.gif
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/icons/full/etool16/tla_launch_check_wiz.gif
rename to toolbox/org.lamport.tla.toolbox.product.standalone/icons/full/etool16/tla_launch_check_wiz.gif
diff --git a/org.lamport.tla.toolbox.product.standalone/icons/full/product_lg.gif b/toolbox/org.lamport.tla.toolbox.product.standalone/icons/full/product_lg.gif
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/icons/full/product_lg.gif
rename to toolbox/org.lamport.tla.toolbox.product.standalone/icons/full/product_lg.gif
diff --git a/org.lamport.tla.toolbox.product.standalone/images/splash_small.bmp b/toolbox/org.lamport.tla.toolbox.product.standalone/images/splash_small.bmp
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/images/splash_small.bmp
rename to toolbox/org.lamport.tla.toolbox.product.standalone/images/splash_small.bmp
diff --git a/org.lamport.tla.toolbox.product.standalone/images/splash_small.png b/toolbox/org.lamport.tla.toolbox.product.standalone/images/splash_small.png
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/images/splash_small.png
rename to toolbox/org.lamport.tla.toolbox.product.standalone/images/splash_small.png
diff --git a/org.lamport.tla.toolbox.product.standalone/plugin.xml b/toolbox/org.lamport.tla.toolbox.product.standalone/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.product.standalone/plugin.xml
diff --git a/org.lamport.tla.toolbox.product.standalone/plugin_customization.ini b/toolbox/org.lamport.tla.toolbox.product.standalone/plugin_customization.ini
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/plugin_customization.ini
rename to toolbox/org.lamport.tla.toolbox.product.standalone/plugin_customization.ini
diff --git a/org.lamport.tla.toolbox.product.standalone/pom.xml b/toolbox/org.lamport.tla.toolbox.product.standalone/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox.product.standalone/pom.xml
rename to toolbox/org.lamport.tla.toolbox.product.standalone/pom.xml
index 352f2991d1a0931d6d2ed60643035466b4b541f2..2214efdd70c07937d85c723292a130cce4dc928b 100644
--- a/org.lamport.tla.toolbox.product.standalone/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.product.standalone/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.product.standalone</artifactId>
diff --git a/org.lamport.tla.toolbox.product.standalone/schema/org.lamport.tla.toolbox.tool.exsd b/toolbox/org.lamport.tla.toolbox.product.standalone/schema/org.lamport.tla.toolbox.tool.exsd
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/schema/org.lamport.tla.toolbox.tool.exsd
rename to toolbox/org.lamport.tla.toolbox.product.standalone/schema/org.lamport.tla.toolbox.tool.exsd
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/Application.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/Application.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/Application.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/Application.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationActionBarAdvisor.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationActionBarAdvisor.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationActionBarAdvisor.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationActionBarAdvisor.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchAdvisor.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchAdvisor.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchAdvisor.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchAdvisor.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchWindowAdvisor.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchWindowAdvisor.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchWindowAdvisor.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ApplicationWorkbenchWindowAdvisor.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/StandaloneActivator.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/StandaloneActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/StandaloneActivator.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/StandaloneActivator.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ToolboxLifecycleParticipantManger.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ToolboxLifecycleParticipantManger.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ToolboxLifecycleParticipantManger.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ToolboxLifecycleParticipantManger.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/WindowUtils.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/WindowUtils.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/WindowUtils.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/WindowUtils.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/lifecycle/ToolboxLifecycleParticipant.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/lifecycle/ToolboxLifecycleParticipant.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/lifecycle/ToolboxLifecycleParticipant.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/lifecycle/ToolboxLifecycleParticipant.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/preferences/AutomaticUpdatesPreferencePage.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/preferences/AutomaticUpdatesPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/preferences/AutomaticUpdatesPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/preferences/AutomaticUpdatesPreferencePage.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ui/intro/ToolboxIntroPart.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ui/intro/ToolboxIntroPart.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ui/intro/ToolboxIntroPart.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/ui/intro/ToolboxIntroPart.java
diff --git a/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/util/ZipUtil.java b/toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/util/ZipUtil.java
similarity index 100%
rename from org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/util/ZipUtil.java
rename to toolbox/org.lamport.tla.toolbox.product.standalone/src/org/lamport/tla/toolbox/util/ZipUtil.java
diff --git a/org.lamport.tla.toolbox.product.uitest/.project b/toolbox/org.lamport.tla.toolbox.product.uitest/.project
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/.project
rename to toolbox/org.lamport.tla.toolbox.product.uitest/.project
diff --git a/org.lamport.tla.toolbox.product.uitest/ECL-SMOKE-PROCS.ctx b/toolbox/org.lamport.tla.toolbox.product.uitest/ECL-SMOKE-PROCS.ctx
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/ECL-SMOKE-PROCS.ctx
rename to toolbox/org.lamport.tla.toolbox.product.uitest/ECL-SMOKE-PROCS.ctx
diff --git a/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Example.test b/toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Example.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Example.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Example.test
diff --git a/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test1.test b/toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test1.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test1.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test1.test
diff --git a/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test2.test b/toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test2.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test2.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA.End.To.End.Test2.test
diff --git a/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Multiple_Model_Run.test b/toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Multiple_Model_Run.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Multiple_Model_Run.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Multiple_Model_Run.test
diff --git a/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Suite.suite b/toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Suite.suite
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Suite.suite
rename to toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Suite.suite
diff --git a/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Test3.test b/toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Test3.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Test3.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/EndtoEnd/TLA_End_To_End_Test3.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Long_Name_Spec.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Long_Name_Spec.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Long_Name_Spec.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Long_Name_Spec.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Tree_Collapse.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Tree_Collapse.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Tree_Collapse.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA-Functional_Tree_Collapse.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Delete.Additional.Module.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Delete.Additional.Module.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Delete.Additional.Module.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Delete.Additional.Module.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.ECE.Placement.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.ECE.Placement.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.ECE.Placement.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.ECE.Placement.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Error.Trace.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Error.Trace.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Error.Trace.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Error.Trace.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.File.Property.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.File.Property.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.File.Property.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.File.Property.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Help.Menu.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Help.Menu.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Help.Menu.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Help.Menu.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.New.Model.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.New.Model.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.New.Model.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.New.Model.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.PCal.Checksums.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.PCal.Checksums.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.PCal.Checksums.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.PCal.Checksums.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Parse.Pref.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Parse.Pref.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Parse.Pref.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Parse.Pref.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Start.From.Error.Trace.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Start.From.Error.Trace.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Start.From.Error.Trace.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Start.From.Error.Trace.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.TLAPS.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.TLAPS.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.TLAPS.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.TLAPS.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Temporal.Formula.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Temporal.Formula.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Temporal.Formula.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Temporal.Formula.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Test.Suite.suite b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Test.Suite.suite
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Test.Suite.suite
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA.Functional.Test.Suite.suite
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Action_Constraint.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Action_Constraint.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Action_Constraint.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Action_Constraint.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Basic_Model.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Basic_Model.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Basic_Model.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Basic_Model.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Check_Model_OnError.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Check_Model_OnError.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Check_Model_OnError.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Check_Model_OnError.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Console.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Console.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Console.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Console.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Error_Temporal.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Error_Temporal.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Error_Temporal.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clear_Error_Temporal.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clone_Model.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clone_Model.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clone_Model.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Clone_Model.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Deadlock_Unchecked.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Deadlock_Unchecked.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Deadlock_Unchecked.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Deadlock_Unchecked.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Definition_Override.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Definition_Override.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Definition_Override.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Definition_Override.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Distributed_Mode_Options.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Distributed_Mode_Options.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Distributed_Mode_Options.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Distributed_Mode_Options.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Exp.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Exp.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Exp.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Exp.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Find_Replace.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Find_Replace.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Find_Replace.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Find_Replace.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Fingerprint.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Fingerprint.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Fingerprint.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Fingerprint.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Invariant _Formula.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Invariant _Formula.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Invariant _Formula.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Invariant _Formula.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Links.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Links.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Links.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Links.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Defaults.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Defaults.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Defaults.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Defaults.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Results_Defaults.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Results_Defaults.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Results_Defaults.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Model_Results_Defaults.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models_Description.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models_Description.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models_Description.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Multiple_Models_Description.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_NoFormula_Defaults.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_NoFormula_Defaults.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_NoFormula_Defaults.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_NoFormula_Defaults.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_More_Editors.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_More_Editors.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_More_Editors.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_More_Editors.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_Saved_Model.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_Saved_Model.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_Saved_Model.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Open_Saved_Model.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Property_Formula.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Property_Formula.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Property_Formula.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Property_Formula.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Run_Details.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Run_Details.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Run_Details.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Run_Details.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties_Valid.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties_Valid.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties_Valid.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_Spec_Properties_Valid.test
diff --git a/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_TLA_Options_Defaults.test b/toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_TLA_Options_Defaults.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_TLA_Options_Defaults.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/Functional/TLA_Functional_TLA_Options_Defaults.test
diff --git a/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.File.test b/toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.File.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.File.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.File.test
diff --git a/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.Set.test b/toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.Set.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.Set.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA.Invalid.Set.test
diff --git a/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Content.test b/toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Content.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Content.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Content.test
diff --git a/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Formula.test b/toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Formula.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Formula.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Model_Formula.test
diff --git a/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Non_Real_Number.test b/toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Non_Real_Number.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Non_Real_Number.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Non_Real_Number.test
diff --git a/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Test_Suite.suite b/toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Test_Suite.suite
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Test_Suite.suite
rename to toolbox/org.lamport.tla.toolbox.product.uitest/InvalidTest/TLA_Invalid_Test_Suite.suite
diff --git a/org.lamport.tla.toolbox.product.uitest/TLA.Test.Parameters.ctx b/toolbox/org.lamport.tla.toolbox.product.uitest/TLA.Test.Parameters.ctx
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/TLA.Test.Parameters.ctx
rename to toolbox/org.lamport.tla.toolbox.product.uitest/TLA.Test.Parameters.ctx
diff --git a/org.lamport.tla.toolbox.product.uitest/TLA_Global_Verification.verification b/toolbox/org.lamport.tla.toolbox.product.uitest/TLA_Global_Verification.verification
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/TLA_Global_Verification.verification
rename to toolbox/org.lamport.tla.toolbox.product.uitest/TLA_Global_Verification.verification
diff --git a/org.lamport.tla.toolbox.product.uitest/TLA_Test_Preferences.ctx b/toolbox/org.lamport.tla.toolbox.product.uitest/TLA_Test_Preferences.ctx
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/TLA_Test_Preferences.ctx
rename to toolbox/org.lamport.tla.toolbox.product.uitest/TLA_Test_Preferences.ctx
diff --git a/org.lamport.tla.toolbox.product.uitest/TLA_Test_Workbench.ctx b/toolbox/org.lamport.tla.toolbox.product.uitest/TLA_Test_Workbench.ctx
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/TLA_Test_Workbench.ctx
rename to toolbox/org.lamport.tla.toolbox.product.uitest/TLA_Test_Workbench.ctx
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/ActivateExperimentalUpdates.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/ActivateExperimentalUpdates.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/ActivateExperimentalUpdates.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/ActivateExperimentalUpdates.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/SmokeSuite.suite b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/SmokeSuite.suite
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/SmokeSuite.suite
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/SmokeSuite.suite
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Close.Open.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Close.Open.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Close.Open.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Close.Open.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Delete.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Delete.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Delete.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Delete.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Test.Spec.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Test.Spec.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Test.Spec.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Create.Test.Spec.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.New.Model.Simple.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.New.Model.Simple.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.New.Model.Simple.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.New.Model.Simple.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Rename.Spec.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Rename.Spec.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Rename.Spec.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Rename.Spec.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Valid.Path.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Valid.Path.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Valid.Path.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA.Smoke.Valid.Path.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Model_Tabs.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Model_Tabs.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Model_Tabs.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Model_Tabs.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Quick_Access.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Quick_Access.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Quick_Access.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Quick_Access.test
diff --git a/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Window_Reset.test b/toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Window_Reset.test
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Window_Reset.test
rename to toolbox/org.lamport.tla.toolbox.product.uitest/bvt/TLA_Smoke_Window_Reset.test
diff --git a/org.lamport.tla.toolbox.product.uitest/pom.xml b/toolbox/org.lamport.tla.toolbox.product.uitest/pom.xml
similarity index 99%
rename from org.lamport.tla.toolbox.product.uitest/pom.xml
rename to toolbox/org.lamport.tla.toolbox.product.uitest/pom.xml
index fc94a3dc6b0b9e8d77dbf58cdc772c56e99363e6..83d8a7cbbd46421448b060c77ca75cb3fbc112f1 100644
--- a/org.lamport.tla.toolbox.product.uitest/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.product.uitest/pom.xml
@@ -5,7 +5,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.product.uitest</artifactId>
diff --git a/org.lamport.tla.toolbox.product.uitest/rcptt.properties b/toolbox/org.lamport.tla.toolbox.product.uitest/rcptt.properties
similarity index 100%
rename from org.lamport.tla.toolbox.product.uitest/rcptt.properties
rename to toolbox/org.lamport.tla.toolbox.product.uitest/rcptt.properties
diff --git a/org.lamport.tla.toolbox.rss/.classpath b/toolbox/org.lamport.tla.toolbox.rss/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.rss/.classpath
rename to toolbox/org.lamport.tla.toolbox.rss/.classpath
diff --git a/org.lamport.tla.toolbox.rss/.project b/toolbox/org.lamport.tla.toolbox.rss/.project
similarity index 100%
rename from org.lamport.tla.toolbox.rss/.project
rename to toolbox/org.lamport.tla.toolbox.rss/.project
diff --git a/org.lamport.tla.toolbox.rss/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.rss/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.rss/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.rss/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.rss/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.rss/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.rss/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.rss/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.rss/README.txt b/toolbox/org.lamport.tla.toolbox.rss/README.txt
similarity index 100%
rename from org.lamport.tla.toolbox.rss/README.txt
rename to toolbox/org.lamport.tla.toolbox.rss/README.txt
diff --git a/org.lamport.tla.toolbox.rss/build.properties b/toolbox/org.lamport.tla.toolbox.rss/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.rss/build.properties
rename to toolbox/org.lamport.tla.toolbox.rss/build.properties
diff --git a/org.lamport.tla.toolbox.rss/lib/istack-commons-runtime-3.0.7.jar b/toolbox/org.lamport.tla.toolbox.rss/lib/istack-commons-runtime-3.0.7.jar
similarity index 98%
rename from org.lamport.tla.toolbox.rss/lib/istack-commons-runtime-3.0.7.jar
rename to toolbox/org.lamport.tla.toolbox.rss/lib/istack-commons-runtime-3.0.7.jar
index 2fe5b82620b5765e4a77dc3cca97d3424b6cbaed..8de2d2ee69ad27a58ff41b742dd0a9f6acadd149 100644
Binary files a/org.lamport.tla.toolbox.rss/lib/istack-commons-runtime-3.0.7.jar and b/toolbox/org.lamport.tla.toolbox.rss/lib/istack-commons-runtime-3.0.7.jar differ
diff --git a/org.lamport.tla.toolbox.rss/lib/jaxb-api-2.3.1.jar b/toolbox/org.lamport.tla.toolbox.rss/lib/jaxb-api-2.3.1.jar
similarity index 96%
rename from org.lamport.tla.toolbox.rss/lib/jaxb-api-2.3.1.jar
rename to toolbox/org.lamport.tla.toolbox.rss/lib/jaxb-api-2.3.1.jar
index 45658654712b88d45c9464286ffc2fcb07036bdf..967b84d44480ed3a86ea0016f4033d0c88a0947b 100644
Binary files a/org.lamport.tla.toolbox.rss/lib/jaxb-api-2.3.1.jar and b/toolbox/org.lamport.tla.toolbox.rss/lib/jaxb-api-2.3.1.jar differ
diff --git a/org.lamport.tla.toolbox.rss/lib/jaxb-runtime-2.3.1.jar b/toolbox/org.lamport.tla.toolbox.rss/lib/jaxb-runtime-2.3.1.jar
similarity index 99%
rename from org.lamport.tla.toolbox.rss/lib/jaxb-runtime-2.3.1.jar
rename to toolbox/org.lamport.tla.toolbox.rss/lib/jaxb-runtime-2.3.1.jar
index 0b9ef67c498bd731a34125f540dcc9621adea8d8..fb421d990d12b1dd253d49a0c122dcaed4c5c94f 100644
Binary files a/org.lamport.tla.toolbox.rss/lib/jaxb-runtime-2.3.1.jar and b/toolbox/org.lamport.tla.toolbox.rss/lib/jaxb-runtime-2.3.1.jar differ
diff --git a/org.lamport.tla.toolbox.rss/pom.xml b/toolbox/org.lamport.tla.toolbox.rss/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox.rss/pom.xml
rename to toolbox/org.lamport.tla.toolbox.rss/pom.xml
index 1f0ab03d6e7c7be6ff17b17d75351274b8545c50..c8bc5160970ca393ea73cd0910bbde743ed360d0 100644
--- a/org.lamport.tla.toolbox.rss/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.rss/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.rss</artifactId>
diff --git a/org.lamport.tla.toolbox.rss/src/org/lamport/tla/toolbox/rss/Noop.java b/toolbox/org.lamport.tla.toolbox.rss/src/org/lamport/tla/toolbox/rss/Noop.java
similarity index 100%
rename from org.lamport.tla.toolbox.rss/src/org/lamport/tla/toolbox/rss/Noop.java
rename to toolbox/org.lamport.tla.toolbox.rss/src/org/lamport/tla/toolbox/rss/Noop.java
diff --git a/org.lamport.tla.toolbox.test/.classpath b/toolbox/org.lamport.tla.toolbox.test/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.test/.classpath
rename to toolbox/org.lamport.tla.toolbox.test/.classpath
diff --git a/org.lamport.tla.toolbox.test/.project b/toolbox/org.lamport.tla.toolbox.test/.project
similarity index 100%
rename from org.lamport.tla.toolbox.test/.project
rename to toolbox/org.lamport.tla.toolbox.test/.project
diff --git a/org.lamport.tla.toolbox.test/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.test/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.test/.settings/org.eclipse.pde.core.prefs b/toolbox/org.lamport.tla.toolbox.test/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.test/.settings/org.eclipse.pde.core.prefs
rename to toolbox/org.lamport.tla.toolbox.test/.settings/org.eclipse.pde.core.prefs
diff --git a/org.lamport.tla.toolbox.test/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.test/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.test/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.test/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.tla2tex.uitest/build.properties b/toolbox/org.lamport.tla.toolbox.test/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex.uitest/build.properties
rename to toolbox/org.lamport.tla.toolbox.test/build.properties
diff --git a/org.lamport.tla.toolbox.test/pom.xml b/toolbox/org.lamport.tla.toolbox.test/pom.xml
similarity index 99%
rename from org.lamport.tla.toolbox.test/pom.xml
rename to toolbox/org.lamport.tla.toolbox.test/pom.xml
index 8a3d429bbc54e5af6edbead808e12f49dcb31b06..20f6c7d5acaa64cea9035c5482904fcdcb7e4ecb 100644
--- a/org.lamport.tla.toolbox.test/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.test/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.test</artifactId>
diff --git a/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/SpecTest.java b/toolbox/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/SpecTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/SpecTest.java
rename to toolbox/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/SpecTest.java
diff --git a/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/parser/test/ParserDependencyStorageTest.java b/toolbox/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/parser/test/ParserDependencyStorageTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/parser/test/ParserDependencyStorageTest.java
rename to toolbox/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/spec/parser/test/ParserDependencyStorageTest.java
diff --git a/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandlerTest.java b/toolbox/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandlerTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandlerTest.java
rename to toolbox/org.lamport.tla.toolbox.test/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandlerTest.java
diff --git a/org.lamport.tlatools.api/.classpath b/toolbox/org.lamport.tla.toolbox.tool.prover/.classpath
similarity index 100%
rename from org.lamport.tlatools.api/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.prover/.classpath
diff --git a/org.lamport.tla.toolbox.tool.prover/.project b/toolbox/org.lamport.tla.toolbox.tool.prover/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/.project
rename to toolbox/org.lamport.tla.toolbox.tool.prover/.project
diff --git a/org.lamport.tla.toolbox.tool.prover/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.prover/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.prover/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.prover/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.prover/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.prover/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.prover/build.properties b/toolbox/org.lamport.tla.toolbox.tool.prover/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.prover/build.properties
diff --git a/org.lamport.tla.toolbox.tool.prover/plugin.xml b/toolbox/org.lamport.tla.toolbox.tool.prover/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.tool.prover/plugin.xml
diff --git a/org.lamport.tla.toolbox.tool.prover/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.prover/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox.tool.prover/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.prover/pom.xml
index 33e0efbcde09e1847d94aa9eb73258d5fc52ee1c..cf15f95e32f5420e53f55983b8c98eec5d5ed687 100644
--- a/org.lamport.tla.toolbox.tool.prover/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.prover/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.prover</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverPreferenceInitializer.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverPreferenceInitializer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverPreferenceInitializer.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverPreferenceInitializer.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverToolboxLifecycleParticipant.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverToolboxLifecycleParticipant.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverToolboxLifecycleParticipant.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ProverToolboxLifecycleParticipant.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ITLAPMOptions.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ITLAPMOptions.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ITLAPMOptions.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ITLAPMOptions.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJob.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJob.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJob.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJob.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJobRule.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJobRule.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJobRule.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/job/ProverJobRule.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/IProverProcessOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/IProverProcessOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/IProverProcessOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/IProverProcessOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/internal/TLAPMBroadcastStreamListener.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/internal/TLAPMBroadcastStreamListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/internal/TLAPMBroadcastStreamListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/output/internal/TLAPMBroadcastStreamListener.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ConsoleProverProcessOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ConsoleProverProcessOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ConsoleProverProcessOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ConsoleProverProcessOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ProverUIActivator.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ProverUIActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ProverUIActivator.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/ProverUIActivator.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/TLAPMConsoleFactory.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/TLAPMConsoleFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/TLAPMConsoleFactory.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/TLAPMConsoleFactory.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/LaunchProverDialog.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/LaunchProverDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/LaunchProverDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/LaunchProverDialog.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/TLAPMErrorDialog.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/TLAPMErrorDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/TLAPMErrorDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/dialog/TLAPMErrorDialog.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/AbstractProverHandler.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/AbstractProverHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/AbstractProverHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/AbstractProverHandler.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/CheckProofHandler.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/CheckProofHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/CheckProofHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/CheckProofHandler.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/GeneralLaunchProverHandler.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/GeneralLaunchProverHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/GeneralLaunchProverHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/GeneralLaunchProverHandler.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/StatusStepHandler.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/StatusStepHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/StatusStepHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/handler/StatusStepHandler.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/ParsingProverProcessOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/ParsingProverProcessOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/ParsingProverProcessOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/ParsingProverProcessOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/TagBasedTLAPMOutputIncrementalParser.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/TagBasedTLAPMOutputIncrementalParser.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/TagBasedTLAPMOutputIncrementalParser.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/TagBasedTLAPMOutputIncrementalParser.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ColorPredicate.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ColorPredicate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ColorPredicate.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ColorPredicate.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ErrorMessage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ErrorMessage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ErrorMessage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ErrorMessage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationNumberMessage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationNumberMessage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationNumberMessage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationNumberMessage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatus.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatus.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatus.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatus.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatusMessage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatusMessage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatusMessage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/ObligationStatusMessage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepStatusMessage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepStatusMessage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepStatusMessage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepStatusMessage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepTuple.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepTuple.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepTuple.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/StepTuple.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/TLAPMMessage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/TLAPMMessage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/TLAPMMessage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/TLAPMMessage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/WarningMessage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/WarningMessage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/WarningMessage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/data/WarningMessage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/CachingTLAPMOutputSource.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/CachingTLAPMOutputSource.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/CachingTLAPMOutputSource.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/CachingTLAPMOutputSource.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSource.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSource.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSource.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSource.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSourceListener.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSourceListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSourceListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/ITLAPMOutputSourceListener.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/TLAPMOutputSourceRegistry.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/TLAPMOutputSourceRegistry.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/TLAPMOutputSourceRegistry.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/output/source/TLAPMOutputSourceRegistry.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/AdditionalPreferencesPage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/AdditionalPreferencesPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/AdditionalPreferencesPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/AdditionalPreferencesPage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicateFieldEditor.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicateFieldEditor.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicateFieldEditor.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicateFieldEditor.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicatePreferencePage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicatePreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicatePreferencePage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/ColorPredicatePreferencePage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/MainProverPreferencePage.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/MainProverPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/MainProverPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/MainProverPreferencePage.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/TLCChainedPreferenceStore.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/TLCChainedPreferenceStore.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/TLCChainedPreferenceStore.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/preference/TLCChainedPreferenceStore.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverHelper.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverHelper.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverHelper.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverSpecLifecycleParticipant.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverSpecLifecycleParticipant.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverSpecLifecycleParticipant.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/ProverSpecLifecycleParticipant.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/TLAPMExecutableLocator.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/TLAPMExecutableLocator.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/TLAPMExecutableLocator.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/util/TLAPMExecutableLocator.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationSourceViewerConfiguration.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationSourceViewerConfiguration.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationSourceViewerConfiguration.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationSourceViewerConfiguration.java
diff --git a/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationsView.java b/toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationsView.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationsView.java
rename to toolbox/org.lamport.tla.toolbox.tool.prover/src/org/lamport/tla/toolbox/tool/prover/ui/view/ObligationsView.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex.uitest/.classpath b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex.uitest/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/.classpath
diff --git a/org.lamport.tla.toolbox.tool.tla2tex.uitest/.project b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex.uitest/.project
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/.project
diff --git a/org.lamport.tla.toolbox.tool.tla2tex.uitest/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex.uitest/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tla2tex.uitest/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex.uitest/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/build.properties b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/build.properties
diff --git a/org.lamport.tla.toolbox.tool.tla2tex.uitest/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/pom.xml
similarity index 96%
rename from org.lamport.tla.toolbox.tool.tla2tex.uitest/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/pom.xml
index ae442e8864c2776906fe783c5a333d383b278d5e..7a1491fd7a13ce93862a85cf95984706dd4aae2b 100644
--- a/org.lamport.tla.toolbox.tool.tla2tex.uitest/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.tla2tex.uitest</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tla2tex.uitest/src/org/lamport/tla/toolbox/tool/tla2tex/PDFHandlerThreadingTest.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/src/org/lamport/tla/toolbox/tool/tla2tex/PDFHandlerThreadingTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex.uitest/src/org/lamport/tla/toolbox/tool/tla2tex/PDFHandlerThreadingTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex.uitest/src/org/lamport/tla/toolbox/tool/tla2tex/PDFHandlerThreadingTest.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/.classpath b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/.classpath
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/.project b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/.project
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/.project
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/build.properties b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/build.properties
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/icons/document-pdf.png b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/icons/document-pdf.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/icons/document-pdf.png
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/icons/document-pdf.png
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/plugin.xml b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/plugin.xml
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox.tool.tla2tex/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/pom.xml
index f671efe0d39a8b9fa6099f8ce0efeaf189a2e60c..6303b78edd35c7a22397eff4d41b9ded5db53c72 100644
--- a/org.lamport.tla.toolbox.tool.tla2tex/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.tla2tex</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/TLA2TeXActivator.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/TLA2TeXActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/TLA2TeXActivator.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/TLA2TeXActivator.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/AbstractPDFViewerRunnable.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/AbstractPDFViewerRunnable.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/AbstractPDFViewerRunnable.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/AbstractPDFViewerRunnable.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/EmbeddedPDFViewerRunnable.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/EmbeddedPDFViewerRunnable.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/EmbeddedPDFViewerRunnable.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/EmbeddedPDFViewerRunnable.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/OperatingSystemPDFRunnable.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/OperatingSystemPDFRunnable.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/OperatingSystemPDFRunnable.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/OperatingSystemPDFRunnable.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/ProducePDFHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/ProducePDFHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/ProducePDFHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/ProducePDFHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/StandalonePDFViewerRunnable.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/StandalonePDFViewerRunnable.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/StandalonePDFViewerRunnable.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/handler/StandalonePDFViewerRunnable.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/DoubleFieldEditor.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/DoubleFieldEditor.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/DoubleFieldEditor.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/DoubleFieldEditor.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/ITLA2TeXPreferenceConstants.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/ITLA2TeXPreferenceConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/ITLA2TeXPreferenceConstants.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/ITLA2TeXPreferenceConstants.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferenceInitializer.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferenceInitializer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferenceInitializer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferenceInitializer.java
diff --git a/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferencePage.java b/toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tla2tex/src/org/lamport/tla/toolbox/tool/tla2tex/preference/TLA2TeXPreferencePage.java
diff --git a/org.lamport.tlatools.consumer.distributed/.classpath b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/.classpath
similarity index 100%
rename from org.lamport.tlatools.consumer.distributed/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/.classpath
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/.project b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/.project
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/.project
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.pde.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.pde.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/.settings/org.eclipse.pde.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/build.properties b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/build.properties
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/pom.xml
similarity index 97%
rename from org.lamport.tla.toolbox.tool.tlc.test/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/pom.xml
index c5f080b762c598fe9e3cf2dfa6a2ef5f204470f2..2661efbdf2182ca91001996d17f54fb02febddae 100644
--- a/org.lamport.tla.toolbox.tool.tlc.test/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.tlc.test</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelperTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelperTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelperTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelperTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/OutputRegexTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/OutputRegexTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/OutputRegexTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.test/src/org/lamport/tla/toolbox/tool/tlc/util/OutputRegexTest.java
diff --git a/org.lamport.tlatools.impl.distributed/.classpath b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/.classpath
similarity index 100%
rename from org.lamport.tlatools.impl.distributed/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/.classpath
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/.project b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/.project
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/.project
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/build.properties b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/build.properties
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/files/Bug267success.out b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/files/Bug267success.out
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/files/Bug267success.out
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/files/Bug267success.out
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/files/FindOp.out b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/files/FindOp.out
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/files/FindOp.out
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/files/FindOp.out
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/files/ShortFindOp.out b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/files/ShortFindOp.out
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/files/ShortFindOp.out
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/files/ShortFindOp.out
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/pom.xml
similarity index 97%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/pom.xml
index 63e936bf2de7b19f4a1ffa4947727768f535bace..1aee5e6e992f8051e40cbcf7fb93602f52690e35 100644
--- a/org.lamport.tla.toolbox.tool.tlc.ui.test/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.tlc.ui.test</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItemTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItemTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItemTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItemTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/DataTests.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/DataTests.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/DataTests.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/DataTests.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/Simple.tla b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/Simple.tla
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/Simple.tla
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/Simple.tla
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItemTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItemTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItemTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItemTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCErrorTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCErrorTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCErrorTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCErrorTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProviderTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProviderTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProviderTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProviderTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCStateTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCStateTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCStateTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCStateTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValueTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValueTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValueTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValueTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Listener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Listener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Listener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Listener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Test.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Test.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Test.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/Bug267Test.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/DummyListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/DummyListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/DummyListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/DummyListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/MethodInvocationCounter.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/MethodInvocationCounter.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/MethodInvocationCounter.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/MethodInvocationCounter.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/StateTagBasedTLCOutputIncrementalParserTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/StateTagBasedTLCOutputIncrementalParserTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/StateTagBasedTLCOutputIncrementalParserTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/StateTagBasedTLCOutputIncrementalParserTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParserTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParserTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParserTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParserTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelperTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelperTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelperTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelperTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ParsingToolkitTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ParsingToolkitTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ParsingToolkitTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ParsingToolkitTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelperTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelperTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelperTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelperTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelperTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelperTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelperTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelperTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/UtilTests.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/UtilTests.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/UtilTests.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/util/UtilTests.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorViewTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorViewTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorViewTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorViewTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandlerTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandlerTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandlerTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.test/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandlerTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.classpath b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.classpath
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.project b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/.project
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.project
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/META-INF/MANIFEST.MF
diff --git a/org.lamport.tlatools.api/build.properties b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/build.properties
similarity index 100%
rename from org.lamport.tlatools.api/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/build.properties
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/org.lamport.tla.toolbox.tool.tlc.ui.uitest.launch b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/org.lamport.tla.toolbox.tool.tlc.ui.uitest.launch
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/org.lamport.tla.toolbox.tool.tlc.ui.uitest.launch
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/org.lamport.tla.toolbox.tool.tlc.ui.uitest.launch
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/pom.xml
similarity index 96%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/pom.xml
index e0e87e06ff576239fc4bf1e27e4e8c3b47e937e2..87f7f695a1bf263c3d438c7b1577f3cf7a41430a 100644
--- a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.tlc.ui.uitest</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/SmokeTests.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/SmokeTests.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/SmokeTests.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/SmokeTests.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/AbstractTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/AbstractTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/AbstractTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/AbstractTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/DummyJobChangeListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/DummyJobChangeListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/DummyJobChangeListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/DummyJobChangeListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelCheckerTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelCheckerTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelCheckerTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelCheckerTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelEditorOpenCondition.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelEditorOpenCondition.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelEditorOpenCondition.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/ModelEditorOpenCondition.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/threading/HandlerThreadingTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/threading/HandlerThreadingTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/threading/HandlerThreadingTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/tool/tlc/ui/test/threading/HandlerThreadingTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/CloneModelTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/CloneModelTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/CloneModelTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/CloneModelTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/GotoDefinitionTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/GotoDefinitionTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/GotoDefinitionTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/GotoDefinitionTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandlerTest.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandlerTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandlerTest.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandlerTest.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/.classpath b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/.classpath
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/.project b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/.project
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/.project
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/build.properties b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/build.properties
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/helpContexts.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/helpContexts.xml
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/helpContexts.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/helpContexts.xml
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/html/constant_dialog.html b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/html/constant_dialog.html
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/html/constant_dialog.html
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/html/constant_dialog.html
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj@2x.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj@2x.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj@2x.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/quickfix_obj@2x.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state@2x.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state@2x.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state@2x.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/toggle_expand_state@2x.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter@2x.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter@2x.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter@2x.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/elcl16/trace_filter@2x.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/add.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/add.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/add.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/add.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_128.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_128.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_128.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_128.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_16.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_16.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_16.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_16.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_24.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_24.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_24.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_24.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_32.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_32.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_32.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_32.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_512.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_512.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_512.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_512.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_64.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_64.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_64.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_model_options_64.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_128.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_128.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_128.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_128.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_16.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_16.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_16.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_16.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_24.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_24.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_24.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_24.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_32.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_32.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_32.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_32.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_512.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_512.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_512.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_512.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_64.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_64.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_64.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/advanced_tlc_options_64.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/args_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/args_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/args_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/args_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/brkpi_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/brkpi_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/brkpi_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/brkpi_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/choice_sc_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/choice_sc_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/choice_sc_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/choice_sc_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/compare_method.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/compare_method.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/compare_method.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/compare_method.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/console_view2.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/console_view2.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/console_view2.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/console_view2.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/copy_edit.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/copy_edit.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/copy_edit.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/copy_edit.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/correctness_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/correctness_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/correctness_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/correctness_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/debugt_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/debugt_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/debugt_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/debugt_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/default_co.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/default_co.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/default_co.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/default_co.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_128.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_128.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_128.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_128.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_16.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_16.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_16.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_16.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_24.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_24.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_24.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_24.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_32.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_32.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_32.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_32.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_512.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_512.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_512.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_512.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_64.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_64.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_64.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ece_page_64.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/errorwarning_tab.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/errorwarning_tab.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/errorwarning_tab.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/errorwarning_tab.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/impc_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/impc_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/impc_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/impc_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ldebug_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ldebug_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ldebug_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/ldebug_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/loop_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/loop_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/loop_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/loop_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_no_error.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_no_error.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_no_error.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_no_error.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_128.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_128.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_128.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_128.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_16.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_16.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_16.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_16.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_24.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_24.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_24.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_24.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_32.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_32.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_32.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_32.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_512.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_512.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_512.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_512.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_64.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_64.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_64.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_options_64.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_running_remotely.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_running_remotely.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_running_remotely.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_running_remotely.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_with_error.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_with_error.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_with_error.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/model_with_error.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/nav_go.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/nav_go.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/nav_go.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/nav_go.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/newstream_wiz.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/newstream_wiz.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/newstream_wiz.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/newstream_wiz.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/over_co.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/over_co.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/over_co.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/over_co.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/private_co.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/private_co.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/private_co.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/private_co.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/progress_stop.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/progress_stop.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/progress_stop.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/progress_stop.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/report2_obj.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/report2_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/report2_obj.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/report2_obj.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_128.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_128.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_128.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_128.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_16.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_16.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_16.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_16.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_24.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_24.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_24.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_24.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_32.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_32.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_32.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_32.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_512.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_512.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_512.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_512.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_64.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_64.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_64.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/results_page_64.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc@2x.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc@2x.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc@2x.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/run_exc@2x.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.png b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.png
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.png
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.png
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.svg b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.svg
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.svg
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/thread_view.svg
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/variable_view.gif b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/variable_view.gif
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/icons/full/variable_view.gif
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/icons/full/variable_view.gif
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/plugin.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/plugin.xml
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox.tool.tlc.ui/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/pom.xml
index c9f2da869b260e3ca972ba04305985f62dd992a2..364927b21e3d6006fe82a9cb426e937ff4321f3c 100644
--- a/org.lamport.tla.toolbox.tool.tlc.ui/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.tlc.ui</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CheckModelHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CheckModelHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CheckModelHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CheckModelHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneForeignModelHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneForeignModelHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneForeignModelHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneForeignModelHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandlerDelegate.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandlerDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandlerDelegate.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/CloneModelHandlerDelegate.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/DeleteModelHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/DeleteModelHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/DeleteModelHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/DeleteModelHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/LetsCreateAHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/LetsCreateAHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/LetsCreateAHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/LetsCreateAHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerCurrentDelegate.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerCurrentDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerCurrentDelegate.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerCurrentDelegate.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerSelectedDelegate.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerSelectedDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerSelectedDelegate.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/NewModelHandlerSelectedDelegate.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandlerDelegate.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandlerDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandlerDelegate.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenModelHandlerDelegate.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenSavedModuleHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenSavedModuleHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenSavedModuleHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenSavedModuleHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenTLCErrorViewHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenTLCErrorViewHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenTLCErrorViewHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/OpenTLCErrorViewHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RenameModelHandlerDelegate.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RenameModelHandlerDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RenameModelHandlerDelegate.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RenameModelHandlerDelegate.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RepairLaunchHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RepairLaunchHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RepairLaunchHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/RepairLaunchHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StartLaunchHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StartLaunchHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StartLaunchHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StartLaunchHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StopLaunchHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StopLaunchHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StopLaunchHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/StopLaunchHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/TLAOpenElementSelectionDialogHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/TLAOpenElementSelectionDialogHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/TLAOpenElementSelectionDialogHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/handlers/TLAOpenElementSelectionDialogHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ConsoleProcessOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ConsoleProcessOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ConsoleProcessOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ConsoleProcessOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ITLCOutputListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ITLCOutputListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ITLCOutputListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ITLCOutputListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/LogFileReader.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/LogFileReader.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/LogFileReader.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/LogFileReader.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ParsingTLCOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ParsingTLCOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ParsingTLCOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/ParsingTLCOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/PartitionToolkit.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/PartitionToolkit.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/PartitionToolkit.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/PartitionToolkit.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ActionInformationItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformation.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformation.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformation.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformation.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageInformationItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageUINotification.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageUINotification.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageUINotification.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/CoverageUINotification.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/GeneralOutputParsingHelper.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/GeneralOutputParsingHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/GeneralOutputParsingHelper.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/GeneralOutputParsingHelper.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ITLCModelLaunchDataPresenter.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ITLCModelLaunchDataPresenter.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ITLCModelLaunchDataPresenter.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ITLCModelLaunchDataPresenter.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ModuleCoverageInformation.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ModuleCoverageInformation.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ModuleCoverageInformation.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/ModuleCoverageInformation.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/Representation.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/Representation.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/Representation.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/Representation.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/RootCoverageInformationItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/RootCoverageInformationItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/RootCoverageInformationItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/RootCoverageInformationItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/StateSpaceInformationItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCCompoundVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCCompoundVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCCompoundVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCCompoundVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCError.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCError.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCError.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCError.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFcnElementVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFcnElementVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFcnElementVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFcnElementVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFunctionVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFunctionVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFunctionVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCFunctionVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCModelLaunchDataProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCMultiVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCMultiVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCMultiVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCMultiVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCNamedVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCNamedVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCNamedVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCNamedVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCRecordVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCRecordVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCRecordVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCRecordVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSequenceVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSequenceVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSequenceVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSequenceVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSetVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSetVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSetVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSetVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSimpleVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSimpleVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSimpleVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCSimpleVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCState.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCState.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCState.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCState.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariable.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariable.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariable.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariable.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValue.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValue.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValue.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TLCVariableValue.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TraceExplorerDataProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TraceExplorerDataProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TraceExplorerDataProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/data/TraceExplorerDataProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/CachingTLCOutputSource.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/CachingTLCOutputSource.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/CachingTLCOutputSource.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/CachingTLCOutputSource.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/ITLCOutputSource.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/ITLCOutputSource.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/ITLCOutputSource.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/ITLCOutputSource.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCCharScanner.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCCharScanner.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCCharScanner.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCCharScanner.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCMultiLineRule.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCMultiLineRule.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCMultiLineRule.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCMultiLineRule.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCOutputSourceRegistry.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCOutputSourceRegistry.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCOutputSourceRegistry.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCOutputSourceRegistry.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegion.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegion.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegion.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegion.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegionContainer.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegionContainer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegionContainer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCRegionContainer.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCSingleLineRule.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCSingleLineRule.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCSingleLineRule.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TLCSingleLineRule.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCAnalyzer.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCAnalyzer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCAnalyzer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCAnalyzer.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParser.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParser.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParser.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputIncrementalParser.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputTokenScanner.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputTokenScanner.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputTokenScanner.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/output/source/TagBasedTLCOutputTokenScanner.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerComposite.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerComposite.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerComposite.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerComposite.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerHelper.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerHelper.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerHelper.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/ResultPresenter.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/ResultPresenter.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/ResultPresenter.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/ResultPresenter.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCPerspective.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCPerspective.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCPerspective.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCPerspective.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCUIActivator.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCUIActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCUIActivator.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/TLCUIActivator.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/console/ConsoleFactory.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/console/ConsoleFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/console/ConsoleFactory.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/console/ConsoleFactory.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/contribution/DynamicContributionItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/contribution/DynamicContributionItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/contribution/DynamicContributionItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/contribution/DynamicContributionItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ErrorViewTraceFilterDialog.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ErrorViewTraceFilterDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ErrorViewTraceFilterDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ErrorViewTraceFilterDialog.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ExtraModulesDialog.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ExtraModulesDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ExtraModulesDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/ExtraModulesDialog.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/FilteredDefinitionSelectionDialog.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/FilteredDefinitionSelectionDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/FilteredDefinitionSelectionDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/FilteredDefinitionSelectionDialog.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/TLAFilteredItemsSelectionDialog.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/TLAFilteredItemsSelectionDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/TLAFilteredItemsSelectionDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/dialog/TLAFilteredItemsSelectionDialog.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/DataBindingManager.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/DataBindingManager.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/DataBindingManager.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/DataBindingManager.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ISectionConstants.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ISectionConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ISectionConstants.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ISectionConstants.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ModelEditor.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ModelEditor.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ModelEditor.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/ModelEditor.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/TLACoverageEditor.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/TLACoverageEditor.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/TLACoverageEditor.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/TLACoverageEditor.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/BasicFormPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/BasicFormPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/BasicFormPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/BasicFormPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ControlNavigationLocation.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ControlNavigationLocation.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ControlNavigationLocation.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ControlNavigationLocation.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ErrorMessage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ErrorMessage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ErrorMessage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/ErrorMessage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/IModelOperationContainer.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/IModelOperationContainer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/IModelOperationContainer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/IModelOperationContainer.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/MainModelPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/MainModelPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/MainModelPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/MainModelPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/NavigationLocationComposite.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/NavigationLocationComposite.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/NavigationLocationComposite.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/NavigationLocationComposite.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TLCConsumptionProfile.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TLCConsumptionProfile.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TLCConsumptionProfile.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TLCConsumptionProfile.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TabNavigationLocation.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TabNavigationLocation.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TabNavigationLocation.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/TabNavigationLocation.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedModelPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedModelPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedModelPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedModelPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedTLCOptionsPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedTLCOptionsPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedTLCOptionsPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/advanced/AdvancedTLCOptionsPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageLabelProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageLabelProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageLabelProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageLabelProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageViewerComparator.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageViewerComparator.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageViewerComparator.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/CoverageViewerComparator.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/DataDisplay.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/DataDisplay.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/DataDisplay.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/DataDisplay.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/EvaluateConstantExpressionPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/EvaluateConstantExpressionPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/EvaluateConstantExpressionPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/EvaluateConstantExpressionPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPageColumnListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPageColumnListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPageColumnListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/ResultPageColumnListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/StateSpaceLabelProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/StateSpaceLabelProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/StateSpaceLabelProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/page/results/StateSpaceLabelProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/EmptyPart.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/EmptyPart.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/EmptyPart.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/EmptyPart.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IAttributeBinding.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IAttributeBinding.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IAttributeBinding.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IAttributeBinding.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IValidateble.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IValidateble.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IValidateble.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/IValidateble.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableConstantSectionPart.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableConstantSectionPart.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableConstantSectionPart.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableConstantSectionPart.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableOverridesSectionPart.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableOverridesSectionPart.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableOverridesSectionPart.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableOverridesSectionPart.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableSectionPart.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableSectionPart.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableSectionPart.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableSectionPart.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableTableSectionPart.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableTableSectionPart.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableTableSectionPart.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/part/ValidateableTableSectionPart.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/IModelEditorPreferenceConstants.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/IModelEditorPreferenceConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/IModelEditorPreferenceConstants.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/IModelEditorPreferenceConstants.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferenceInitializer.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferenceInitializer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferenceInitializer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferenceInitializer.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferencePage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/preference/ModelEditorPreferencePage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/AssignmentContentProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/AssignmentContentProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/AssignmentContentProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/AssignmentContentProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaContentProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaContentProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaContentProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaContentProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaLabelProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaLabelProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaLabelProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/editor/provider/FormulaLabelProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/expression/ModelErrorsTester.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/expression/ModelErrorsTester.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/expression/ModelErrorsTester.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/expression/ModelErrorsTester.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/CloneModelContributionItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/CloneModelContributionItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/CloneModelContributionItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/CloneModelContributionItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContentProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContentProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContentProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContentProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContributionItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContributionItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContributionItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelContributionItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelLabelProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelLabelProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelLabelProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelLabelProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelSnapshotSorter.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelSnapshotSorter.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelSnapshotSorter.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/ModelSnapshotSorter.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/SavedModuleContributionItem.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/SavedModuleContributionItem.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/SavedModuleContributionItem.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/modelexplorer/SavedModuleContributionItem.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/ITLCPreferenceConstants.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/ITLCPreferenceConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/ITLCPreferenceConstants.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/ITLCPreferenceConstants.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferenceInitializer.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferenceInitializer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferenceInitializer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferenceInitializer.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferencePage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/preference/TLCPreferencePage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/AbstractTableLabelProvider.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/AbstractTableLabelProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/AbstractTableLabelProvider.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/AbstractTableLabelProvider.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/DirtyMarkingListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/DirtyMarkingListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/DirtyMarkingListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/DirtyMarkingListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsDialog.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsDialog.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsHandler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsHandler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExecutionStatisticsHandler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExpandableSpaceReclaimer.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExpandableSpaceReclaimer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExpandableSpaceReclaimer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ExpandableSpaceReclaimer.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelper.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelper.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/FormHelper.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IModuleLocatable.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IModuleLocatable.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IModuleLocatable.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IModuleLocatable.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ITLAReserveredWords.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ITLAReserveredWords.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ITLAReserveredWords.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ITLAReserveredWords.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IgnoringListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IgnoringListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IgnoringListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/IgnoringListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorAdapterFactory.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorAdapterFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorAdapterFactory.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorAdapterFactory.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorPartListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorPartListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorPartListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ModelEditorPartListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ReadOnlyFileEditorInput.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ReadOnlyFileEditorInput.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ReadOnlyFileEditorInput.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/ReadOnlyFileEditorInput.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/RecordToSourceCoupler.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/RecordToSourceCoupler.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/RecordToSourceCoupler.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/RecordToSourceCoupler.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelper.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelper.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/SemanticHelper.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelper.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelper.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUIHelper.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUINotification.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUINotification.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUINotification.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/util/TLCUINotification.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/ErrorTraceTreeViewer.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/ErrorTraceTreeViewer.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/ErrorTraceTreeViewer.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/ErrorTraceTreeViewer.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorView.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorView.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorView.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorView.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizard.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizard.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizard.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizard.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizardPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizardPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizardPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/AssignmentWizardPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizard.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizard.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizard.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizard.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizardPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizardPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizardPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/FormulaWizardPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/LabeledListComposite.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/LabeledListComposite.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/LabeledListComposite.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/LabeledListComposite.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/TypingWizardPage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/TypingWizardPage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/TypingWizardPage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/wizard/TypingWizardPage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc.ui/test/org/lamport/tla/toolbox/tool/tlc/AllTests.java b/toolbox/org.lamport.tla.toolbox.tool.tlc.ui/test/org/lamport/tla/toolbox/tool/tlc/AllTests.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc.ui/test/org/lamport/tla/toolbox/tool/tlc/AllTests.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc.ui/test/org/lamport/tla/toolbox/tool/tlc/AllTests.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/.classpath b/toolbox/org.lamport.tla.toolbox.tool.tlc/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/.classpath
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/.classpath
diff --git a/org.lamport.tla.toolbox.tool.tlc/.project b/toolbox/org.lamport.tla.toolbox.tool.tlc/.project
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/.project
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/.project
diff --git a/org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.wst.validation.prefs b/toolbox/org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.wst.validation.prefs
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/.settings/org.eclipse.wst.validation.prefs
diff --git a/org.lamport.tla.toolbox.tool.tlc/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.tool.tlc/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.tool.tlc/build.properties b/toolbox/org.lamport.tla.toolbox.tool.tlc/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/build.properties
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/build.properties
diff --git a/org.lamport.tla.toolbox.tool.tlc/plugin.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/plugin.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/plugin.xml
diff --git a/org.lamport.tla.toolbox.tool.tlc/pom.xml b/toolbox/org.lamport.tla.toolbox.tool.tlc/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox.tool.tlc/pom.xml
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/pom.xml
index 00210b12380f4b131862cfa3025b042a2022bfff..069b6eb7dc1bfa041ad1662866cf7032a79e0b12 100644
--- a/org.lamport.tla.toolbox.tool.tlc/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.tool.tlc/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.tool.tlc</artifactId>
diff --git a/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processOutputSink.exsd b/toolbox/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processOutputSink.exsd
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processOutputSink.exsd
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processOutputSink.exsd
diff --git a/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processResultPresenter.exsd b/toolbox/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processResultPresenter.exsd
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processResultPresenter.exsd
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolbox.tlc.processResultPresenter.exsd
diff --git a/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolx.tlc.job.exsd b/toolbox/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolx.tlc.job.exsd
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolx.tlc.job.exsd
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/schema/org.lamport.tla.toolx.tlc.job.exsd
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/LongFormDialog.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/LongFormDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/LongFormDialog.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/LongFormDialog.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCActivator.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCActivator.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCActivator.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCLifecycleParticipant.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCLifecycleParticipant.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCLifecycleParticipant.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCLifecycleParticipant.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCSpecLifeCycleParticipant.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCSpecLifeCycleParticipant.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCSpecLifeCycleParticipant.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/TLCSpecLifeCycleParticipant.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/expression/MarkerPropertyTester.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/expression/MarkerPropertyTester.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/expression/MarkerPropertyTester.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/expression/MarkerPropertyTester.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/AbstractJob.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/AbstractJob.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/AbstractJob.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/AbstractJob.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/DistributedTLCJob.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/DistributedTLCJob.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/DistributedTLCJob.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/DistributedTLCJob.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/ITLCJobStatus.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/ITLCJobStatus.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/ITLCJobStatus.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/ITLCJobStatus.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJob.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJob.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJob.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJob.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJobFactory.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJobFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJobFactory.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCJobFactory.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCProcessJob.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCProcessJob.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCProcessJob.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TLCProcessJob.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TraceExplorerJob.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TraceExplorerJob.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TraceExplorerJob.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/job/TraceExplorerJob.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationConstants.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationConstants.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationConstants.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationDefaults.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationDefaults.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationDefaults.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IConfigurationDefaults.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationConstants.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationConstants.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationConstants.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationDefaults.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationDefaults.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationDefaults.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/IModelConfigurationDefaults.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TLCModelLaunchDelegate.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TLCModelLaunchDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TLCModelLaunchDelegate.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TLCModelLaunchDelegate.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TraceExplorerDelegate.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TraceExplorerDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TraceExplorerDelegate.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/launch/TraceExplorerDelegate.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/AbstractModelStateChangeListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/AbstractModelStateChangeListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/AbstractModelStateChangeListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/AbstractModelStateChangeListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/Model.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/Model.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/Model.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/Model.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelCoverage.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelCoverage.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelCoverage.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelCoverage.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelWriter.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelWriter.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelWriter.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/ModelWriter.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCModelFactory.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCModelFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCModelFactory.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCModelFactory.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpec.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpec.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpec.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpec.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpecFactory.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpecFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpecFactory.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TLCSpecFactory.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TraceExpressionModelWriter.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TraceExpressionModelWriter.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TraceExpressionModelWriter.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/model/TraceExpressionModelWriter.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/IProcessOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/IProcessOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/IProcessOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/IProcessOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/BroadcastStreamListener.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/BroadcastStreamListener.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/BroadcastStreamListener.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/BroadcastStreamListener.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/FileProcessOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/FileProcessOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/FileProcessOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/FileProcessOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/TraceExplorerTraceSourceOutputSink.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/TraceExplorerTraceSourceOutputSink.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/TraceExplorerTraceSourceOutputSink.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/output/internal/TraceExplorerTraceSourceOutputSink.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/result/IResultPresenter.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/result/IResultPresenter.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/result/IResultPresenter.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/result/IResultPresenter.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ChangedSpecModulesGatheringDeltaVisitor.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ChangedSpecModulesGatheringDeltaVisitor.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ChangedSpecModulesGatheringDeltaVisitor.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ChangedSpecModulesGatheringDeltaVisitor.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelper.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelper.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelHelper.java
diff --git a/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelNameValidator.java b/toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelNameValidator.java
similarity index 100%
rename from org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelNameValidator.java
rename to toolbox/org.lamport.tla.toolbox.tool.tlc/src/org/lamport/tla/toolbox/tool/tlc/util/ModelNameValidator.java
diff --git a/org.lamport.tla.toolbox.uitest/.classpath b/toolbox/org.lamport.tla.toolbox.uitest/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/.classpath
rename to toolbox/org.lamport.tla.toolbox.uitest/.classpath
diff --git a/org.lamport.tla.toolbox.uitest/.project b/toolbox/org.lamport.tla.toolbox.uitest/.project
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/.project
rename to toolbox/org.lamport.tla.toolbox.uitest/.project
diff --git a/org.lamport.tla.toolbox.uitest/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox.uitest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox.uitest/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox.uitest/DieHard/DieHard.cfg b/toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.cfg
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/DieHard/DieHard.cfg
rename to toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.cfg
diff --git a/org.lamport.tla.toolbox.uitest/DieHard/DieHard.tla b/toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/DieHard/DieHard.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.tla
diff --git a/org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.project b/toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.project
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.project
rename to toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.project
diff --git a/org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.settings/org.lamport.tla.toolbox.prefs b/toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.settings/org.lamport.tla.toolbox.prefs
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.settings/org.lamport.tla.toolbox.prefs
rename to toolbox/org.lamport.tla.toolbox.uitest/DieHard/DieHard.toolbox/.settings/org.lamport.tla.toolbox.prefs
diff --git a/org.lamport.tla.toolbox.uitest/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox.uitest/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox.uitest/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox.uitest/META-INF/aop.xml b/toolbox/org.lamport.tla.toolbox.uitest/META-INF/aop.xml
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/META-INF/aop.xml
rename to toolbox/org.lamport.tla.toolbox.uitest/META-INF/aop.xml
diff --git a/org.lamport.tla.toolbox.uitest/build.ajproperties b/toolbox/org.lamport.tla.toolbox.uitest/build.ajproperties
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/build.ajproperties
rename to toolbox/org.lamport.tla.toolbox.uitest/build.ajproperties
diff --git a/org.lamport.tla.toolbox.uitest/build.properties b/toolbox/org.lamport.tla.toolbox.uitest/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/build.properties
rename to toolbox/org.lamport.tla.toolbox.uitest/build.properties
diff --git a/org.lamport.tla.toolbox.uitest/farsite/APIComponentsModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/APIComponentsModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/APIComponentsModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/APIComponentsModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/AbstractComponentsModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/AbstractComponentsModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/AbstractComponentsModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/AbstractComponentsModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/AdditionalMathOperators.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/AdditionalMathOperators.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/AdditionalMathOperators.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/AdditionalMathOperators.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/AdditionalSequenceOperators.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/AdditionalSequenceOperators.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/AdditionalSequenceOperators.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/AdditionalSequenceOperators.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/CertificateModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/CertificateModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/CertificateModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/CertificateModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/CertifierModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/CertifierModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/CertifierModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/CertifierModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/CertifierPortalModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/CertifierPortalModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/CertifierPortalModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/CertifierPortalModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientActionSerializerModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientActionSerializerModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientActionSerializerModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientActionSerializerModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientFaultModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientFaultModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientFaultModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientFaultModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientFileOwnershipModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientFileOwnershipModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientFileOwnershipModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientFileOwnershipModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientFileProtectionModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientFileProtectionModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientFileProtectionModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientFileProtectionModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientKnowledgePredicatesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientKnowledgePredicatesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientKnowledgePredicatesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientKnowledgePredicatesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientLeaseManagerModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLeaseManagerModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientLeaseManagerModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLeaseManagerModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientLeasePredicatesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLeasePredicatesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientLeasePredicatesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLeasePredicatesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientLeaseResourcesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLeaseResourcesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientLeaseResourcesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLeaseResourcesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientLogModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLogModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientLogModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientLogModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientMessageBufferModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientMessageBufferModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientMessageBufferModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientMessageBufferModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientOperationProcessorModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientOperationProcessorModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientOperationProcessorModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientOperationProcessorModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClientPermissionPredicatesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientPermissionPredicatesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClientPermissionPredicatesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClientPermissionPredicatesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClockSyncModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClockSyncModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClockSyncModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClockSyncModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ClockSyncPortalModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ClockSyncPortalModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ClockSyncPortalModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ClockSyncPortalModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/CommonMessageModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/CommonMessageModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/CommonMessageModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/CommonMessageModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/DistributedSystemModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/DistributedSystemModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/DistributedSystemModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/DistributedSystemModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/FileComponentsModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/FileComponentsModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/FileComponentsModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/FileComponentsModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/FileFieldModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/FileFieldModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/FileFieldModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/FileFieldModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/FileModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/FileModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/FileModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/FileModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/FileOwnershipModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/FileOwnershipModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/FileOwnershipModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/FileOwnershipModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/FiniteSets.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/FiniteSets.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/FiniteSets.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/FiniteSets.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/GotoDefinition.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/GotoDefinition.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/GotoDefinition.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/GotoDefinition.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/HostBaseModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/HostBaseModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/HostBaseModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/HostBaseModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/Integers.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/Integers.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/Integers.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/Integers.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/MessageOrderDependencyModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/MessageOrderDependencyModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/MessageOrderDependencyModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/MessageOrderDependencyModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/MessengerModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/MessengerModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/MessengerModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/MessengerModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/MessengerPortalModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/MessengerPortalModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/MessengerPortalModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/MessengerPortalModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ModeModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ModeModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ModeModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ModeModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/Naturals.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/Naturals.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/Naturals.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/Naturals.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/PhysicalComponentsModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/PhysicalComponentsModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/PhysicalComponentsModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/PhysicalComponentsModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/PriorityModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/PriorityModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/PriorityModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/PriorityModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/README b/toolbox/org.lamport.tla.toolbox.uitest/farsite/README
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/README
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/README
diff --git a/org.lamport.tla.toolbox.uitest/farsite/Reals.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/Reals.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/Reals.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/Reals.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/Sequences.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/Sequences.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/Sequences.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/Sequences.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerCreatorModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerCreatorModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerCreatorModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerCreatorModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerCreatorPortalModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerCreatorPortalModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerCreatorPortalModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerCreatorPortalModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerFaultModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerFaultModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerFaultModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerFaultModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerFileOwnershipModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerFileOwnershipModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerFileOwnershipModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerFileOwnershipModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerFileProtectionModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerFileProtectionModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerFileProtectionModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerFileProtectionModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerKnowledgePredicatesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerKnowledgePredicatesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerKnowledgePredicatesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerKnowledgePredicatesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerLeaseManagerModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeaseManagerModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerLeaseManagerModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeaseManagerModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerLeasePartialActionsModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeasePartialActionsModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerLeasePartialActionsModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeasePartialActionsModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerLeasePredicatesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeasePredicatesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerLeasePredicatesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeasePredicatesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerLeaseResourcesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeaseResourcesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerLeaseResourcesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerLeaseResourcesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerMessageBuffersModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerMessageBuffersModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerMessageBuffersModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerMessageBuffersModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerMessageModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerMessageModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerMessageModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerMessageModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerOperationProcessorModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerOperationProcessorModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerOperationProcessorModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerOperationProcessorModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerPhantomClientModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerPhantomClientModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerPhantomClientModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerPhantomClientModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ServerReviewPredicatesModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerReviewPredicatesModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ServerReviewPredicatesModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ServerReviewPredicatesModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/Stubs.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/Stubs.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/Stubs.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/Stubs.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/TLC.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/TLC.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/TLC.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/TLC.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/ThreadModule.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/ThreadModule.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/ThreadModule.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/ThreadModule.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/foo1.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/foo1.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/foo1.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/foo1.tla
diff --git a/org.lamport.tla.toolbox.uitest/farsite/foo2.tla b/toolbox/org.lamport.tla.toolbox.uitest/farsite/foo2.tla
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/farsite/foo2.tla
rename to toolbox/org.lamport.tla.toolbox.uitest/farsite/foo2.tla
diff --git a/org.lamport.tla.toolbox.uitest/pom.xml b/toolbox/org.lamport.tla.toolbox.uitest/pom.xml
similarity index 97%
rename from org.lamport.tla.toolbox.uitest/pom.xml
rename to toolbox/org.lamport.tla.toolbox.uitest/pom.xml
index 25c497c169d12e5babcef72c333e041578b82d0f..7eb0bce3fab2dabc4674c250d05d928b172029c9 100644
--- a/org.lamport.tla.toolbox.uitest/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox.uitest/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox.uitest</artifactId>
diff --git a/org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAdaptor.java b/toolbox/org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAdaptor.java
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAdaptor.java
rename to toolbox/org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAdaptor.java
diff --git a/org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAspect.aj b/toolbox/org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAspect.aj
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAspect.aj
rename to toolbox/org.lamport.tla.toolbox.uitest/src-aj/org/lamport/tla/toolbox/test/threading/MonitorAspect.aj
diff --git a/org.lamport.tla.toolbox.uitest/src/log4j.xml b/toolbox/org.lamport.tla.toolbox.uitest/src/log4j.xml
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/src/log4j.xml
rename to toolbox/org.lamport.tla.toolbox.uitest/src/log4j.xml
diff --git a/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/test/RCPTestSetupHelper.java b/toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/test/RCPTestSetupHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/test/RCPTestSetupHelper.java
rename to toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/test/RCPTestSetupHelper.java
diff --git a/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandlerTest.java b/toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandlerTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandlerTest.java
rename to toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandlerTest.java
diff --git a/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java b/toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java
rename to toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/handler/SpecEditorOpenCondition.java
diff --git a/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/wizard/AddSpecWizardTest.java b/toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/wizard/AddSpecWizardTest.java
similarity index 100%
rename from org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/wizard/AddSpecWizardTest.java
rename to toolbox/org.lamport.tla.toolbox.uitest/src/org/lamport/tla/toolbox/ui/wizard/AddSpecWizardTest.java
diff --git a/org.lamport.tla.toolbox/.classpath b/toolbox/org.lamport.tla.toolbox/.classpath
similarity index 100%
rename from org.lamport.tla.toolbox/.classpath
rename to toolbox/org.lamport.tla.toolbox/.classpath
diff --git a/org.lamport.tla.toolbox/.project b/toolbox/org.lamport.tla.toolbox/.project
similarity index 100%
rename from org.lamport.tla.toolbox/.project
rename to toolbox/org.lamport.tla.toolbox/.project
diff --git a/org.lamport.tla.toolbox/.settings/org.eclipse.jdt.core.prefs b/toolbox/org.lamport.tla.toolbox/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.lamport.tla.toolbox/.settings/org.eclipse.jdt.core.prefs
rename to toolbox/org.lamport.tla.toolbox/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.lamport.tla.toolbox/CHANGES b/toolbox/org.lamport.tla.toolbox/CHANGES
similarity index 100%
rename from org.lamport.tla.toolbox/CHANGES
rename to toolbox/org.lamport.tla.toolbox/CHANGES
diff --git a/org.lamport.tla.toolbox/META-INF/MANIFEST.MF b/toolbox/org.lamport.tla.toolbox/META-INF/MANIFEST.MF
similarity index 100%
rename from org.lamport.tla.toolbox/META-INF/MANIFEST.MF
rename to toolbox/org.lamport.tla.toolbox/META-INF/MANIFEST.MF
diff --git a/org.lamport.tla.toolbox/build.properties b/toolbox/org.lamport.tla.toolbox/build.properties
similarity index 100%
rename from org.lamport.tla.toolbox/build.properties
rename to toolbox/org.lamport.tla.toolbox/build.properties
diff --git a/org.lamport.tla.toolbox/helpContexts.xml b/toolbox/org.lamport.tla.toolbox/helpContexts.xml
similarity index 100%
rename from org.lamport.tla.toolbox/helpContexts.xml
rename to toolbox/org.lamport.tla.toolbox/helpContexts.xml
diff --git a/org.lamport.tla.toolbox/icons/document-pdf.png b/toolbox/org.lamport.tla.toolbox/icons/document-pdf.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/document-pdf.png
rename to toolbox/org.lamport.tla.toolbox/icons/document-pdf.png
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/history_list.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/history_list.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/history_list.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/history_list.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/ignore.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/ignore.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/ignore.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/ignore.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/nav_go.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/nav_go.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/nav_go.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/nav_go.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/nav_stop.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/nav_stop.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/nav_stop.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/nav_stop.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/new_module_wiz.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/new_module_wiz.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/new_module_wiz.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/new_module_wiz.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/new_project_wiz.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/new_project_wiz.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/new_project_wiz.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/new_project_wiz.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/rundebug.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/rundebug.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/rundebug.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/rundebug.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/test.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/test.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/test.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/test.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.svg b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.svg
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.svg
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz.svg
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_128.png b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_128.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_128.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_128.png
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_16.png b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_16.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_16.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_16.png
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_256.png b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_256.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_256.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_256.png
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_32.png b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_32.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_32.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_32.png
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_48.png b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_48.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_48.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_48.png
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_64.png b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_64.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_64.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_launch_check_wiz_64.png
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_obj.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_obj.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_obj.gif
diff --git a/org.lamport.tla.toolbox/icons/full/etool16/tla_prj_obj.gif b/toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_prj_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/etool16/tla_prj_obj.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/etool16/tla_prj_obj.gif
diff --git a/org.lamport.tla.toolbox/icons/full/eview16/console_view2.gif b/toolbox/org.lamport.tla.toolbox/icons/full/eview16/console_view2.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/eview16/console_view2.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/eview16/console_view2.gif
diff --git a/org.lamport.tla.toolbox/icons/full/newmodule_wiz.gif b/toolbox/org.lamport.tla.toolbox/icons/full/newmodule_wiz.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/newmodule_wiz.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/newmodule_wiz.gif
diff --git a/org.lamport.tla.toolbox/icons/full/newspec_wiz.gif b/toolbox/org.lamport.tla.toolbox/icons/full/newspec_wiz.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/newspec_wiz.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/newspec_wiz.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/complete_task.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/complete_task.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/complete_task.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/complete_task.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/cprj_obj.png b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/cprj_obj.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/cprj_obj.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/cprj_obj.png
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/cprj_obj@2x.png b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/cprj_obj@2x.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/cprj_obj@2x.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/cprj_obj@2x.png
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/error_tsk.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/error_tsk.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/error_tsk.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/error_tsk.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/externalize.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/externalize.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/externalize.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/externalize.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/file_obj.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/file_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/file_obj.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/file_obj.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/ftr_mf_obj.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/ftr_mf_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/ftr_mf_obj.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/ftr_mf_obj.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/info_tsk.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/info_tsk.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/info_tsk.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/info_tsk.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/prj_obj.png b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/prj_obj.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/prj_obj.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/prj_obj.png
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/prj_obj@2x.png b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/prj_obj@2x.png
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/prj_obj@2x.png
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/prj_obj@2x.png
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/spec_obj.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/spec_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/spec_obj.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/spec_obj.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/start_ccs_task.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/start_ccs_task.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/start_ccs_task.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/start_ccs_task.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/tfile_obj.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/tfile_obj.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/tfile_obj.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/tfile_obj.gif
diff --git a/org.lamport.tla.toolbox/icons/full/obj16/warn_tsk.gif b/toolbox/org.lamport.tla.toolbox/icons/full/obj16/warn_tsk.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/obj16/warn_tsk.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/obj16/warn_tsk.gif
diff --git a/org.lamport.tla.toolbox/icons/full/ovr16/algo_ovr.gif b/toolbox/org.lamport.tla.toolbox/icons/full/ovr16/algo_ovr.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/ovr16/algo_ovr.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/ovr16/algo_ovr.gif
diff --git a/org.lamport.tla.toolbox/icons/full/ovr16/tla_ovr.gif b/toolbox/org.lamport.tla.toolbox/icons/full/ovr16/tla_ovr.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/ovr16/tla_ovr.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/ovr16/tla_ovr.gif
diff --git a/org.lamport.tla.toolbox/icons/full/ovr16/volatile_co.gif b/toolbox/org.lamport.tla.toolbox/icons/full/ovr16/volatile_co.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/ovr16/volatile_co.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/ovr16/volatile_co.gif
diff --git a/org.lamport.tla.toolbox/icons/full/prop_ps.gif b/toolbox/org.lamport.tla.toolbox/icons/full/prop_ps.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/prop_ps.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/prop_ps.gif
diff --git a/org.lamport.tla.toolbox/icons/full/refresh.gif b/toolbox/org.lamport.tla.toolbox/icons/full/refresh.gif
similarity index 100%
rename from org.lamport.tla.toolbox/icons/full/refresh.gif
rename to toolbox/org.lamport.tla.toolbox/icons/full/refresh.gif
diff --git a/org.lamport.tla.toolbox/images/splash_small.bmp b/toolbox/org.lamport.tla.toolbox/images/splash_small.bmp
similarity index 100%
rename from org.lamport.tla.toolbox/images/splash_small.bmp
rename to toolbox/org.lamport.tla.toolbox/images/splash_small.bmp
diff --git a/org.lamport.tla.toolbox/plugin.xml b/toolbox/org.lamport.tla.toolbox/plugin.xml
similarity index 100%
rename from org.lamport.tla.toolbox/plugin.xml
rename to toolbox/org.lamport.tla.toolbox/plugin.xml
diff --git a/org.lamport.tla.toolbox/pom.xml b/toolbox/org.lamport.tla.toolbox/pom.xml
similarity index 92%
rename from org.lamport.tla.toolbox/pom.xml
rename to toolbox/org.lamport.tla.toolbox/pom.xml
index 1deea07721995bfa1a5f02cfef88873b516b48dd..2adbf41223434ae1a7377feff0ddc680b07e6140 100644
--- a/org.lamport.tla.toolbox/pom.xml
+++ b/toolbox/org.lamport.tla.toolbox/pom.xml
@@ -7,7 +7,7 @@
<artifactId>parent</artifactId>
<groupId>tlatoolbox</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>tlatoolbox</groupId>
<artifactId>org.lamport.tla.toolbox</artifactId>
diff --git a/org.lamport.tla.toolbox/schema/org.lamport.tla.toolbox.spec.exsd b/toolbox/org.lamport.tla.toolbox/schema/org.lamport.tla.toolbox.spec.exsd
similarity index 100%
rename from org.lamport.tla.toolbox/schema/org.lamport.tla.toolbox.spec.exsd
rename to toolbox/org.lamport.tla.toolbox/schema/org.lamport.tla.toolbox.spec.exsd
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/AbstractTLCActivator.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/AbstractTLCActivator.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/AbstractTLCActivator.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/AbstractTLCActivator.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/Activator.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/Activator.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/Activator.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/Activator.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/OpenFileManager.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/OpenFileManager.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/OpenFileManager.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/OpenFileManager.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ToolboxDirectoryVisitor.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ToolboxDirectoryVisitor.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ToolboxDirectoryVisitor.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ToolboxDirectoryVisitor.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/job/NewTLAModuleCreationOperation.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/job/NewTLAModuleCreationOperation.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/job/NewTLAModuleCreationOperation.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/job/NewTLAModuleCreationOperation.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Module.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Module.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Module.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Module.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Spec.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Spec.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Spec.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/Spec.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/ISpecManager.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/ISpecManager.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/ISpecManager.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/ISpecManager.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/WorkspaceSpecManager.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/WorkspaceSpecManager.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/WorkspaceSpecManager.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/manager/WorkspaceSpecManager.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/ParserHelper.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/ParserHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/ParserHelper.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/ParserHelper.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLANature.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLANature.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLANature.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLANature.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilder.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilder.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilder.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilder.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilderConstants.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilderConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilderConstants.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/nature/TLAParsingBuilderConstants.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/DoubleHashedTable.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/DoubleHashedTable.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/DoubleHashedTable.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/DoubleHashedTable.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseConstants.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseConstants.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseConstants.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseResultListener.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseResultListener.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseResultListener.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/IParseResultListener.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ModuleParserLauncher.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ModuleParserLauncher.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ModuleParserLauncher.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ModuleParserLauncher.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResult.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResult.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResult.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResult.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResultBroadcaster.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResultBroadcaster.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResultBroadcaster.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParseResultBroadcaster.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParserDependencyStorage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParserDependencyStorage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParserDependencyStorage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/ParserDependencyStorage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/SpecificationParserLauncher.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/SpecificationParserLauncher.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/SpecificationParserLauncher.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/spec/parser/SpecificationParserLauncher.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/IParseResult.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/IParseResult.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/IParseResult.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/IParseResult.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecEvent.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecEvent.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecEvent.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecEvent.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecLifecycleParticipant.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecLifecycleParticipant.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecLifecycleParticipant.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecLifecycleParticipant.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecRenameEvent.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecRenameEvent.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecRenameEvent.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/SpecRenameEvent.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/ToolboxHandle.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/ToolboxHandle.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/ToolboxHandle.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/tool/ToolboxHandle.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ModuleListContributionItem.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ModuleListContributionItem.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ModuleListContributionItem.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ModuleListContributionItem.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ParseStatusContributionItem.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ParseStatusContributionItem.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ParseStatusContributionItem.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/ParseStatusContributionItem.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SizeControlContribution.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SizeControlContribution.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SizeControlContribution.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SizeControlContribution.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SpecListContributionItem.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SpecListContributionItem.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SpecListContributionItem.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/contribution/SpecListContributionItem.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/dialog/InformationDialog.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/dialog/InformationDialog.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/dialog/InformationDialog.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/dialog/InformationDialog.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/CurrentSpecTester.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/CurrentSpecTester.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/CurrentSpecTester.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/CurrentSpecTester.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/ParseErrorTester.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/ParseErrorTester.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/ParseErrorTester.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/expression/ParseErrorTester.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/AddModuleHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/CloseSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/CloseSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/CloseSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/CloseSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteModuleHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteModuleHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteModuleHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteModuleHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/DeleteSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ForgetSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ForgetSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ForgetSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ForgetSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/HelpHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/HelpHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/HelpHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/HelpHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ModulePropertiesHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ModulePropertiesHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ModulePropertiesHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ModulePropertiesHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/NewSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenModuleHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenModuleHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenModuleHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenModuleHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenParseErrorViewHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenParseErrorViewHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenParseErrorViewHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenParseErrorViewHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandlerDelegate.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandlerDelegate.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandlerDelegate.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenSpecHandlerDelegate.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenViewHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenViewHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenViewHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/OpenViewHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseModuleHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseModuleHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseModuleHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseModuleHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ParseSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/PropertiesHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/PropertiesHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/PropertiesHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/PropertiesHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RefreshSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RefreshSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RefreshSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RefreshSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/RenameSpecHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SaveDirtyEditorAbstractHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SaveDirtyEditorAbstractHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SaveDirtyEditorAbstractHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SaveDirtyEditorAbstractHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ShowHistoryHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ShowHistoryHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ShowHistoryHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/ShowHistoryHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SwitchPerspectiveHandler.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SwitchPerspectiveHandler.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SwitchPerspectiveHandler.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/handler/SwitchPerspectiveHandler.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorer.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorer.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorer.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorer.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorerResourceListener.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorerResourceListener.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorerResourceListener.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/navigator/ToolboxExplorerResourceListener.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/InitialPerspective.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/InitialPerspective.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/InitialPerspective.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/InitialPerspective.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/SpecLoadedPerspective.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/SpecLoadedPerspective.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/SpecLoadedPerspective.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/perspective/SpecLoadedPerspective.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/EditorPreferencePage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/EditorPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/EditorPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/EditorPreferencePage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/GeneralPreferencePage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/GeneralPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/GeneralPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/GeneralPreferencePage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/LibraryPathComposite.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/LibraryPathComposite.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/LibraryPathComposite.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/LibraryPathComposite.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/ParserPreferencePage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/ParserPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/ParserPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/ParserPreferencePage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/SWTFactory.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/SWTFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/SWTFactory.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/SWTFactory.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/TranslatorPreferencePage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/TranslatorPreferencePage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/TranslatorPreferencePage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/preference/TranslatorPreferencePage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericFieldEditorPropertyPage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericFieldEditorPropertyPage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericFieldEditorPropertyPage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericFieldEditorPropertyPage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericSelectionProvider.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericSelectionProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericSelectionProvider.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/GenericSelectionProvider.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/ModulePropertyPage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/ModulePropertyPage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/ModulePropertyPage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/ModulePropertyPage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/SpecPropertyPage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/SpecPropertyPage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/SpecPropertyPage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/property/SpecPropertyPage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/IGroup.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/IGroup.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/IGroup.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/IGroup.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/SpecContentProvider.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/SpecContentProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/SpecContentProvider.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/SpecContentProvider.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/ToolboxLabelProvider.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/ToolboxLabelProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/ToolboxLabelProvider.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/provider/ToolboxLabelProvider.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowser.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowser.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowser.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowser.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowserEditor.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowserEditor.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowserEditor.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/PDFBrowserEditor.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemView.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemView.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemView.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemView.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemViewResourceListener.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemViewResourceListener.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemViewResourceListener.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ProblemViewResourceListener.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ToolboxWelcomeView.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ToolboxWelcomeView.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ToolboxWelcomeView.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ToolboxWelcomeView.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizard.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizard.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizard.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizard.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizardPage.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizardPage.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizardPage.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/wizard/NewSpecWizardPage.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/AdapterFactory.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/AdapterFactory.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/AdapterFactory.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/AdapterFactory.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ChangedModulesGatheringDeltaVisitor.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ChangedModulesGatheringDeltaVisitor.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ChangedModulesGatheringDeltaVisitor.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ChangedModulesGatheringDeltaVisitor.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/FontPreferenceChangeListener.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/FontPreferenceChangeListener.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/FontPreferenceChangeListener.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/FontPreferenceChangeListener.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/HelpButton.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/HelpButton.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/HelpButton.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/HelpButton.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/IHelpConstants.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/IHelpConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/IHelpConstants.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/IHelpConstants.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/LegacyFileDocumentProvider.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/LegacyFileDocumentProvider.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/LegacyFileDocumentProvider.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/LegacyFileDocumentProvider.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/RCPNameToFileIStream.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/RCPNameToFileIStream.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/RCPNameToFileIStream.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/RCPNameToFileIStream.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ResourceHelper.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ResourceHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ResourceHelper.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ResourceHelper.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/SpecLifecycleManager.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/SpecLifecycleManager.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/SpecLifecycleManager.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/SpecLifecycleManager.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/StringSet.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/StringSet.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/StringSet.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/StringSet.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerHelper.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerHelper.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerHelper.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerInformationHolder.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerInformationHolder.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerInformationHolder.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerInformationHolder.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerResolutionGenerator.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerResolutionGenerator.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerResolutionGenerator.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAMarkerResolutionGenerator.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAtoPCalMarker.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAtoPCalMarker.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAtoPCalMarker.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/TLAtoPCalMarker.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ToolboxJob.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ToolboxJob.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ToolboxJob.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/ToolboxJob.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/UIHelper.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/UIHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/UIHelper.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/UIHelper.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/MarkerComparator.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/MarkerComparator.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/MarkerComparator.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/MarkerComparator.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/ResourceNameComparator.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/ResourceNameComparator.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/ResourceNameComparator.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/ResourceNameComparator.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/SpecComparator.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/SpecComparator.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/SpecComparator.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/compare/SpecComparator.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/e4/E4HandlerWrapper.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/e4/E4HandlerWrapper.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/e4/E4HandlerWrapper.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/e4/E4HandlerWrapper.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/IPreferenceConstants.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/IPreferenceConstants.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/IPreferenceConstants.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/IPreferenceConstants.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceInitializer.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceInitializer.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceInitializer.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceInitializer.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceStoreHelper.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceStoreHelper.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceStoreHelper.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/PreferenceStoreHelper.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/ResourceBasedPreferenceStore.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/ResourceBasedPreferenceStore.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/ResourceBasedPreferenceStore.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/ResourceBasedPreferenceStore.java
diff --git a/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/UnwantedPreferenceManager.java b/toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/UnwantedPreferenceManager.java
similarity index 100%
rename from org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/UnwantedPreferenceManager.java
rename to toolbox/org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/util/pref/UnwantedPreferenceManager.java