diff --git a/pom.xml b/pom.xml index 598d953b7b4095d2643e39012e22c7dc6aa02e6e..f02bb326d852775cb143a7de2ee14f0a7006409b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,6 @@ sonar-application - sonar-process - sonar-search sonar-batch sonar-batch-maven-compat sonar-check-api @@ -28,7 +26,7 @@ sonar-maven-plugin sonar-maven3-plugin sonar-plugin-api - sonar-server + server sonar-testing-harness sonar-ws-client plugins/sonar-core-plugin diff --git a/server/pom.xml b/server/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..9fe1db1fc88383cdba3327cebfe888f27fa83a41 --- /dev/null +++ b/server/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + org.codehaus.sonar + sonar + 4.5-SNAPSHOT + + sonar-server-parent + pom + SonarQube :: Server :: Parent + + + sonar-process + sonar-search + sonar-server + + diff --git a/sonar-process/pom.xml b/server/sonar-process/pom.xml similarity index 95% rename from sonar-process/pom.xml rename to server/sonar-process/pom.xml index 53ec300d50eb8d336388eba0a6b2024bff59f234..70a992f1ac1c622d2d41dfc9fa53331fd1a6c737 100644 --- a/sonar-process/pom.xml +++ b/server/sonar-process/pom.xml @@ -4,8 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.codehaus.sonar - sonar + sonar-server-parent 4.5-SNAPSHOT + .. 4.0.0 @@ -67,4 +68,4 @@ test - \ No newline at end of file + diff --git a/sonar-process/src/main/java/org/sonar/Application.java b/server/sonar-process/src/main/java/org/sonar/Application.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/Application.java rename to server/sonar-process/src/main/java/org/sonar/Application.java diff --git a/sonar-process/src/main/java/org/sonar/process/AesCipher.java b/server/sonar-process/src/main/java/org/sonar/process/AesCipher.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/AesCipher.java rename to server/sonar-process/src/main/java/org/sonar/process/AesCipher.java diff --git a/sonar-process/src/main/java/org/sonar/process/Base64Cipher.java b/server/sonar-process/src/main/java/org/sonar/process/Base64Cipher.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/Base64Cipher.java rename to server/sonar-process/src/main/java/org/sonar/process/Base64Cipher.java diff --git a/sonar-process/src/main/java/org/sonar/process/Cipher.java b/server/sonar-process/src/main/java/org/sonar/process/Cipher.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/Cipher.java rename to server/sonar-process/src/main/java/org/sonar/process/Cipher.java diff --git a/sonar-process/src/main/java/org/sonar/process/ConfigurationUtils.java b/server/sonar-process/src/main/java/org/sonar/process/ConfigurationUtils.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/ConfigurationUtils.java rename to server/sonar-process/src/main/java/org/sonar/process/ConfigurationUtils.java diff --git a/sonar-process/src/main/java/org/sonar/process/Encryption.java b/server/sonar-process/src/main/java/org/sonar/process/Encryption.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/Encryption.java rename to server/sonar-process/src/main/java/org/sonar/process/Encryption.java diff --git a/sonar-process/src/main/java/org/sonar/process/Launcher.java b/server/sonar-process/src/main/java/org/sonar/process/Launcher.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/Launcher.java rename to server/sonar-process/src/main/java/org/sonar/process/Launcher.java diff --git a/sonar-process/src/main/java/org/sonar/process/Process.java b/server/sonar-process/src/main/java/org/sonar/process/Process.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/Process.java rename to server/sonar-process/src/main/java/org/sonar/process/Process.java diff --git a/sonar-process/src/main/java/org/sonar/process/Props.java b/server/sonar-process/src/main/java/org/sonar/process/Props.java similarity index 100% rename from sonar-process/src/main/java/org/sonar/process/Props.java rename to server/sonar-process/src/main/java/org/sonar/process/Props.java diff --git a/sonar-process/src/test/java/org/sonar/ApplicationTest.java b/server/sonar-process/src/test/java/org/sonar/ApplicationTest.java similarity index 100% rename from sonar-process/src/test/java/org/sonar/ApplicationTest.java rename to server/sonar-process/src/test/java/org/sonar/ApplicationTest.java diff --git a/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java b/server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java similarity index 100% rename from sonar-process/src/test/java/org/sonar/process/AesCipherTest.java rename to server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java diff --git a/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java b/server/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java similarity index 100% rename from sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java rename to server/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java diff --git a/sonar-process/src/test/java/org/sonar/process/EncryptionTest.java b/server/sonar-process/src/test/java/org/sonar/process/EncryptionTest.java similarity index 100% rename from sonar-process/src/test/java/org/sonar/process/EncryptionTest.java rename to server/sonar-process/src/test/java/org/sonar/process/EncryptionTest.java diff --git a/sonar-process/src/test/java/org/sonar/process/LauncherTest.java b/server/sonar-process/src/test/java/org/sonar/process/LauncherTest.java similarity index 100% rename from sonar-process/src/test/java/org/sonar/process/LauncherTest.java rename to server/sonar-process/src/test/java/org/sonar/process/LauncherTest.java diff --git a/sonar-process/src/test/java/org/sonar/process/ProcessTest.java b/server/sonar-process/src/test/java/org/sonar/process/ProcessTest.java similarity index 100% rename from sonar-process/src/test/java/org/sonar/process/ProcessTest.java rename to server/sonar-process/src/test/java/org/sonar/process/ProcessTest.java diff --git a/sonar-process/src/test/java/org/sonar/process/PropsTest.java b/server/sonar-process/src/test/java/org/sonar/process/PropsTest.java similarity index 100% rename from sonar-process/src/test/java/org/sonar/process/PropsTest.java rename to server/sonar-process/src/test/java/org/sonar/process/PropsTest.java diff --git a/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/aes_secret_key.txt b/server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/aes_secret_key.txt similarity index 100% rename from sonar-process/src/test/resources/org/sonar/process/AesCipherTest/aes_secret_key.txt rename to server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/aes_secret_key.txt diff --git a/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/bad_secret_key.txt b/server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/bad_secret_key.txt similarity index 100% rename from sonar-process/src/test/resources/org/sonar/process/AesCipherTest/bad_secret_key.txt rename to server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/bad_secret_key.txt diff --git a/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/non_trimmed_secret_key.txt b/server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/non_trimmed_secret_key.txt similarity index 100% rename from sonar-process/src/test/resources/org/sonar/process/AesCipherTest/non_trimmed_secret_key.txt rename to server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/non_trimmed_secret_key.txt diff --git a/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/other_secret_key.txt b/server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/other_secret_key.txt similarity index 100% rename from sonar-process/src/test/resources/org/sonar/process/AesCipherTest/other_secret_key.txt rename to server/sonar-process/src/test/resources/org/sonar/process/AesCipherTest/other_secret_key.txt diff --git a/sonar-process/src/test/resources/org/sonar/process/LoggingTest/logback-access.xml b/server/sonar-process/src/test/resources/org/sonar/process/LoggingTest/logback-access.xml similarity index 100% rename from sonar-process/src/test/resources/org/sonar/process/LoggingTest/logback-access.xml rename to server/sonar-process/src/test/resources/org/sonar/process/LoggingTest/logback-access.xml diff --git a/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties b/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties similarity index 100% rename from sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties rename to server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties diff --git a/sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties b/server/sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties similarity index 100% rename from sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties rename to server/sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties diff --git a/sonar-search/pom.xml b/server/sonar-search/pom.xml similarity index 95% rename from sonar-search/pom.xml rename to server/sonar-search/pom.xml index ad3edc3d4af1b11f9e9e48e5ec4137af9cc8821d..08db5991c1fa5aa01378958a140ba52204140c35 100644 --- a/sonar-search/pom.xml +++ b/server/sonar-search/pom.xml @@ -4,8 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.codehaus.sonar - sonar + sonar-server-parent 4.5-SNAPSHOT + ../ 4.0.0 diff --git a/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java similarity index 100% rename from sonar-search/src/main/java/org/sonar/search/ElasticSearch.java rename to server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java diff --git a/sonar-search/src/main/java/org/sonar/search/NetworkUtils.java b/server/sonar-search/src/main/java/org/sonar/search/NetworkUtils.java similarity index 100% rename from sonar-search/src/main/java/org/sonar/search/NetworkUtils.java rename to server/sonar-search/src/main/java/org/sonar/search/NetworkUtils.java diff --git a/sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java b/server/sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java similarity index 100% rename from sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java rename to server/sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java diff --git a/sonar-search/src/main/resources/logback.xml b/server/sonar-search/src/main/resources/logback.xml similarity index 100% rename from sonar-search/src/main/resources/logback.xml rename to server/sonar-search/src/main/resources/logback.xml diff --git a/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java b/server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java similarity index 100% rename from sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java rename to server/sonar-search/src/test/java/org/sonar/search/ElasticSearchTest.java diff --git a/sonar-server/.gitignore b/server/sonar-server/.gitignore similarity index 100% rename from sonar-server/.gitignore rename to server/sonar-server/.gitignore diff --git a/sonar-server/COPYING b/server/sonar-server/COPYING similarity index 100% rename from sonar-server/COPYING rename to server/sonar-server/COPYING diff --git a/sonar-server/Gruntfile.coffee b/server/sonar-server/Gruntfile.coffee similarity index 100% rename from sonar-server/Gruntfile.coffee rename to server/sonar-server/Gruntfile.coffee diff --git a/sonar-server/h2-start.bat b/server/sonar-server/h2-start.bat similarity index 100% rename from sonar-server/h2-start.bat rename to server/sonar-server/h2-start.bat diff --git a/sonar-server/h2-start.sh b/server/sonar-server/h2-start.sh similarity index 100% rename from sonar-server/h2-start.sh rename to server/sonar-server/h2-start.sh diff --git a/sonar-server/mysql-start.bat b/server/sonar-server/mysql-start.bat similarity index 100% rename from sonar-server/mysql-start.bat rename to server/sonar-server/mysql-start.bat diff --git a/sonar-server/mysql-start.sh b/server/sonar-server/mysql-start.sh similarity index 100% rename from sonar-server/mysql-start.sh rename to server/sonar-server/mysql-start.sh diff --git a/sonar-server/package.json b/server/sonar-server/package.json similarity index 100% rename from sonar-server/package.json rename to server/sonar-server/package.json diff --git a/sonar-server/pom.xml b/server/sonar-server/pom.xml similarity index 99% rename from sonar-server/pom.xml rename to server/sonar-server/pom.xml index f27f4ebb0b459c9cb3b889352fd338a30ca3e0a7..7d8d9c27cfb30cd86fed1235156b98f3381d61fd 100644 --- a/sonar-server/pom.xml +++ b/server/sonar-server/pom.xml @@ -3,8 +3,9 @@ 4.0.0 org.codehaus.sonar - sonar + sonar-server-parent 4.5-SNAPSHOT + .. sonar-server war diff --git a/sonar-server/postgresql-start.bat b/server/sonar-server/postgresql-start.bat similarity index 100% rename from sonar-server/postgresql-start.bat rename to server/sonar-server/postgresql-start.bat diff --git a/sonar-server/postgresql-start.sh b/server/sonar-server/postgresql-start.sh similarity index 100% rename from sonar-server/postgresql-start.sh rename to server/sonar-server/postgresql-start.sh diff --git a/sonar-server/profile-start.sh b/server/sonar-server/profile-start.sh similarity index 100% rename from sonar-server/profile-start.sh rename to server/sonar-server/profile-start.sh diff --git a/sonar-server/src/dev/sonar.properties b/server/sonar-server/src/dev/sonar.properties similarity index 100% rename from sonar-server/src/dev/sonar.properties rename to server/sonar-server/src/dev/sonar.properties diff --git a/sonar-server/src/main/coffee/api-documentation/app.coffee b/server/sonar-server/src/main/coffee/api-documentation/app.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/app.coffee rename to server/sonar-server/src/main/coffee/api-documentation/app.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/collections/web-service-actions.coffee b/server/sonar-server/src/main/coffee/api-documentation/collections/web-service-actions.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/collections/web-service-actions.coffee rename to server/sonar-server/src/main/coffee/api-documentation/collections/web-service-actions.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/collections/web-services.coffee b/server/sonar-server/src/main/coffee/api-documentation/collections/web-services.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/collections/web-services.coffee rename to server/sonar-server/src/main/coffee/api-documentation/collections/web-services.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/layout.coffee b/server/sonar-server/src/main/coffee/api-documentation/layout.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/layout.coffee rename to server/sonar-server/src/main/coffee/api-documentation/layout.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/models/web-service-action-response.coffee b/server/sonar-server/src/main/coffee/api-documentation/models/web-service-action-response.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/models/web-service-action-response.coffee rename to server/sonar-server/src/main/coffee/api-documentation/models/web-service-action-response.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/models/web-service-action.coffee b/server/sonar-server/src/main/coffee/api-documentation/models/web-service-action.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/models/web-service-action.coffee rename to server/sonar-server/src/main/coffee/api-documentation/models/web-service-action.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/models/web-service.coffee b/server/sonar-server/src/main/coffee/api-documentation/models/web-service.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/models/web-service.coffee rename to server/sonar-server/src/main/coffee/api-documentation/models/web-service.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/router.coffee b/server/sonar-server/src/main/coffee/api-documentation/router.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/router.coffee rename to server/sonar-server/src/main/coffee/api-documentation/router.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee b/server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee rename to server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee b/server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee rename to server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee b/server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee rename to server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee b/server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee rename to server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee diff --git a/sonar-server/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee b/server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee rename to server/sonar-server/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/server/sonar-server/src/main/coffee/coding-rules/app.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/app.coffee rename to server/sonar-server/src/main/coffee/coding-rules/app.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/layout.coffee b/server/sonar-server/src/main/coffee/coding-rules/layout.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/layout.coffee rename to server/sonar-server/src/main/coffee/coding-rules/layout.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/mockjax.coffee b/server/sonar-server/src/main/coffee/coding-rules/mockjax.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/mockjax.coffee rename to server/sonar-server/src/main/coffee/coding-rules/mockjax.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/router.coffee b/server/sonar-server/src/main/coffee/coding-rules/router.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/router.coffee rename to server/sonar-server/src/main/coffee/coding-rules/router.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/actions-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/actions-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/actions-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/actions-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-custom-rule-creation-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-custom-rule-creation-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-custom-rule-creation-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-custom-rule-creation-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rule-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rule-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rule-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rule-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rules-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rules-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rules-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-custom-rules-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profiles-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profiles-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profiles-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profiles-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-facets-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-facets-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-facets-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-facets-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-empty-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-empty-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-empty-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-empty-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filter-bar-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filter-bar-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filter-bar-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filter-bar-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/activation-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/activation-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/activation-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/activation-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/active-severities-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/active-severities-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/active-severities-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/active-severities-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/characteristic-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/characteristic-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/characteristic-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/characteristic-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/inheritance-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/language-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/profile-dependent-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/profile-dependent-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/profile-dependent-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/profile-dependent-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/quality-profile-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/quality-profile-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/quality-profile-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/quality-profile-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/tag-filter-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/filters/tag-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/filters/tag-filter-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/filters/tag-filter-view.coffee diff --git a/sonar-server/src/main/coffee/coding-rules/views/header-view.coffee b/server/sonar-server/src/main/coffee/coding-rules/views/header-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/coding-rules/views/header-view.coffee rename to server/sonar-server/src/main/coffee/coding-rules/views/header-view.coffee diff --git a/sonar-server/src/main/coffee/common/dialogs.coffee b/server/sonar-server/src/main/coffee/common/dialogs.coffee similarity index 100% rename from sonar-server/src/main/coffee/common/dialogs.coffee rename to server/sonar-server/src/main/coffee/common/dialogs.coffee diff --git a/sonar-server/src/main/coffee/common/inputs.coffee b/server/sonar-server/src/main/coffee/common/inputs.coffee similarity index 100% rename from sonar-server/src/main/coffee/common/inputs.coffee rename to server/sonar-server/src/main/coffee/common/inputs.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/app.coffee b/server/sonar-server/src/main/coffee/component-viewer/app.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/app.coffee rename to server/sonar-server/src/main/coffee/component-viewer/app.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee b/server/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee rename to server/sonar-server/src/main/coffee/component-viewer/coverage-popup.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/covered-files-popup.coffee b/server/sonar-server/src/main/coffee/component-viewer/covered-files-popup.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/covered-files-popup.coffee rename to server/sonar-server/src/main/coffee/component-viewer/covered-files-popup.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee b/server/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee rename to server/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/base-header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/base-header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/base-header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/base-header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/basic-header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/basic-header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/basic-header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/basic-header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/coverage-header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/duplications-header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/duplications-header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/duplications-header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/duplications-header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/issues-header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/more-actions.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/more-actions.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/more-actions.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/more-actions.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/header/tests-header.coffee b/server/sonar-server/src/main/coffee/component-viewer/header/tests-header.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/header/tests-header.coffee rename to server/sonar-server/src/main/coffee/component-viewer/header/tests-header.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/line-actions-popup.coffee b/server/sonar-server/src/main/coffee/component-viewer/line-actions-popup.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/line-actions-popup.coffee rename to server/sonar-server/src/main/coffee/component-viewer/line-actions-popup.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/server/sonar-server/src/main/coffee/component-viewer/main.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/main.coffee rename to server/sonar-server/src/main/coffee/component-viewer/main.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/mixins/main-coverage.coffee b/server/sonar-server/src/main/coffee/component-viewer/mixins/main-coverage.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/mixins/main-coverage.coffee rename to server/sonar-server/src/main/coffee/component-viewer/mixins/main-coverage.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/mixins/main-duplications.coffee b/server/sonar-server/src/main/coffee/component-viewer/mixins/main-duplications.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/mixins/main-duplications.coffee rename to server/sonar-server/src/main/coffee/component-viewer/mixins/main-duplications.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee b/server/sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee rename to server/sonar-server/src/main/coffee/component-viewer/mixins/main-issues.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee b/server/sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee rename to server/sonar-server/src/main/coffee/component-viewer/mixins/main-scm.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/mockjax.coffee b/server/sonar-server/src/main/coffee/component-viewer/mockjax.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/mockjax.coffee rename to server/sonar-server/src/main/coffee/component-viewer/mockjax.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/models/component.coffee b/server/sonar-server/src/main/coffee/component-viewer/models/component.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/models/component.coffee rename to server/sonar-server/src/main/coffee/component-viewer/models/component.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/models/period.coffee b/server/sonar-server/src/main/coffee/component-viewer/models/period.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/models/period.coffee rename to server/sonar-server/src/main/coffee/component-viewer/models/period.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/models/state.coffee b/server/sonar-server/src/main/coffee/component-viewer/models/state.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/models/state.coffee rename to server/sonar-server/src/main/coffee/component-viewer/models/state.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/popup.coffee b/server/sonar-server/src/main/coffee/component-viewer/popup.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/popup.coffee rename to server/sonar-server/src/main/coffee/component-viewer/popup.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/source.coffee b/server/sonar-server/src/main/coffee/component-viewer/source.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/source.coffee rename to server/sonar-server/src/main/coffee/component-viewer/source.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/time-changes-popup.coffee b/server/sonar-server/src/main/coffee/component-viewer/time-changes-popup.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/time-changes-popup.coffee rename to server/sonar-server/src/main/coffee/component-viewer/time-changes-popup.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/utils.coffee b/server/sonar-server/src/main/coffee/component-viewer/utils.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/utils.coffee rename to server/sonar-server/src/main/coffee/component-viewer/utils.coffee diff --git a/sonar-server/src/main/coffee/component-viewer/workspace.coffee b/server/sonar-server/src/main/coffee/component-viewer/workspace.coffee similarity index 100% rename from sonar-server/src/main/coffee/component-viewer/workspace.coffee rename to server/sonar-server/src/main/coffee/component-viewer/workspace.coffee diff --git a/sonar-server/src/main/coffee/dashboard/file-app.coffee b/server/sonar-server/src/main/coffee/dashboard/file-app.coffee similarity index 100% rename from sonar-server/src/main/coffee/dashboard/file-app.coffee rename to server/sonar-server/src/main/coffee/dashboard/file-app.coffee diff --git a/sonar-server/src/main/coffee/drilldown/app.coffee b/server/sonar-server/src/main/coffee/drilldown/app.coffee similarity index 100% rename from sonar-server/src/main/coffee/drilldown/app.coffee rename to server/sonar-server/src/main/coffee/drilldown/app.coffee diff --git a/sonar-server/src/main/coffee/drilldown/conf.coffee b/server/sonar-server/src/main/coffee/drilldown/conf.coffee similarity index 100% rename from sonar-server/src/main/coffee/drilldown/conf.coffee rename to server/sonar-server/src/main/coffee/drilldown/conf.coffee diff --git a/sonar-server/src/main/coffee/issues/collections/action-plans.coffee b/server/sonar-server/src/main/coffee/issues/collections/action-plans.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/collections/action-plans.coffee rename to server/sonar-server/src/main/coffee/issues/collections/action-plans.coffee diff --git a/sonar-server/src/main/coffee/issues/issue-view.coffee b/server/sonar-server/src/main/coffee/issues/issue-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/issue-view.coffee rename to server/sonar-server/src/main/coffee/issues/issue-view.coffee diff --git a/sonar-server/src/main/coffee/issues/manual-issue-view.coffee b/server/sonar-server/src/main/coffee/issues/manual-issue-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/manual-issue-view.coffee rename to server/sonar-server/src/main/coffee/issues/manual-issue-view.coffee diff --git a/sonar-server/src/main/coffee/issues/models/change-log.coffee b/server/sonar-server/src/main/coffee/issues/models/change-log.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/models/change-log.coffee rename to server/sonar-server/src/main/coffee/issues/models/change-log.coffee diff --git a/sonar-server/src/main/coffee/issues/models/issue.coffee b/server/sonar-server/src/main/coffee/issues/models/issue.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/models/issue.coffee rename to server/sonar-server/src/main/coffee/issues/models/issue.coffee diff --git a/sonar-server/src/main/coffee/issues/models/rule.coffee b/server/sonar-server/src/main/coffee/issues/models/rule.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/models/rule.coffee rename to server/sonar-server/src/main/coffee/issues/models/rule.coffee diff --git a/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee b/server/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/views/assign-form-view.coffee rename to server/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee diff --git a/sonar-server/src/main/coffee/issues/views/change-log-view.coffee b/server/sonar-server/src/main/coffee/issues/views/change-log-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/views/change-log-view.coffee rename to server/sonar-server/src/main/coffee/issues/views/change-log-view.coffee diff --git a/sonar-server/src/main/coffee/issues/views/comment-form-view.coffee b/server/sonar-server/src/main/coffee/issues/views/comment-form-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/views/comment-form-view.coffee rename to server/sonar-server/src/main/coffee/issues/views/comment-form-view.coffee diff --git a/sonar-server/src/main/coffee/issues/views/plan-form-view.coffee b/server/sonar-server/src/main/coffee/issues/views/plan-form-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/views/plan-form-view.coffee rename to server/sonar-server/src/main/coffee/issues/views/plan-form-view.coffee diff --git a/sonar-server/src/main/coffee/issues/views/rule-view.coffee b/server/sonar-server/src/main/coffee/issues/views/rule-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/views/rule-view.coffee rename to server/sonar-server/src/main/coffee/issues/views/rule-view.coffee diff --git a/sonar-server/src/main/coffee/issues/views/set-severity-form-view.coffee b/server/sonar-server/src/main/coffee/issues/views/set-severity-form-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/issues/views/set-severity-form-view.coffee rename to server/sonar-server/src/main/coffee/issues/views/set-severity-form-view.coffee diff --git a/sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee b/server/sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee rename to server/sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/app.coffee b/server/sonar-server/src/main/coffee/quality-gate/app.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/app.coffee rename to server/sonar-server/src/main/coffee/quality-gate/app.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/collections/conditions.coffee b/server/sonar-server/src/main/coffee/quality-gate/collections/conditions.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/collections/conditions.coffee rename to server/sonar-server/src/main/coffee/quality-gate/collections/conditions.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/collections/quality-gates.coffee b/server/sonar-server/src/main/coffee/quality-gate/collections/quality-gates.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/collections/quality-gates.coffee rename to server/sonar-server/src/main/coffee/quality-gate/collections/quality-gates.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/layout.coffee b/server/sonar-server/src/main/coffee/quality-gate/layout.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/layout.coffee rename to server/sonar-server/src/main/coffee/quality-gate/layout.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/models/condition.coffee b/server/sonar-server/src/main/coffee/quality-gate/models/condition.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/models/condition.coffee rename to server/sonar-server/src/main/coffee/quality-gate/models/condition.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/models/quality-gate.coffee b/server/sonar-server/src/main/coffee/quality-gate/models/quality-gate.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/models/quality-gate.coffee rename to server/sonar-server/src/main/coffee/quality-gate/models/quality-gate.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/router.coffee b/server/sonar-server/src/main/coffee/quality-gate/router.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/router.coffee rename to server/sonar-server/src/main/coffee/quality-gate/router.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee b/server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee similarity index 100% rename from sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee rename to server/sonar-server/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee diff --git a/sonar-server/src/main/coffee/widgets/base.coffee b/server/sonar-server/src/main/coffee/widgets/base.coffee similarity index 100% rename from sonar-server/src/main/coffee/widgets/base.coffee rename to server/sonar-server/src/main/coffee/widgets/base.coffee diff --git a/sonar-server/src/main/coffee/widgets/histogram.coffee b/server/sonar-server/src/main/coffee/widgets/histogram.coffee similarity index 100% rename from sonar-server/src/main/coffee/widgets/histogram.coffee rename to server/sonar-server/src/main/coffee/widgets/histogram.coffee diff --git a/sonar-server/src/main/coffee/widgets/treemap.coffee b/server/sonar-server/src/main/coffee/widgets/treemap.coffee similarity index 100% rename from sonar-server/src/main/coffee/widgets/treemap.coffee rename to server/sonar-server/src/main/coffee/widgets/treemap.coffee diff --git a/sonar-server/src/main/coffee/widgets/word-cloud.coffee b/server/sonar-server/src/main/coffee/widgets/word-cloud.coffee similarity index 100% rename from sonar-server/src/main/coffee/widgets/word-cloud.coffee rename to server/sonar-server/src/main/coffee/widgets/word-cloud.coffee diff --git a/sonar-server/src/main/hbs/api-documentation/api-documentation-action-response.hbs b/server/sonar-server/src/main/hbs/api-documentation/api-documentation-action-response.hbs similarity index 100% rename from sonar-server/src/main/hbs/api-documentation/api-documentation-action-response.hbs rename to server/sonar-server/src/main/hbs/api-documentation/api-documentation-action-response.hbs diff --git a/sonar-server/src/main/hbs/api-documentation/api-documentation-action.hbs b/server/sonar-server/src/main/hbs/api-documentation/api-documentation-action.hbs similarity index 100% rename from sonar-server/src/main/hbs/api-documentation/api-documentation-action.hbs rename to server/sonar-server/src/main/hbs/api-documentation/api-documentation-action.hbs diff --git a/sonar-server/src/main/hbs/api-documentation/api-documentation-actions.hbs b/server/sonar-server/src/main/hbs/api-documentation/api-documentation-actions.hbs similarity index 100% rename from sonar-server/src/main/hbs/api-documentation/api-documentation-actions.hbs rename to server/sonar-server/src/main/hbs/api-documentation/api-documentation-actions.hbs diff --git a/sonar-server/src/main/hbs/api-documentation/api-documentation-layout.hbs b/server/sonar-server/src/main/hbs/api-documentation/api-documentation-layout.hbs similarity index 100% rename from sonar-server/src/main/hbs/api-documentation/api-documentation-layout.hbs rename to server/sonar-server/src/main/hbs/api-documentation/api-documentation-layout.hbs diff --git a/sonar-server/src/main/hbs/api-documentation/api-documentation-web-service.hbs b/server/sonar-server/src/main/hbs/api-documentation/api-documentation-web-service.hbs similarity index 100% rename from sonar-server/src/main/hbs/api-documentation/api-documentation-web-service.hbs rename to server/sonar-server/src/main/hbs/api-documentation/api-documentation-web-service.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-creation.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-creation.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-creation.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-creation.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-reactivation.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-reactivation.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-reactivation.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-custom-rule-reactivation.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-custom-rule.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-custom-rule.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-detail-custom-rule.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-custom-rule.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-facets.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-facets.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-facets.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-facets.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-filter-bar.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-filter-bar.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-filter-bar.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-filter-bar.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-header.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-header.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-header.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-layout.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-layout.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-layout.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-layout.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-list-empty.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-list-empty.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-list-empty.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-list-empty.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-profile-filter-detail.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-profile-filter-detail.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-profile-filter-detail.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-profile-filter-detail.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-query-filter.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-query-filter.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-query-filter.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-query-filter.hbs diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs b/server/sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs similarity index 100% rename from sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs rename to server/sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs diff --git a/sonar-server/src/main/hbs/common/_markdown-tips.hbs b/server/sonar-server/src/main/hbs/common/_markdown-tips.hbs similarity index 100% rename from sonar-server/src/main/hbs/common/_markdown-tips.hbs rename to server/sonar-server/src/main/hbs/common/_markdown-tips.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/code-expand.hbs b/server/sonar-server/src/main/hbs/component-viewer/code-expand.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/code-expand.hbs rename to server/sonar-server/src/main/hbs/component-viewer/code-expand.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/coveragePopup.hbs b/server/sonar-server/src/main/hbs/component-viewer/coveragePopup.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/coveragePopup.hbs rename to server/sonar-server/src/main/hbs/component-viewer/coveragePopup.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs b/server/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs rename to server/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/server/sonar-server/src/main/hbs/component-viewer/header.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/_header-item.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/_header-link.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/basic-header.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/basic-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/basic-header.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/basic-header.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/coverage-header.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/coverage-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/coverage-header.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/coverage-header.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/covered-files-popup.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/covered-files-popup.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/covered-files-popup.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/covered-files-popup.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/duplications-header.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/duplications-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/duplications-header.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/duplications-header.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/scm-header.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/scm-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/scm-header.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/scm-header.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs b/server/sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs rename to server/sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/layout.hbs b/server/sonar-server/src/main/hbs/component-viewer/layout.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/layout.hbs rename to server/sonar-server/src/main/hbs/component-viewer/layout.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/line-options-popup.hbs b/server/sonar-server/src/main/hbs/component-viewer/line-options-popup.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/line-options-popup.hbs rename to server/sonar-server/src/main/hbs/component-viewer/line-options-popup.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/more-actions.hbs b/server/sonar-server/src/main/hbs/component-viewer/more-actions.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/more-actions.hbs rename to server/sonar-server/src/main/hbs/component-viewer/more-actions.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/source.hbs b/server/sonar-server/src/main/hbs/component-viewer/source.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/source.hbs rename to server/sonar-server/src/main/hbs/component-viewer/source.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/time-changes-popup.hbs b/server/sonar-server/src/main/hbs/component-viewer/time-changes-popup.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/time-changes-popup.hbs rename to server/sonar-server/src/main/hbs/component-viewer/time-changes-popup.hbs diff --git a/sonar-server/src/main/hbs/component-viewer/workspace.hbs b/server/sonar-server/src/main/hbs/component-viewer/workspace.hbs similarity index 100% rename from sonar-server/src/main/hbs/component-viewer/workspace.hbs rename to server/sonar-server/src/main/hbs/component-viewer/workspace.hbs diff --git a/sonar-server/src/main/hbs/issues/assign-form.hbs b/server/sonar-server/src/main/hbs/issues/assign-form.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/assign-form.hbs rename to server/sonar-server/src/main/hbs/issues/assign-form.hbs diff --git a/sonar-server/src/main/hbs/issues/change-log.hbs b/server/sonar-server/src/main/hbs/issues/change-log.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/change-log.hbs rename to server/sonar-server/src/main/hbs/issues/change-log.hbs diff --git a/sonar-server/src/main/hbs/issues/comment-form.hbs b/server/sonar-server/src/main/hbs/issues/comment-form.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/comment-form.hbs rename to server/sonar-server/src/main/hbs/issues/comment-form.hbs diff --git a/sonar-server/src/main/hbs/issues/issue.hbs b/server/sonar-server/src/main/hbs/issues/issue.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/issue.hbs rename to server/sonar-server/src/main/hbs/issues/issue.hbs diff --git a/sonar-server/src/main/hbs/issues/manual-issue.hbs b/server/sonar-server/src/main/hbs/issues/manual-issue.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/manual-issue.hbs rename to server/sonar-server/src/main/hbs/issues/manual-issue.hbs diff --git a/sonar-server/src/main/hbs/issues/plan-form.hbs b/server/sonar-server/src/main/hbs/issues/plan-form.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/plan-form.hbs rename to server/sonar-server/src/main/hbs/issues/plan-form.hbs diff --git a/sonar-server/src/main/hbs/issues/rule.hbs b/server/sonar-server/src/main/hbs/issues/rule.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/rule.hbs rename to server/sonar-server/src/main/hbs/issues/rule.hbs diff --git a/sonar-server/src/main/hbs/issues/set-severity-form.hbs b/server/sonar-server/src/main/hbs/issues/set-severity-form.hbs similarity index 100% rename from sonar-server/src/main/hbs/issues/set-severity-form.hbs rename to server/sonar-server/src/main/hbs/issues/set-severity-form.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-actions.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-actions.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-actions.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-actions.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-condition.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-condition.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-detail-condition.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-condition.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions-empty.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions-empty.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions-empty.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions-empty.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-conditions.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-header.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-header.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-detail-header.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-header.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-projects.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-projects.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-detail-projects.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail-projects.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-detail.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-detail.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-detail.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-edit.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-edit.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-edit.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-edit.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-empty.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-empty.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-empty.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-empty.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-item.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-item.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-item.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gate-sidebar-list-item.hbs diff --git a/sonar-server/src/main/hbs/quality-gates/quality-gates-layout.hbs b/server/sonar-server/src/main/hbs/quality-gates/quality-gates-layout.hbs similarity index 100% rename from sonar-server/src/main/hbs/quality-gates/quality-gates-layout.hbs rename to server/sonar-server/src/main/hbs/quality-gates/quality-gates-layout.hbs diff --git a/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java b/server/sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java b/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/db/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/activity/db/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/db/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/db/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndex.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityNormalizer.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityQuery.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityQuery.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/index/ActivityQuery.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityQuery.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/index/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/index/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/index/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/activity/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivitiesWebService.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivitiesWebService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/ws/ActivitiesWebService.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivitiesWebService.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ws/SearchAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/ws/SearchAction.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/ws/SearchAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/activity/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/activity/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/activity/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java rename to server/sonar-server/src/main/java/org/sonar/server/authentication/ws/AuthenticationWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/authentication/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java b/server/sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java b/server/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChart.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChart.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChartWeb.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChartWeb.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChartWeb.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BaseChartWeb.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/DeprecatedChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/DeprecatedChart.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/DeprecatedChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/DeprecatedChart.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/PieChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/PieChart.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/PieChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/PieChart.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/SparkLinesChart.java b/server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/SparkLinesChart.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/deprecated/SparkLinesChart.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/deprecated/SparkLinesChart.java diff --git a/sonar-server/src/main/java/org/sonar/server/charts/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/charts/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/charts/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/charts/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/ComponentQuery.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentQuery.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/ComponentQuery.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ComponentQuery.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ComponentsFinderSort.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentQueryResult.java b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentQueryResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/DefaultComponentQueryResult.java rename to server/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentQueryResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java rename to server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java rename to server/sonar-server/src/main/java/org/sonar/server/component/persistence/ComponentDao.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/component/persistence/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/BaseDao.java rename to server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/Dao.java b/server/sonar-server/src/main/java/org/sonar/server/db/Dao.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/Dao.java rename to server/sonar-server/src/main/java/org/sonar/server/db/Dao.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/DbClient.java b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/DbClient.java rename to server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java b/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java rename to server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabase.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java b/server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/db/EmbeddedDatabaseFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdater.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdater.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdater.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/SqlUtil.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SqlUtil.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/SqlUtil.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/SqlUtil.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Progress.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Progress.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Progress.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Progress.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v36/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v42/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v43/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigration.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigration.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigration.java rename to server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigration.java diff --git a/sonar-server/src/main/java/org/sonar/server/db/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/db/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/db/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/db/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtCharacteristicsXMLImporter.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtCharacteristicsXMLImporter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtCharacteristicsXMLImporter.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtCharacteristicsXMLImporter.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java diff --git a/sonar-server/src/main/java/org/sonar/server/debt/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/debt/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/debt/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/debt/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java rename to server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java diff --git a/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java rename to server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java diff --git a/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/duplication/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/ForbiddenException.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/Message.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/NotFoundException.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/ServerException.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/Verifications.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/Verifications.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/Verifications.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/Verifications.java diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/exceptions/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/Action.java b/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/Action.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/Action.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/ActionService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java b/server/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelog.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelog.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueChangelog.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelog.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogDiffFormat.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogDiffFormat.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogDiffFormat.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogDiffFormat.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogFormatter.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssueStatsFinder.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/Result.java b/server/sonar-server/src/main/java/org/sonar/server/issue/Result.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/Result.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/Result.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java b/server/sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanWs.java b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanWs.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/actionplan/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/actionplan/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterResult.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterResult.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/filter/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/filter/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/filter/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueActionsWriter.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilter.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilter.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterCondition.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterCondition.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterCondition.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterCondition.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterEngine.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterEngine.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterEngine.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterEngine.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterResult.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterResult.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterRow.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterRow.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterRow.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterRow.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSort.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSort.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSort.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSort.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/measure/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java b/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/persistence/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/persistence/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/persistence/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/notifications/NotificationCenter.java b/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationCenter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/notifications/NotificationCenter.java rename to server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationCenter.java diff --git a/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java b/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java rename to server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java diff --git a/sonar-server/src/main/java/org/sonar/server/paging/PagedResult.java b/server/sonar-server/src/main/java/org/sonar/server/paging/PagedResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/paging/PagedResult.java rename to server/sonar-server/src/main/java/org/sonar/server/paging/PagedResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/paging/Paging.java b/server/sonar-server/src/main/java/org/sonar/server/paging/Paging.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/paging/Paging.java rename to server/sonar-server/src/main/java/org/sonar/server/paging/Paging.java diff --git a/sonar-server/src/main/java/org/sonar/server/paging/PagingResult.java b/server/sonar-server/src/main/java/org/sonar/server/paging/PagingResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/paging/PagingResult.java rename to server/sonar-server/src/main/java/org/sonar/server/paging/PagingResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/GroupWithPermissionQueryResult.java b/server/sonar-server/src/main/java/org/sonar/server/permission/GroupWithPermissionQueryResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/GroupWithPermissionQueryResult.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/GroupWithPermissionQueryResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/PermissionChangeQuery.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChangeQuery.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/PermissionChangeQuery.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChangeQuery.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateGroup.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateGroup.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateGroup.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateGroup.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUser.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUser.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUser.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUser.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/UserWithPermissionQueryResult.java b/server/sonar-server/src/main/java/org/sonar/server/permission/UserWithPermissionQueryResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/UserWithPermissionQueryResult.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/UserWithPermissionQueryResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/permission/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ClassLoaderUtils.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ClassLoaderUtils.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ClassLoaderUtils.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ClassLoaderUtils.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java b/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java b/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java b/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/MasterServletFilter.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java b/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/Platform.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/PlatformServletContextListener.java b/server/sonar-server/src/main/java/org/sonar/server/platform/PlatformServletContextListener.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/PlatformServletContextListener.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/PlatformServletContextListener.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ProfilingFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ProfilingFilter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ProfilingFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ProfilingFilter.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/RailsAppsDeployer.java b/server/sonar-server/src/main/java/org/sonar/server/platform/RailsAppsDeployer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/RailsAppsDeployer.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/RailsAppsDeployer.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ServerIdGenerator.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ServerLifecycleNotifier.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ServerSettings.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java b/server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java b/server/sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/TempFolderProvider.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/L10nWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartHandler.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartHandler.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ws/RestartHandler.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartHandler.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPluginReferentialFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/MimeTypes.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/MimeTypes.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/MimeTypes.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/MimeTypes.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/PluginReferentialMetadataConverter.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarInstaller.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarInstaller.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarInstaller.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarInstaller.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarsInstaller.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarsInstaller.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarsInstaller.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarsInstaller.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInProfiles.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInProfiles.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInProfiles.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInProfiles.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileName.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRepositoryExporter.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRepositoryExporter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRepositoryExporter.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRepositoryExporter.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfiles.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/db/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java b/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/NewRule.java b/server/sonar-server/src/main/java/org/sonar/server/rule/NewRule.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/NewRule.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/NewRule.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/Rule.java b/server/sonar-server/src/main/java/org/sonar/server/rule/Rule.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/Rule.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/Rule.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleService.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java b/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/db/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/rule/db/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/db/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/db/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/rule/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWebService.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWebService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWebService.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWebService.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java rename to server/sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java rename to server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java rename to server/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/ESNode.java b/server/sonar-server/src/main/java/org/sonar/server/search/ESNode.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/ESNode.java rename to server/sonar-server/src/main/java/org/sonar/server/search/ESNode.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java b/server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/FacetValue.java rename to server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/Hit.java b/server/sonar-server/src/main/java/org/sonar/server/search/Hit.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/Hit.java rename to server/sonar-server/src/main/java/org/sonar/server/search/Hit.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/Index.java b/server/sonar-server/src/main/java/org/sonar/server/search/Index.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/Index.java rename to server/sonar-server/src/main/java/org/sonar/server/search/Index.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexClient.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexClient.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexClient.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexClient.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexDefinition.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexField.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexField.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexField.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexField.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexProperties.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexQueueWorker.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexQueueWorker.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexQueueWorker.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexQueueWorker.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexStat.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexStat.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexStat.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexStat.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java rename to server/sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/Indexable.java b/server/sonar-server/src/main/java/org/sonar/server/search/Indexable.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/Indexable.java rename to server/sonar-server/src/main/java/org/sonar/server/search/Indexable.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java b/server/sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java rename to server/sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/Result.java b/server/sonar-server/src/main/java/org/sonar/server/search/Result.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/Result.java rename to server/sonar-server/src/main/java/org/sonar/server/search/Result.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/action/DtoIndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/DtoIndexAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/action/DtoIndexAction.java rename to server/sonar-server/src/main/java/org/sonar/server/search/action/DtoIndexAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/action/EmbeddedIndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/EmbeddedIndexAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/action/EmbeddedIndexAction.java rename to server/sonar-server/src/main/java/org/sonar/server/search/action/EmbeddedIndexAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java rename to server/sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/action/KeyIndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/KeyIndexAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/action/KeyIndexAction.java rename to server/sonar-server/src/main/java/org/sonar/server/search/action/KeyIndexAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/action/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/action/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/search/action/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/es/ListUpdate.java b/server/sonar-server/src/main/java/org/sonar/server/search/es/ListUpdate.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/es/ListUpdate.java rename to server/sonar-server/src/main/java/org/sonar/server/search/es/ListUpdate.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/search/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/search/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java b/server/sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java rename to server/sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/ws/SearchOptions.java b/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchOptions.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/ws/SearchOptions.java rename to server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchOptions.java diff --git a/sonar-server/src/main/java/org/sonar/server/search/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/search/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/search/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/search/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java b/server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java rename to server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/CodeColorizers.java b/server/sonar-server/src/main/java/org/sonar/server/source/CodeColorizers.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/CodeColorizers.java rename to server/sonar-server/src/main/java/org/sonar/server/source/CodeColorizers.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java b/server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/DeprecatedSourceDecorator.java b/server/sonar-server/src/main/java/org/sonar/server/source/DeprecatedSourceDecorator.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/DeprecatedSourceDecorator.java rename to server/sonar-server/src/main/java/org/sonar/server/source/DeprecatedSourceDecorator.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java b/server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java rename to server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java b/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java rename to server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java b/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java rename to server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/SourceService.java b/server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/SourceService.java rename to server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/source/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/source/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java rename to server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/ws/ScmWriter.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmWriter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/ws/ScmWriter.java rename to server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmWriter.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java rename to server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/source/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/CleanPreviewAnalysisCache.java b/server/sonar-server/src/main/java/org/sonar/server/startup/CleanPreviewAnalysisCache.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/CleanPreviewAnalysisCache.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/CleanPreviewAnalysisCache.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java b/server/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java b/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/GwtPublisher.java b/server/sonar-server/src/main/java/org/sonar/server/startup/GwtPublisher.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/GwtPublisher.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/GwtPublisher.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/JdbcDriverDeployer.java b/server/sonar-server/src/main/java/org/sonar/server/startup/JdbcDriverDeployer.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/JdbcDriverDeployer.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/JdbcDriverDeployer.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java b/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/ServerMetadataPersister.java b/server/sonar-server/src/main/java/org/sonar/server/startup/ServerMetadataPersister.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/ServerMetadataPersister.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/ServerMetadataPersister.java diff --git a/sonar-server/src/main/java/org/sonar/server/startup/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/startup/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/startup/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/startup/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java b/server/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/CoverageService.java rename to server/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageWs.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/ws/CoverageWs.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/CoverageWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsShowAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/ws/TestsShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsShowAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestCasesAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestCasesAction.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestCasesAction.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestCasesAction.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/text/Macro.java b/server/sonar-server/src/main/java/org/sonar/server/text/Macro.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/text/Macro.java rename to server/sonar-server/src/main/java/org/sonar/server/text/Macro.java diff --git a/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java b/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java rename to server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java diff --git a/sonar-server/src/main/java/org/sonar/server/text/RubyTextService.java b/server/sonar-server/src/main/java/org/sonar/server/text/RubyTextService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/text/RubyTextService.java rename to server/sonar-server/src/main/java/org/sonar/server/text/RubyTextService.java diff --git a/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java b/server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java rename to server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java rename to server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java rename to server/sonar-server/src/main/java/org/sonar/server/ui/JRubyI18n.java diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyProfiling.java b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyProfiling.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ui/JRubyProfiling.java rename to server/sonar-server/src/main/java/org/sonar/server/ui/JRubyProfiling.java diff --git a/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java b/server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java rename to server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java diff --git a/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java rename to server/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java diff --git a/sonar-server/src/main/java/org/sonar/server/ui/Views.java b/server/sonar-server/src/main/java/org/sonar/server/ui/Views.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ui/Views.java rename to server/sonar-server/src/main/java/org/sonar/server/ui/Views.java diff --git a/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java b/server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java rename to server/sonar-server/src/main/java/org/sonar/server/updatecenter/ws/UpdateCenterWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java b/server/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java rename to server/sonar-server/src/main/java/org/sonar/server/user/CompatibilityRealm.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/DatabaseSessionFilter.java b/server/sonar-server/src/main/java/org/sonar/server/user/DatabaseSessionFilter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/DatabaseSessionFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/user/DatabaseSessionFilter.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java b/server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java rename to server/sonar-server/src/main/java/org/sonar/server/user/DefaultUserService.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java b/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java rename to server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java rename to server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java b/server/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java rename to server/sonar-server/src/main/java/org/sonar/server/user/NewUserNotifier.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java rename to server/sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java b/server/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/user/SecurityRealmFactory.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/UserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/UserSession.java rename to server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/user/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/user/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java rename to server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/BooleanTypeValidation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/FloatTypeValidation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/IntegerTypeValidation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java b/server/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java rename to server/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/Slug.java b/server/sonar-server/src/main/java/org/sonar/server/util/Slug.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/Slug.java rename to server/sonar-server/src/main/java/org/sonar/server/util/Slug.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/StringListTypeValidation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/StringTypeValidation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/TextTypeValidation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java b/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/TypeValidation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java b/server/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java rename to server/sonar-server/src/main/java/org/sonar/server/util/TypeValidations.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/Validation.java b/server/sonar-server/src/main/java/org/sonar/server/util/Validation.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/Validation.java rename to server/sonar-server/src/main/java/org/sonar/server/util/Validation.java diff --git a/sonar-server/src/main/java/org/sonar/server/util/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/util/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/util/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/util/package-info.java diff --git a/sonar-server/src/main/java/org/sonar/server/ws/ListingWs.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ListingWs.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ws/ListingWs.java rename to server/sonar-server/src/main/java/org/sonar/server/ws/ListingWs.java diff --git a/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java rename to server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java diff --git a/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java rename to server/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java diff --git a/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java rename to server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java diff --git a/sonar-server/src/main/java/org/sonar/server/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/ws/package-info.java similarity index 100% rename from sonar-server/src/main/java/org/sonar/server/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/ws/package-info.java diff --git a/sonar-server/src/main/js/application.js b/server/sonar-server/src/main/js/application.js similarity index 100% rename from sonar-server/src/main/js/application.js rename to server/sonar-server/src/main/js/application.js diff --git a/sonar-server/src/main/js/common/handlebars-extensions.js b/server/sonar-server/src/main/js/common/handlebars-extensions.js similarity index 100% rename from sonar-server/src/main/js/common/handlebars-extensions.js rename to server/sonar-server/src/main/js/common/handlebars-extensions.js diff --git a/sonar-server/src/main/js/common/select-list.js b/server/sonar-server/src/main/js/common/select-list.js similarity index 100% rename from sonar-server/src/main/js/common/select-list.js rename to server/sonar-server/src/main/js/common/select-list.js diff --git a/sonar-server/src/main/js/dashboard.js b/server/sonar-server/src/main/js/dashboard.js similarity index 100% rename from sonar-server/src/main/js/dashboard.js rename to server/sonar-server/src/main/js/dashboard.js diff --git a/sonar-server/src/main/js/duplication.js b/server/sonar-server/src/main/js/duplication.js similarity index 100% rename from sonar-server/src/main/js/duplication.js rename to server/sonar-server/src/main/js/duplication.js diff --git a/sonar-server/src/main/js/issue.js b/server/sonar-server/src/main/js/issue.js similarity index 100% rename from sonar-server/src/main/js/issue.js rename to server/sonar-server/src/main/js/issue.js diff --git a/sonar-server/src/main/js/issues/app.js b/server/sonar-server/src/main/js/issues/app.js similarity index 100% rename from sonar-server/src/main/js/issues/app.js rename to server/sonar-server/src/main/js/issues/app.js diff --git a/sonar-server/src/main/js/issues/extra.js b/server/sonar-server/src/main/js/issues/extra.js similarity index 100% rename from sonar-server/src/main/js/issues/extra.js rename to server/sonar-server/src/main/js/issues/extra.js diff --git a/sonar-server/src/main/js/latinize.js b/server/sonar-server/src/main/js/latinize.js similarity index 100% rename from sonar-server/src/main/js/latinize.js rename to server/sonar-server/src/main/js/latinize.js diff --git a/sonar-server/src/main/js/measures/app.js b/server/sonar-server/src/main/js/measures/app.js similarity index 100% rename from sonar-server/src/main/js/measures/app.js rename to server/sonar-server/src/main/js/measures/app.js diff --git a/sonar-server/src/main/js/navigator/filters/action-plan-filters.js b/server/sonar-server/src/main/js/navigator/filters/action-plan-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/action-plan-filters.js rename to server/sonar-server/src/main/js/navigator/filters/action-plan-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/ajax-select-filters.js b/server/sonar-server/src/main/js/navigator/filters/ajax-select-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/ajax-select-filters.js rename to server/sonar-server/src/main/js/navigator/filters/ajax-select-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/base-filters.js b/server/sonar-server/src/main/js/navigator/filters/base-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/base-filters.js rename to server/sonar-server/src/main/js/navigator/filters/base-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/checkbox-filters.js b/server/sonar-server/src/main/js/navigator/filters/checkbox-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/checkbox-filters.js rename to server/sonar-server/src/main/js/navigator/filters/checkbox-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/choice-filters.js b/server/sonar-server/src/main/js/navigator/filters/choice-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/choice-filters.js rename to server/sonar-server/src/main/js/navigator/filters/choice-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/context-filters.js b/server/sonar-server/src/main/js/navigator/filters/context-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/context-filters.js rename to server/sonar-server/src/main/js/navigator/filters/context-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/favorite-filters.js b/server/sonar-server/src/main/js/navigator/filters/favorite-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/favorite-filters.js rename to server/sonar-server/src/main/js/navigator/filters/favorite-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/filter-bar.js b/server/sonar-server/src/main/js/navigator/filters/filter-bar.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/filter-bar.js rename to server/sonar-server/src/main/js/navigator/filters/filter-bar.js diff --git a/sonar-server/src/main/js/navigator/filters/metric-filters.js b/server/sonar-server/src/main/js/navigator/filters/metric-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/metric-filters.js rename to server/sonar-server/src/main/js/navigator/filters/metric-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/more-criteria-filters.js b/server/sonar-server/src/main/js/navigator/filters/more-criteria-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/more-criteria-filters.js rename to server/sonar-server/src/main/js/navigator/filters/more-criteria-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/range-filters.js b/server/sonar-server/src/main/js/navigator/filters/range-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/range-filters.js rename to server/sonar-server/src/main/js/navigator/filters/range-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/read-only-filters.js b/server/sonar-server/src/main/js/navigator/filters/read-only-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/read-only-filters.js rename to server/sonar-server/src/main/js/navigator/filters/read-only-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/rule-filters.js b/server/sonar-server/src/main/js/navigator/filters/rule-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/rule-filters.js rename to server/sonar-server/src/main/js/navigator/filters/rule-filters.js diff --git a/sonar-server/src/main/js/navigator/filters/string-filters.js b/server/sonar-server/src/main/js/navigator/filters/string-filters.js similarity index 100% rename from sonar-server/src/main/js/navigator/filters/string-filters.js rename to server/sonar-server/src/main/js/navigator/filters/string-filters.js diff --git a/sonar-server/src/main/js/recent-history.js b/server/sonar-server/src/main/js/recent-history.js similarity index 100% rename from sonar-server/src/main/js/recent-history.js rename to server/sonar-server/src/main/js/recent-history.js diff --git a/sonar-server/src/main/js/require.js b/server/sonar-server/src/main/js/require.js similarity index 100% rename from sonar-server/src/main/js/require.js rename to server/sonar-server/src/main/js/require.js diff --git a/sonar-server/src/main/js/resource.js b/server/sonar-server/src/main/js/resource.js similarity index 100% rename from sonar-server/src/main/js/resource.js rename to server/sonar-server/src/main/js/resource.js diff --git a/sonar-server/src/main/js/select2-jquery-ui-fix.js b/server/sonar-server/src/main/js/select2-jquery-ui-fix.js similarity index 100% rename from sonar-server/src/main/js/select2-jquery-ui-fix.js rename to server/sonar-server/src/main/js/select2-jquery-ui-fix.js diff --git a/sonar-server/src/main/js/sortable.js b/server/sonar-server/src/main/js/sortable.js similarity index 100% rename from sonar-server/src/main/js/sortable.js rename to server/sonar-server/src/main/js/sortable.js diff --git a/sonar-server/src/main/js/tests/e2e/pages/quality-gates.html b/server/sonar-server/src/main/js/tests/e2e/pages/quality-gates.html similarity index 100% rename from sonar-server/src/main/js/tests/e2e/pages/quality-gates.html rename to server/sonar-server/src/main/js/tests/e2e/pages/quality-gates.html diff --git a/sonar-server/src/main/js/tests/e2e/server.js b/server/sonar-server/src/main/js/tests/e2e/server.js similarity index 100% rename from sonar-server/src/main/js/tests/e2e/server.js rename to server/sonar-server/src/main/js/tests/e2e/server.js diff --git a/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec.js b/server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec.js similarity index 100% rename from sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec.js rename to server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec.js diff --git a/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/app.json b/server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/app.json similarity index 100% rename from sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/app.json rename to server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/app.json diff --git a/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/list.json b/server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/list.json similarity index 100% rename from sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/list.json rename to server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/list.json diff --git a/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/show.json b/server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/show.json similarity index 100% rename from sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/show.json rename to server/sonar-server/src/main/js/tests/e2e/tests/quality-gates-spec/show.json diff --git a/sonar-server/src/main/js/third-party/backbone.js b/server/sonar-server/src/main/js/third-party/backbone.js similarity index 100% rename from sonar-server/src/main/js/third-party/backbone.js rename to server/sonar-server/src/main/js/third-party/backbone.js diff --git a/sonar-server/src/main/js/third-party/backbone.marionette.js b/server/sonar-server/src/main/js/third-party/backbone.marionette.js similarity index 100% rename from sonar-server/src/main/js/third-party/backbone.marionette.js rename to server/sonar-server/src/main/js/third-party/backbone.marionette.js diff --git a/sonar-server/src/main/js/third-party/d3.js b/server/sonar-server/src/main/js/third-party/d3.js similarity index 100% rename from sonar-server/src/main/js/third-party/d3.js rename to server/sonar-server/src/main/js/third-party/d3.js diff --git a/sonar-server/src/main/js/third-party/handlebars.js b/server/sonar-server/src/main/js/third-party/handlebars.js similarity index 100% rename from sonar-server/src/main/js/third-party/handlebars.js rename to server/sonar-server/src/main/js/third-party/handlebars.js diff --git a/sonar-server/src/main/js/third-party/jquery-ui.js b/server/sonar-server/src/main/js/third-party/jquery-ui.js similarity index 100% rename from sonar-server/src/main/js/third-party/jquery-ui.js rename to server/sonar-server/src/main/js/third-party/jquery-ui.js diff --git a/sonar-server/src/main/js/third-party/jquery.js b/server/sonar-server/src/main/js/third-party/jquery.js similarity index 100% rename from sonar-server/src/main/js/third-party/jquery.js rename to server/sonar-server/src/main/js/third-party/jquery.js diff --git a/sonar-server/src/main/js/third-party/jquery.mockjax.js b/server/sonar-server/src/main/js/third-party/jquery.mockjax.js similarity index 100% rename from sonar-server/src/main/js/third-party/jquery.mockjax.js rename to server/sonar-server/src/main/js/third-party/jquery.mockjax.js diff --git a/sonar-server/src/main/js/third-party/keymaster.js b/server/sonar-server/src/main/js/third-party/keymaster.js similarity index 100% rename from sonar-server/src/main/js/third-party/keymaster.js rename to server/sonar-server/src/main/js/third-party/keymaster.js diff --git a/sonar-server/src/main/js/third-party/moment.js b/server/sonar-server/src/main/js/third-party/moment.js similarity index 100% rename from sonar-server/src/main/js/third-party/moment.js rename to server/sonar-server/src/main/js/third-party/moment.js diff --git a/sonar-server/src/main/js/third-party/select2.js b/server/sonar-server/src/main/js/third-party/select2.js similarity index 100% rename from sonar-server/src/main/js/third-party/select2.js rename to server/sonar-server/src/main/js/third-party/select2.js diff --git a/sonar-server/src/main/js/third-party/underscore.js b/server/sonar-server/src/main/js/third-party/underscore.js similarity index 100% rename from sonar-server/src/main/js/third-party/underscore.js rename to server/sonar-server/src/main/js/third-party/underscore.js diff --git a/sonar-server/src/main/js/top-search.js b/server/sonar-server/src/main/js/top-search.js similarity index 100% rename from sonar-server/src/main/js/top-search.js rename to server/sonar-server/src/main/js/top-search.js diff --git a/sonar-server/src/main/js/translate.js b/server/sonar-server/src/main/js/translate.js similarity index 100% rename from sonar-server/src/main/js/translate.js rename to server/sonar-server/src/main/js/translate.js diff --git a/sonar-server/src/main/js/widgets/bubble-chart.js b/server/sonar-server/src/main/js/widgets/bubble-chart.js similarity index 100% rename from sonar-server/src/main/js/widgets/bubble-chart.js rename to server/sonar-server/src/main/js/widgets/bubble-chart.js diff --git a/sonar-server/src/main/js/widgets/pie-chart.js b/server/sonar-server/src/main/js/widgets/pie-chart.js similarity index 100% rename from sonar-server/src/main/js/widgets/pie-chart.js rename to server/sonar-server/src/main/js/widgets/pie-chart.js diff --git a/sonar-server/src/main/js/widgets/stack-area.js b/server/sonar-server/src/main/js/widgets/stack-area.js similarity index 100% rename from sonar-server/src/main/js/widgets/stack-area.js rename to server/sonar-server/src/main/js/widgets/stack-area.js diff --git a/sonar-server/src/main/js/widgets/timeline.js b/server/sonar-server/src/main/js/widgets/timeline.js similarity index 100% rename from sonar-server/src/main/js/widgets/timeline.js rename to server/sonar-server/src/main/js/widgets/timeline.js diff --git a/sonar-server/src/main/js/widgets/widget.js b/server/sonar-server/src/main/js/widgets/widget.js similarity index 100% rename from sonar-server/src/main/js/widgets/widget.js rename to server/sonar-server/src/main/js/widgets/widget.js diff --git a/sonar-server/src/main/less/api-documentation.less b/server/sonar-server/src/main/less/api-documentation.less similarity index 100% rename from sonar-server/src/main/less/api-documentation.less rename to server/sonar-server/src/main/less/api-documentation.less diff --git a/sonar-server/src/main/less/coding-rules.less b/server/sonar-server/src/main/less/coding-rules.less similarity index 100% rename from sonar-server/src/main/less/coding-rules.less rename to server/sonar-server/src/main/less/coding-rules.less diff --git a/sonar-server/src/main/less/component-viewer-source-colorizer.less b/server/sonar-server/src/main/less/component-viewer-source-colorizer.less similarity index 100% rename from sonar-server/src/main/less/component-viewer-source-colorizer.less rename to server/sonar-server/src/main/less/component-viewer-source-colorizer.less diff --git a/sonar-server/src/main/less/component-viewer.less b/server/sonar-server/src/main/less/component-viewer.less similarity index 100% rename from sonar-server/src/main/less/component-viewer.less rename to server/sonar-server/src/main/less/component-viewer.less diff --git a/sonar-server/src/main/less/dashboard.less b/server/sonar-server/src/main/less/dashboard.less similarity index 100% rename from sonar-server/src/main/less/dashboard.less rename to server/sonar-server/src/main/less/dashboard.less diff --git a/sonar-server/src/main/less/icons.less b/server/sonar-server/src/main/less/icons.less similarity index 100% rename from sonar-server/src/main/less/icons.less rename to server/sonar-server/src/main/less/icons.less diff --git a/sonar-server/src/main/less/jquery-ui.less b/server/sonar-server/src/main/less/jquery-ui.less similarity index 100% rename from sonar-server/src/main/less/jquery-ui.less rename to server/sonar-server/src/main/less/jquery-ui.less diff --git a/sonar-server/src/main/less/layout.less b/server/sonar-server/src/main/less/layout.less similarity index 100% rename from sonar-server/src/main/less/layout.less rename to server/sonar-server/src/main/less/layout.less diff --git a/sonar-server/src/main/less/mixins.less b/server/sonar-server/src/main/less/mixins.less similarity index 100% rename from sonar-server/src/main/less/mixins.less rename to server/sonar-server/src/main/less/mixins.less diff --git a/sonar-server/src/main/less/navigator.less b/server/sonar-server/src/main/less/navigator.less similarity index 100% rename from sonar-server/src/main/less/navigator.less rename to server/sonar-server/src/main/less/navigator.less diff --git a/sonar-server/src/main/less/navigator/base.less b/server/sonar-server/src/main/less/navigator/base.less similarity index 100% rename from sonar-server/src/main/less/navigator/base.less rename to server/sonar-server/src/main/less/navigator/base.less diff --git a/sonar-server/src/main/less/navigator/config.less b/server/sonar-server/src/main/less/navigator/config.less similarity index 100% rename from sonar-server/src/main/less/navigator/config.less rename to server/sonar-server/src/main/less/navigator/config.less diff --git a/sonar-server/src/main/less/navigator/filters.less b/server/sonar-server/src/main/less/navigator/filters.less similarity index 100% rename from sonar-server/src/main/less/navigator/filters.less rename to server/sonar-server/src/main/less/navigator/filters.less diff --git a/sonar-server/src/main/less/quality-gates.less b/server/sonar-server/src/main/less/quality-gates.less similarity index 100% rename from sonar-server/src/main/less/quality-gates.less rename to server/sonar-server/src/main/less/quality-gates.less diff --git a/sonar-server/src/main/less/select-list.less b/server/sonar-server/src/main/less/select-list.less similarity index 100% rename from sonar-server/src/main/less/select-list.less rename to server/sonar-server/src/main/less/select-list.less diff --git a/sonar-server/src/main/less/select2-sonar.less b/server/sonar-server/src/main/less/select2-sonar.less similarity index 100% rename from sonar-server/src/main/less/select2-sonar.less rename to server/sonar-server/src/main/less/select2-sonar.less diff --git a/sonar-server/src/main/less/select2.less b/server/sonar-server/src/main/less/select2.less similarity index 100% rename from sonar-server/src/main/less/select2.less rename to server/sonar-server/src/main/less/select2.less diff --git a/sonar-server/src/main/less/sonar-colorizer.less b/server/sonar-server/src/main/less/sonar-colorizer.less similarity index 100% rename from sonar-server/src/main/less/sonar-colorizer.less rename to server/sonar-server/src/main/less/sonar-colorizer.less diff --git a/sonar-server/src/main/less/style.less b/server/sonar-server/src/main/less/style.less similarity index 100% rename from sonar-server/src/main/less/style.less rename to server/sonar-server/src/main/less/style.less diff --git a/sonar-server/src/main/less/ui.less b/server/sonar-server/src/main/less/ui.less similarity index 100% rename from sonar-server/src/main/less/ui.less rename to server/sonar-server/src/main/less/ui.less diff --git a/sonar-server/src/main/less/variables.less b/server/sonar-server/src/main/less/variables.less similarity index 100% rename from sonar-server/src/main/less/variables.less rename to server/sonar-server/src/main/less/variables.less diff --git a/sonar-server/src/main/less/yui-reset-font.less b/server/sonar-server/src/main/less/yui-reset-font.less similarity index 100% rename from sonar-server/src/main/less/yui-reset-font.less rename to server/sonar-server/src/main/less/yui-reset-font.less diff --git a/sonar-server/src/main/resources/build.properties b/server/sonar-server/src/main/resources/build.properties similarity index 100% rename from sonar-server/src/main/resources/build.properties rename to server/sonar-server/src/main/resources/build.properties diff --git a/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml b/server/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml similarity index 100% rename from sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml rename to server/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml diff --git a/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json b/server/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json rename to server/sonar-server/src/main/resources/org/sonar/server/authentication/ws/example-validate.json diff --git a/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json rename to server/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-app.json diff --git a/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json rename to server/sonar-server/src/main/resources/org/sonar/server/component/ws/components-example-suggestions.json diff --git a/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-create.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-create.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-create.json rename to server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-create.json diff --git a/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-index.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-index.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-index.json rename to server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-index.json diff --git a/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json rename to server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-index.json diff --git a/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-search.json b/server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-search.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-search.json rename to server/sonar-server/src/main/resources/org/sonar/server/component/ws/resources-example-search.json diff --git a/sonar-server/src/main/resources/org/sonar/server/duplication/ws/example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/duplication/ws/example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/duplication/ws/example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/duplication/ws/example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/actionplan/example-search.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/actionplan/example-search.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/issue/actionplan/example-search.json rename to server/sonar-server/src/main/resources/org/sonar/server/issue/actionplan/example-search.json diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/issue/filter/app-example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/issue/filter/example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/issue/filter/example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-changelog.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-changelog.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/issue/ws/example-changelog.json rename to server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-changelog.json diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-search.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-search.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/issue/ws/example-search.json rename to server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-search.json diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-transitions.json b/server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-transitions.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/issue/ws/example-transitions.json rename to server/sonar-server/src/main/resources/org/sonar/server/issue/ws/example-transitions.json diff --git a/sonar-server/src/main/resources/org/sonar/server/measure/ws/timemachine-example-index.json b/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/timemachine-example-index.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/measure/ws/timemachine-example-index.json rename to server/sonar-server/src/main/resources/org/sonar/server/measure/ws/timemachine-example-index.json diff --git a/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml b/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/platform/logback.xml rename to server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml diff --git a/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-index.json b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-index.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/platform/ws/example-index.json rename to server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-index.json diff --git a/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-setup.json b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-setup.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/platform/ws/example-setup.json rename to server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-setup.json diff --git a/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system.json b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system.json rename to server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-system.json diff --git a/sonar-server/src/main/resources/org/sonar/server/plugins/example-batch-index.txt b/server/sonar-server/src/main/resources/org/sonar/server/plugins/example-batch-index.txt similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/plugins/example-batch-index.txt rename to server/sonar-server/src/main/resources/org/sonar/server/plugins/example-batch-index.txt diff --git a/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json b/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json rename to server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-list.json diff --git a/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json b/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json rename to server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-search.json diff --git a/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/qualitygate/ws/example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-index.json b/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-index.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-index.json rename to server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-index.json diff --git a/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-list.json b/server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-list.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-list.json rename to server/sonar-server/src/main/resources/org/sonar/server/qualityprofile/ws/example-list.json diff --git a/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-search.json b/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-search.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/rule/ws/example-search.json rename to server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-search.json diff --git a/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json b/server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json rename to server/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json diff --git a/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json b/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json rename to server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json diff --git a/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/test/ws/coverage-example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/test/ws/coverage-example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/test/ws/coverage-example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/test/ws/coverage-example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-plan.json b/server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-plan.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-plan.json rename to server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-plan.json diff --git a/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-show.json b/server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-show.json rename to server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-testable.json b/server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-testable.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-testable.json rename to server/sonar-server/src/main/resources/org/sonar/server/test/ws/tests-example-testable.json diff --git a/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/example-installed_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/example-installed_plugins.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/example-installed_plugins.json rename to server/sonar-server/src/main/resources/org/sonar/server/updatecenter/ws/example-installed_plugins.json diff --git a/sonar-server/src/main/resources/org/sonar/server/user/ws/example-search.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-search.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/user/ws/example-search.json rename to server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-search.json diff --git a/sonar-server/src/main/webapp/.htaccess b/server/sonar-server/src/main/webapp/.htaccess similarity index 100% rename from sonar-server/src/main/webapp/.htaccess rename to server/sonar-server/src/main/webapp/.htaccess diff --git a/sonar-server/src/main/webapp/401.html b/server/sonar-server/src/main/webapp/401.html similarity index 100% rename from sonar-server/src/main/webapp/401.html rename to server/sonar-server/src/main/webapp/401.html diff --git a/sonar-server/src/main/webapp/404.html b/server/sonar-server/src/main/webapp/404.html similarity index 100% rename from sonar-server/src/main/webapp/404.html rename to server/sonar-server/src/main/webapp/404.html diff --git a/sonar-server/src/main/webapp/500.html b/server/sonar-server/src/main/webapp/500.html similarity index 100% rename from sonar-server/src/main/webapp/500.html rename to server/sonar-server/src/main/webapp/500.html diff --git a/sonar-server/src/main/webapp/META-INF/context.xml b/server/sonar-server/src/main/webapp/META-INF/context.xml similarity index 100% rename from sonar-server/src/main/webapp/META-INF/context.xml rename to server/sonar-server/src/main/webapp/META-INF/context.xml diff --git a/sonar-server/src/main/webapp/META-INF/init.rb b/server/sonar-server/src/main/webapp/META-INF/init.rb similarity index 100% rename from sonar-server/src/main/webapp/META-INF/init.rb rename to server/sonar-server/src/main/webapp/META-INF/init.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/account_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/account_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/account_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/account_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/action_plans_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/action_plans_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/action_plans_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/action_plans_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/admin_dashboards_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/admin_dashboards_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/admin_dashboards_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/admin_dashboards_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/api_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/api_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/api_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/api_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/components_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependencies_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependencies_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependencies_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependencies_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependency_tree_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependency_tree_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependency_tree_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/dependency_tree_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/events_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/events_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/events_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/events_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/favourites_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/gwp_resources_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/gwp_resources_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/gwp_resources_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/gwp_resources_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/manual_measures_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/manual_measures_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/manual_measures_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/manual_measures_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/permissions_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/permissions_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/permissions_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/permissions_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/projects_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/projects_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/projects_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/projects_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/properties_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/properties_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/properties_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/properties_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resource_rest_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resource_rest_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resource_rest_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resource_rest_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rest_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rest_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rest_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rest_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/sources_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/sources_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/sources_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/sources_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/tests_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/tests_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/tests_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/tests_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/updatecenter_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/updatecenter_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/updatecenter_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/updatecenter_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/user_properties_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/user_properties_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/user_properties_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/user_properties_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/users_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/users_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/users_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/users_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/widgets_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/widgets_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api/widgets_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/widgets_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api_documentation_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api_documentation_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/api_documentation_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/api_documentation_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/coding_rules_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/coding_rules_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/coding_rules_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/coding_rules_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/columns_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/columns_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/columns_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/columns_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/component_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/component_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/component_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/component_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/component_viewer_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/component_viewer_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/component_viewer_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/component_viewer_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/components_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/confirm_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboards_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboards_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboards_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboards_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/drilldown_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_configuration_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_configuration_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_configuration_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_configuration_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/groups_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/maintenance_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/maintenance_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/maintenance_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/maintenance_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_measures_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_rules_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_rules_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_rules_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/manual_rules_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/markdown_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/mock/example_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/mock/example_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/mock/example_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/mock/example_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/permission_templates_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/permission_templates_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/permission_templates_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/permission_templates_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/configuration_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/configuration_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/configuration_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/configuration_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/home_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/home_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/home_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/home_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/resource_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/resource_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/resource_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/plugins/resource_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_roles_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/property_sets_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/property_sets_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/property_sets_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/property_sets_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/provisioning_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/provisioning_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/provisioning_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/provisioning_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/quality_gates_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/quality_gates_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/quality_gates_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/quality_gates_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/roles_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/server_id_configuration_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/server_id_configuration_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/server_id_configuration_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/server_id_configuration_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/sessions_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/setup_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/setup_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/setup_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/setup_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/system_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/system_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/system_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/system_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/treemap_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/users_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/widget_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/controllers/widget_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/controllers/widget_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/controllers/widget_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/components_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/components_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/components_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/components_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/metrics_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/metrics_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/metrics_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/metrics_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/plugins_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/plugins_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/plugins_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/plugins_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/profiles_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/profiles_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/profiles_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/profiles_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/project_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/project_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/project_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/project_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/roles_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/roles_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/roles_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/roles_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/rules_configuration_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/rules_configuration_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/rules_configuration_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/rules_configuration_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/sessions_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/sessions_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/sessions_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/sessions_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/source_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/system_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/system_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/system_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/system_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/updatecenter_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/updatecenter_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/updatecenter_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/updatecenter_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/action_plan.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/action_plan.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/action_plan.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/action_plan.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/active_dashboard.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/active_dashboard.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/active_dashboard.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/active_dashboard.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_param_change.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_param_change.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_param_change.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_param_change.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_parameter.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_parameter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_parameter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_parameter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/api.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/api.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/api.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/api.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/api/dashboard_configuration.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/api/dashboard_configuration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/api/dashboard_configuration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/api/dashboard_configuration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/api/pagination.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/api/pagination.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/api/pagination.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/api/pagination.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/author.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/author.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/author.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/author.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/caches.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/caches.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/caches.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/caches.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/characteristic.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/characteristic.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/characteristic.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/characteristic.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/chart_measure.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/chart_measure.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/chart_measure.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/chart_measure.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/dashboard.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/dashboard.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/dashboard.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/dashboard.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/dependency.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/dependency.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/dependency.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/dependency.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/drilldown.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/errors.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/errors.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/errors.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/errors.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/event.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/event.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/event.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/event.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/event_category.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/event_category.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/event_category.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/event_category.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/group.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/group.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/group.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/group.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/group_role.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/group_role.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/group_role.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/group_role.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/internal.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/internal.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/internal.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/internal.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/loaded_template.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/loaded_template.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/loaded_template.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/loaded_template.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/manual_measure.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/manual_measure.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/manual_measure.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/manual_measure.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_color.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_color.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/measure_color.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_color.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_treemap.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_treemap.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_treemap.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_treemap.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_favourite.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_favourite.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_favourite.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_favourite.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/navigation.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/navigation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/navigation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/navigation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/project.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/project.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/project.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/project.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/project_link.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/project_link.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/project_link.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/project_link.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/property.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/property_type.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/property_type.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/property_type.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/property_type.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/resource_deletion_manager.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/resource_deletion_manager.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/resource_deletion_manager.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/resource_deletion_manager.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/resource_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/resource_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/resource_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/resource_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/server.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/severity.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/severity.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/severity.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/severity.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/snapshot.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/snapshot.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/snapshot.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/snapshot.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/snapshot_source.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/snapshot_source.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/snapshot_source.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/snapshot_source.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/columns_view.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/columns_view.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/sonar/columns_view.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/columns_view.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/components_configuration.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/components_configuration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/sonar/components_configuration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/components_configuration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/resource_finder.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/resource_finder.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/sonar/resource_finder.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/resource_finder.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/timemachine_row.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/timemachine_row.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/sonar/timemachine_row.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/timemachine_row.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/trends_chart.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/trends_chart.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/trends_chart.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/trends_chart.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/user.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/user_role.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/user_role.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/user_role.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/user_role.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/widget_property.rb b/server/sonar-server/src/main/webapp/WEB-INF/app/models/widget_property.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/models/widget_property.rb rename to server/sonar-server/src/main/webapp/WEB-INF/app/models/widget_property.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/account/_global_notifications.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/account/_per_project_notifications.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/account/_per_project_notifications.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/account/_per_project_notifications.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/account/_per_project_notifications.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_progress.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_progress.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_progress.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_progress.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/api_documentation/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/branding/_footer.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/branding/_footer.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/branding/_footer.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/branding/_footer.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/_pending_deletions_screen.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/_pending_deletions_screen.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/_pending_deletions_screen.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/_pending_deletions_screen.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/pending_deletions.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/pending_deletions.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/pending_deletions.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/pending_deletions.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/_versions.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/_versions.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/comparison/_versions.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/_versions.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/component/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/component/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/component/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/component/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_edit_mode_controls.rhtml b/server/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_edit_mode_controls.rhtml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_edit_mode_controls.rhtml rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_edit_mode_controls.rhtml diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml b/server/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header_edit_mode.rhtml b/server/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header_edit_mode.rhtml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header_edit_mode.rhtml rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/components/_list_table_header_edit_mode.rhtml diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/configuration/index.rhtml b/server/sonar-server/src/main/webapp/WEB-INF/app/views/configuration/index.rhtml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/configuration/index.rhtml rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/configuration/index.rhtml diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/confirm/_confirm.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_configure_widget.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_footer.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_header.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_encrypt.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_encrypt.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_encrypt.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_encrypt.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_generate_secret_key.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_generate_secret_key.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_generate_secret_key.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/_generate_secret_key.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/_select_user.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_base.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/_resource_viewers.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/gwt/page.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_changelog.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_comment_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_comment_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_comment_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_comment_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_error.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_error.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_error.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_error.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_manual_issue_created.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_manual_issue_created.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_manual_issue_created.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_manual_issue_created.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_severity_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_severity_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_severity_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_severity_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show_modal.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show_modal.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show_modal.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_show_modal.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issue/show.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_copy_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_copy_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_copy_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_copy_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_save_as_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_save_as_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_save_as_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_save_as_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_shared_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_shared_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_shared_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_shared_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations_ajax.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations_ajax.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations_ajax.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_operations_ajax.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search_ajax.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search_ajax.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search_ajax.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_search_ajax.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_filter_bar_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_header.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_assign_form.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_plan_form.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_rule.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_set_severity_form.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_details_favorite_filter.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_flashes.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_flashes.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_flashes.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_flashes.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_iframe.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_iframe.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_iframe.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_iframe.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_resource_settings.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_user.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_user.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_user.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_user.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_nolayout.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_nolayout.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_nolayout.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_nolayout.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/application.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/_tips.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_copy_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_copy_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_copy_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_copy_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_treemap.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_treemap.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_treemap.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_treemap.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites2.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites2.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites2.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites2.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_qualifiers.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_qualifiers.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_qualifiers.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_qualifiers.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_save_as_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_save_as_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_save_as_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_save_as_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_body.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_search_header.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_shared_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_shared_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/_shared_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_shared_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_reactivate_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_reactivate_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_reactivate_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_reactivate_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_ajax_select_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_details_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_base_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_checkbox_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_item_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_choice_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_details_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_favorite_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_metric_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_details_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_more_criteria_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_range_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/templates/_string_filter_template.hbs.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_groups.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_groups.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_groups.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_groups.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_users.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_users.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_users.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_edit_users.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/rails_page.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/rails_page.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/plugins/rails_page.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/rails_page.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_copy_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_copy_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_copy_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_copy_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_new.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_new.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_new.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_new.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_built_in_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_built_in_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_built_in_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_built_in_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_restore_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/compare.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/edit.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/edit.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/edit.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/edit.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/new.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/new.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/new.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/new.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/show.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/_prepare_keys.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_prepare_keys.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/_prepare_keys.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_prepare_keys.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/_snapshot_title.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_snapshot_title.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/_snapshot_title.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/_snapshot_title.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/pending_deletion.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/pending_deletion.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/pending_deletion.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/pending_deletion.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/qualitygate.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/qualitygate.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/qualitygate.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/qualitygate.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/settings.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/_complexity_chart.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/_complexity_chart.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/_complexity_chart.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/_complexity_chart.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list_widget.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list_widget.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list_widget.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list_widget.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/property_sets/_list.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/property_sets/_list.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/property_sets/_list.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/property_sets/_list.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_delete_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_delete_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_delete_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/_delete_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_view.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_error.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_error.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_error.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_error.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_multi_value.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_multi_value.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_multi_value.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_multi_value.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_set_instance.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_set_instance.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_set_instance.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_set_instance.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_single_value.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_single_value.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_single_value.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_single_value.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_BOOLEAN.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_BOOLEAN.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_BOOLEAN.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_BOOLEAN.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_FLOAT.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_FLOAT.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_FLOAT.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_FLOAT.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_INTEGER.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_INTEGER.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_INTEGER.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_INTEGER.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_METRIC.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PASSWORD.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PASSWORD.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PASSWORD.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PASSWORD.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_REGULAR_EXPRESSION.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_REGULAR_EXPRESSION.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_REGULAR_EXPRESSION.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_REGULAR_EXPRESSION.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_SINGLE_SELECT_LIST.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_SINGLE_SELECT_LIST.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_SINGLE_SELECT_LIST.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_SINGLE_SELECT_LIST.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_STRING.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_STRING.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_STRING.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_STRING.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_TEXT.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_TEXT.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_TEXT.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_TEXT.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/settings/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/settings/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_no_issues.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_no_issues.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_no_issues.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_no_issues.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_result_messages.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_result_messages.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_result_messages.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_result_messages.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_code.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_code.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_code.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_code.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_coverage.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_display.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_display.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_display.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_display.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issue_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issue_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issue_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issue_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issues.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issues.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issues.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_issues.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_line_numbers.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_line_numbers.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_line_numbers.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_line_numbers.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_new_section.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_new_section.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_new_section.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_new_section.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_scm.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_scm.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_scm.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/shared/_source_scm.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/system/_row.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/system/_row.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/system/_row.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/system/_row.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_gradient.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_gradient.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_gradient.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_gradient.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/_treemap_container.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/treemap/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/treemap/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_status.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_status.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_status.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_status.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_reactivate_form.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_reactivate_form.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/users/_reactivate_form.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_reactivate_form.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/utils/_tfoot_pagination.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/utils/_tfoot_pagination.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/utils/_tfoot_pagination.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/utils/_tfoot_pagination.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/boot.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/boot.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/boot.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/boot.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/database.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/database.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/database.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/database.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/environment.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/environment.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/environment.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environments/production.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/environments/production.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/environments/production.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/environments/production.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/available_locales.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/initializers/available_locales.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/initializers/available_locales.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/initializers/available_locales.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/close_connections.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/initializers/close_connections.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/initializers/close_connections.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/initializers/close_connections.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/inflections.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/initializers/inflections.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/initializers/inflections.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/initializers/inflections.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/jrails.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/initializers/jrails.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/initializers/jrails.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/initializers/jrails.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/mime_types.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/initializers/mime_types.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/initializers/mime_types.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/initializers/mime_types.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/new_rails_defaults.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/initializers/new_rails_defaults.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/initializers/new_rails_defaults.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/initializers/new_rails_defaults.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/initializers/site_keys.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/initializers/site_keys.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/initializers/site_keys.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/initializers/site_keys.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/HOW_TO_UPGRADE_LOCALES.txt b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/HOW_TO_UPGRADE_LOCALES.txt similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/HOW_TO_UPGRADE_LOCALES.txt rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/HOW_TO_UPGRADE_LOCALES.txt diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/de.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/de.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/de.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/de.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ar.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ar.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ar.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ar.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bg.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bg.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bg.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bg.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bn-IN.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bn-IN.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bn-IN.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bn-IN.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bs.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bs.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bs.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/bs.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ca.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ca.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ca.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ca.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cs.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cs.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cs.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cs.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cy.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cy.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cy.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/cy.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/da.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/da.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/da.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/da.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-AT.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-AT.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-AT.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-AT.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-CH.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-CH.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-CH.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de-CH.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/de.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/dsb.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/dsb.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/dsb.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/dsb.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/el.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/el.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/el.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/el.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-AU.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-AU.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-AU.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-AU.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-GB.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-GB.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-GB.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-GB.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-US.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-US.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-US.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/en-US.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eo.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eo.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eo.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eo.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-AR.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-AR.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-AR.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-AR.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CL.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CL.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CL.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CL.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CO.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CO.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CO.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-CO.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-MX.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-MX.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-MX.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-MX.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-PE.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-PE.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-PE.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es-PE.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/es.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/et.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/et.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/et.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/et.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eu.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eu.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eu.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/eu.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fa.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fa.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fa.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fa.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fi.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fi.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fi.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fi.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CA.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CA.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CA.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CA.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CH.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CH.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CH.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr-CH.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fr.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fur.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fur.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fur.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/fur.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gl-ES.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gl-ES.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gl-ES.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gl-ES.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gsw-CH.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gsw-CH.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gsw-CH.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/gsw-CH.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/he.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/he.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/he.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/he.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi-IN.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi-IN.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi-IN.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi-IN.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hi.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hr.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hr.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hr.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hr.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hsb.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hsb.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hsb.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hsb.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hu.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hu.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hu.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/hu.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/id.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/id.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/id.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/id.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/is.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/is.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/is.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/is.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/it.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/it.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/it.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/it.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ja.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ja.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ja.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ja.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ko.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ko.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ko.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ko.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lo.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lo.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lo.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lo.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lt.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lt.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lt.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lt.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lv.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lv.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lv.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/lv.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mk.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mk.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mk.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mk.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mn.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mn.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mn.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/mn.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nb.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nb.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nb.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nb.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nl.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nl.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nl.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nl.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nn.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nn.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nn.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/nn.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pl.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pl.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pl.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pl.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-BR.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-BR.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-BR.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-BR.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-PT.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-PT.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-PT.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/pt-PT.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/rm.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/rm.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/rm.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/rm.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ro.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ro.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ro.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ro.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ru.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ru.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ru.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/ru.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sl.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sl.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sl.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sl.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr-Latn.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr-Latn.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr-Latn.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr-Latn.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sr.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sv-SE.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sv-SE.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sv-SE.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sv-SE.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sw.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sw.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sw.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sw.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/th.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/th.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/th.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/th.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/tr.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/tr.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/tr.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/tr.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/uk.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/uk.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/uk.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/uk.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/vi.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/vi.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/vi.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/vi.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-CN.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-CN.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-CN.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-CN.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-TW.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-TW.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-TW.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/zh-TW.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/en-AU.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/en-AU.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/en-AU.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/en-AU.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/en-GB.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/en-GB.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/en-GB.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/en-GB.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/en-US.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/en-US.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/en-US.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/en-US.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/en.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/en.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/en.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/en.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/es.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/es.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/es.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/es.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/fr.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/fr.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/fr.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/fr.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/ru.yml b/server/sonar-server/src/main/webapp/WEB-INF/config/locales/ru.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/locales/ru.yml rename to server/sonar-server/src/main/webapp/WEB-INF/config/locales/ru.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/logback-access.xml b/server/sonar-server/src/main/webapp/WEB-INF/config/logback-access.xml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/logback-access.xml rename to server/sonar-server/src/main/webapp/WEB-INF/config/logback-access.xml diff --git a/sonar-server/src/main/webapp/WEB-INF/config/routes.rb b/server/sonar-server/src/main/webapp/WEB-INF/config/routes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/config/routes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/config/routes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/002_index_database.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/002_index_database.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/002_index_database.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/002_index_database.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/010_create_users.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/010_create_users.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/010_create_users.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/010_create_users.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/011_create_administrator.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/011_create_administrator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/011_create_administrator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/011_create_administrator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/035_create_snapshot_sources.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/035_create_snapshot_sources.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/035_create_snapshot_sources.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/035_create_snapshot_sources.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/053_create_events_table.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/053_create_events_table.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/053_create_events_table.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/053_create_events_table.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/054_create_alerts_table.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/054_create_alerts_table.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/054_create_alerts_table.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/054_create_alerts_table.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/059_create_properties.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/059_create_properties.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/059_create_properties.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/059_create_properties.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/061_add_measure_data.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/061_add_measure_data.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/061_add_measure_data.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/061_add_measure_data.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/062_add_project_kee_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/062_add_project_kee_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/062_add_project_kee_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/062_add_project_kee_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/079_create_groups.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/079_create_groups.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/079_create_groups.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/079_create_groups.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/080_create_groups_users.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/080_create_groups_users.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/080_create_groups_users.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/080_create_groups_users.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/086_create_group_roles.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/086_create_group_roles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/086_create_group_roles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/086_create_group_roles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/087_create_user_roles.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/087_create_user_roles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/087_create_user_roles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/087_create_user_roles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/088_create_default_users_and_groups.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/088_create_default_users_and_groups.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/088_create_default_users_and_groups.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/088_create_default_users_and_groups.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/093_create_dependencies_table.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/093_create_dependencies_table.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/093_create_dependencies_table.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/093_create_dependencies_table.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/095_increase_measure_id_size.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/095_increase_measure_id_size.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/095_increase_measure_id_size.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/095_increase_measure_id_size.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/115_create_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/115_create_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/115_create_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/115_create_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/118_add_snapshots_qualifier_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/118_add_snapshots_qualifier_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/118_add_snapshots_qualifier_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/118_add_snapshots_qualifier_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/119_add_measures_sid_metric_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/119_add_measures_sid_metric_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/119_add_measures_sid_metric_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/119_add_measures_sid_metric_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/131_create_quality_models.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/131_create_quality_models.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/131_create_quality_models.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/131_create_quality_models.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/132_add_characteristic_id_to_measures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/132_add_characteristic_id_to_measures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/132_add_characteristic_id_to_measures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/132_add_characteristic_id_to_measures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/136_increase_violations_size.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/136_increase_violations_size.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/136_increase_violations_size.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/136_increase_violations_size.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/138_add_characteristic_description.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/138_add_characteristic_description.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/138_add_characteristic_description.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/138_add_characteristic_description.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/139_add_characteristic_enabled.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/139_add_characteristic_enabled.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/139_add_characteristic_enabled.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/139_add_characteristic_enabled.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/140_create_characteristic_properties.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/140_create_characteristic_properties.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/140_create_characteristic_properties.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/140_create_characteristic_properties.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/141_add_rule_failures_cost.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/141_add_rule_failures_cost.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/141_add_rule_failures_cost.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/141_add_rule_failures_cost.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/160_add_rule_failures_columns.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/160_add_rule_failures_columns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/160_add_rule_failures_columns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/160_add_rule_failures_columns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/163_add_variation_columns.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/163_add_variation_columns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/163_add_variation_columns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/163_add_variation_columns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/167_add_index_to_measure_data_snapshot.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/167_add_index_to_measure_data_snapshot.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/167_add_index_to_measure_data_snapshot.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/167_add_index_to_measure_data_snapshot.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/168_add_periods_to_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/168_add_periods_to_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/168_add_periods_to_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/168_add_periods_to_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/169_add_columns_for_profiles_inheritance.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/180_add_profiles_disabled.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/180_add_profiles_disabled.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/180_add_profiles_disabled.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/180_add_profiles_disabled.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_add_permanent_id_and_switched_off_to_rule_failures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_add_permanent_id_and_switched_off_to_rule_failures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/190_add_permanent_id_and_switched_off_to_rule_failures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_add_permanent_id_and_switched_off_to_rule_failures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/191_create_review.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/191_create_review.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/191_create_review.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/191_create_review.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/200_add_index_to_characteristic_property.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/200_add_index_to_characteristic_property.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/200_add_index_to_characteristic_property.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/200_add_index_to_characteristic_property.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/201_change_false_positive_on_reviews.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/201_change_false_positive_on_reviews.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/201_change_false_positive_on_reviews.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/201_change_false_positive_on_reviews.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/202_create_rule_changes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/202_create_rule_changes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/202_create_rule_changes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/202_create_rule_changes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/211_create_manual_measures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/211_create_manual_measures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/211_create_manual_measures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/211_create_manual_measures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/214_add_index_on_manual_measures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/214_add_index_on_manual_measures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/214_add_index_on_manual_measures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/214_add_index_on_manual_measures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/215_create_notifications.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/215_create_notifications.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/215_create_notifications.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/215_create_notifications.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/216_set_nullable_rule_name.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/216_set_nullable_rule_name.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/216_set_nullable_rule_name.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/216_set_nullable_rule_name.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/217_create_duplications_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/217_create_duplications_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/217_create_duplications_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/217_create_duplications_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/220_update_events_table.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/220_update_events_table.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/220_update_events_table.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/220_update_events_table.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/221_attach_events_to_snapshots.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/221_attach_events_to_snapshots.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/221_attach_events_to_snapshots.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/221_attach_events_to_snapshots.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/222_add_index_on_dependencies_project_snapshot.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/222_add_index_on_dependencies_project_snapshot.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/222_add_index_on_dependencies_project_snapshot.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/222_add_index_on_dependencies_project_snapshot.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/230_increase_qualifier_size.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/230_increase_qualifier_size.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/230_increase_qualifier_size.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/230_increase_qualifier_size.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/232_add_rule_columns_to_reviews.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/232_add_rule_columns_to_reviews.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/232_add_rule_columns_to_reviews.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/232_add_rule_columns_to_reviews.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/233_add_rule_failures_committer.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/233_add_rule_failures_committer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/233_add_rule_failures_committer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/233_add_rule_failures_committer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/234_add_manual_severity_to_reviews.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/234_add_manual_severity_to_reviews.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/234_add_manual_severity_to_reviews.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/234_add_manual_severity_to_reviews.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/235_create_loaded_templates.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/235_create_loaded_templates.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/235_create_loaded_templates.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/235_create_loaded_templates.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/236_delete_value_type_from_widget_properties.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/236_delete_value_type_from_widget_properties.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/236_delete_value_type_from_widget_properties.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/236_delete_value_type_from_widget_properties.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/237_create_table_resource_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/237_create_table_resource_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/237_create_table_resource_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/237_create_table_resource_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/239_delete_duplications_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/239_delete_duplications_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/239_delete_duplications_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/239_delete_duplications_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/240_delete_resource_orphans.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/240_delete_resource_orphans.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/240_delete_resource_orphans.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/240_delete_resource_orphans.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/250_add_snapshots_build_date.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/250_add_snapshots_build_date.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/250_add_snapshots_build_date.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/250_add_snapshots_build_date.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/251_add_snapshots_purge_status.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/251_add_snapshots_purge_status.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/251_add_snapshots_purge_status.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/251_add_snapshots_purge_status.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/252_add_rule_and_active_rule_notes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/252_add_rule_and_active_rule_notes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/252_add_rule_and_active_rule_notes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/252_add_rule_and_active_rule_notes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/254_add_metrics_delete_historical_data.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/254_add_metrics_delete_historical_data.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/254_add_metrics_delete_historical_data.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/254_add_metrics_delete_historical_data.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/255_rename_dbcleaner_properties.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/255_rename_dbcleaner_properties.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/255_rename_dbcleaner_properties.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/255_rename_dbcleaner_properties.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/256_add_measures_person.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/256_add_measures_person.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/256_add_measures_person.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/256_add_measures_person.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/257_add_active_field_on_users.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/257_add_active_field_on_users.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/257_add_active_field_on_users.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/257_add_active_field_on_users.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/258_add_index_on_review_resource_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/258_add_index_on_review_resource_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/258_add_index_on_review_resource_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/258_add_index_on_review_resource_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/259_rename_action_plans_deadline.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/259_rename_action_plans_deadline.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/259_rename_action_plans_deadline.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/259_rename_action_plans_deadline.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/261_add_projects_person_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/261_add_projects_person_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/261_add_projects_person_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/261_add_projects_person_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/262_create_authors.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/263_replace_rule_failures_committer_by_person.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/263_replace_rule_failures_committer_by_person.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/263_replace_rule_failures_committer_by_person.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/263_replace_rule_failures_committer_by_person.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/280_drop_table_rules_categories.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/280_drop_table_rules_categories.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/280_drop_table_rules_categories.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/280_drop_table_rules_categories.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/281_clean_reviews_with_null_booleans.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/281_clean_reviews_with_null_booleans.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/281_clean_reviews_with_null_booleans.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/281_clean_reviews_with_null_booleans.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/282_update_reviews_boolean_columns.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/282_update_reviews_boolean_columns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/282_update_reviews_boolean_columns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/282_update_reviews_boolean_columns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/283_add_authors_primary_key.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/283_add_authors_primary_key.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/283_add_authors_primary_key.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/283_add_authors_primary_key.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/284_add_default_description_to_manual_rules.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/284_add_default_description_to_manual_rules.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/284_add_default_description_to_manual_rules.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/284_add_default_description_to_manual_rules.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/285_add_resource_index_primary_key.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/285_add_resource_index_primary_key.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/285_add_resource_index_primary_key.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/285_add_resource_index_primary_key.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/286_add_indices_to_resource_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/286_add_indices_to_resource_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/286_add_indices_to_resource_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/286_add_indices_to_resource_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/287_index_projects.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/287_index_projects.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/287_index_projects.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/287_index_projects.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/300_add_global_to_dashboards.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/300_add_global_to_dashboards.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/300_add_global_to_dashboards.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/300_add_global_to_dashboards.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/301_add_resource_id_to_widgets.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/301_add_resource_id_to_widgets.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/301_add_resource_id_to_widgets.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/301_add_resource_id_to_widgets.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/302_create_global_dashboards_for_filter.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/302_create_global_dashboards_for_filter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/302_create_global_dashboards_for_filter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/302_create_global_dashboards_for_filter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/303_add_review_data.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/304_add_key_to_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/304_add_key_to_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/304_add_key_to_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/304_add_key_to_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/305_ignore_loaded_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/305_ignore_loaded_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/305_ignore_loaded_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/305_ignore_loaded_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/306_ignore_loaded_dashboards.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/306_ignore_loaded_dashboards.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/306_ignore_loaded_dashboards.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/306_ignore_loaded_dashboards.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/320_move_default_roles.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/320_move_default_roles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/320_move_default_roles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/320_move_default_roles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/321_add_index_on_resource_root_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/321_add_index_on_resource_root_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/321_add_index_on_resource_root_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/321_add_index_on_resource_root_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/330_add_created_at_on_projects.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/330_add_created_at_on_projects.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/330_add_created_at_on_projects.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/330_add_created_at_on_projects.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/331_remove_projects_profile_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/331_remove_projects_profile_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/331_remove_projects_profile_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/331_remove_projects_profile_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/332_remove_profiles_enabled_column.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/332_remove_profiles_enabled_column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/332_remove_profiles_enabled_column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/332_remove_profiles_enabled_column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/333_update_language_key_max_size.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/333_update_language_key_max_size.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/333_update_language_key_max_size.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/333_update_language_key_max_size.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/334_remove_profiles_default_column.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/334_remove_profiles_default_column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/334_remove_profiles_default_column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/334_remove_profiles_default_column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/335_remove_profiles_provided_column.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/335_remove_profiles_provided_column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/335_remove_profiles_provided_column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/335_remove_profiles_provided_column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/350_create_semaphores.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/350_create_semaphores.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/350_create_semaphores.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/350_create_semaphores.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/351_add_unique_index_to_authors.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/351_add_unique_index_to_authors.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/351_add_unique_index_to_authors.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/351_add_unique_index_to_authors.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/352_rename_java_coverage_property.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/352_rename_java_coverage_property.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/352_rename_java_coverage_property.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/352_rename_java_coverage_property.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/354_increase_snapshots_path_size.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/354_increase_snapshots_path_size.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/354_increase_snapshots_path_size.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/354_increase_snapshots_path_size.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/355_increase_snapshots_version_size.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/355_increase_snapshots_version_size.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/355_increase_snapshots_version_size.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/355_increase_snapshots_version_size.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/356_create_measure_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/356_create_measure_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/356_create_measure_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/356_create_measure_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/358_create_measure_filter_favourites.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/358_create_measure_filter_favourites.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/358_create_measure_filter_favourites.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/358_create_measure_filter_favourites.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/359_add_period_to_alerts.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/359_add_period_to_alerts.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/359_add_period_to_alerts.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/359_add_period_to_alerts.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/361_move_filter_widgets.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/361_move_filter_widgets.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/361_move_filter_widgets.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/361_move_filter_widgets.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/362_drop_filter_tables.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/362_drop_filter_tables.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/362_drop_filter_tables.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/362_drop_filter_tables.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/363_ignore_home_dashboard_on_upgrades.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/363_ignore_home_dashboard_on_upgrades.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/363_ignore_home_dashboard_on_upgrades.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/363_ignore_home_dashboard_on_upgrades.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/370_create_graphs.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/370_create_graphs.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/370_create_graphs.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/370_create_graphs.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/379_purge_violations.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/379_purge_violations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/379_purge_violations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/379_purge_violations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/380_add_status_language_and_dates_to_rules.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/380_add_status_language_and_dates_to_rules.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/380_add_status_language_and_dates_to_rules.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/380_add_status_language_and_dates_to_rules.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/381_update_rules_status.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/381_update_rules_status.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/381_update_rules_status.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/381_update_rules_status.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/382_remove_enabled_from_rules.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/382_remove_enabled_from_rules.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/382_remove_enabled_from_rules.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/382_remove_enabled_from_rules.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/383_update_metrics_user_managed_created_by_ws.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/383_update_metrics_user_managed_created_by_ws.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/383_update_metrics_user_managed_created_by_ws.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/383_update_metrics_user_managed_created_by_ws.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/388_add_profile_administrator_role.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/388_add_profile_administrator_role.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/388_add_profile_administrator_role.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/388_add_profile_administrator_role.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/391_add_id_to_duplications_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/391_add_id_to_duplications_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/391_add_id_to_duplications_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/391_add_id_to_duplications_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/392_update_active_rule_changes_user_name_to_nullable.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/392_update_active_rule_changes_user_name_to_nullable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/392_update_active_rule_changes_user_name_to_nullable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/392_update_active_rule_changes_user_name_to_nullable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/394_add_key_to_action_plan.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/394_add_key_to_action_plan.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/394_add_key_to_action_plan.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/394_add_key_to_action_plan.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/397_add_index_to_users_login.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/397_add_index_to_users_login.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/397_add_index_to_users_login.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/397_add_index_to_users_login.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/398_create_issues.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/398_create_issues.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/398_create_issues.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/398_create_issues.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/399_create_issue_changes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/399_create_issue_changes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/399_create_issue_changes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/399_create_issue_changes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/400_delete_review_duplications.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/400_delete_review_duplications.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/400_delete_review_duplications.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/400_delete_review_duplications.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/401_migrate_violations_to_issues.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/402_delete_review_widgets.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/402_delete_review_widgets.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/402_delete_review_widgets.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/402_delete_review_widgets.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/403_replace_review_notifications.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/403_replace_review_notifications.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/403_replace_review_notifications.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/403_replace_review_notifications.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/404_add_index_to_snapshots_root_project_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/404_add_index_to_snapshots_root_project_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/404_add_index_to_snapshots_root_project_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/404_add_index_to_snapshots_root_project_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/405_add_index_to_group_roles_role.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/405_add_index_to_group_roles_role.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/405_add_index_to_group_roles_role.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/405_add_index_to_group_roles_role.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/406_update_issues_action_plan_key.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/406_update_issues_action_plan_key.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/406_update_issues_action_plan_key.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/406_update_issues_action_plan_key.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/410_add_oracle_id_triggers.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/410_add_oracle_id_triggers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/410_add_oracle_id_triggers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/410_add_oracle_id_triggers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/411_create_issue_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/411_create_issue_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/411_create_issue_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/411_create_issue_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/412_create_issue_filter_favourites.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/412_create_issue_filter_favourites.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/412_create_issue_filter_favourites.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/412_create_issue_filter_favourites.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/413_add_dashboard_sharing_permission.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/413_add_dashboard_sharing_permission.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/413_add_dashboard_sharing_permission.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/413_add_dashboard_sharing_permission.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/414_add_scan_and_dry_run_permissions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/415_create_permission_templates.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/415_create_permission_templates.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/415_create_permission_templates.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/415_create_permission_templates.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/416_create_permission_templates_users.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/416_create_permission_templates_users.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/416_create_permission_templates_users.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/416_create_permission_templates_users.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/417_create_permission_templates_groups.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/417_create_permission_templates_groups.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/417_create_permission_templates_groups.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/417_create_permission_templates_groups.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/418_migrate_default_permissions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/419_add_index_to_rules_plugin_rule_key_and_plugin_name.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/419_add_index_to_rules_plugin_rule_key_and_plugin_name.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/419_add_index_to_rules_plugin_rule_key_and_plugin_name.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/419_add_index_to_rules_plugin_rule_key_and_plugin_name.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/430_remove_notifications_created_at.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/430_remove_notifications_created_at.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/430_remove_notifications_created_at.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/430_remove_notifications_created_at.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/431_migrate_users_names.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/431_migrate_users_names.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/431_migrate_users_names.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/431_migrate_users_names.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/432_fix_oracle_trigger_names.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/432_fix_oracle_trigger_names.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/432_fix_oracle_trigger_names.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/432_fix_oracle_trigger_names.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/433_add_index_to_characteristics_enabled.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/433_add_index_to_characteristics_enabled.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/433_add_index_to_characteristics_enabled.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/433_add_index_to_characteristics_enabled.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/434_move_issues_id_to_bigint.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/434_move_issues_id_to_bigint.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/434_move_issues_id_to_bigint.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/434_move_issues_id_to_bigint.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/440_replace_key_regexp_by_key_search_in_measure_filters_data.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/440_replace_key_regexp_by_key_search_in_measure_filters_data.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/440_replace_key_regexp_by_key_search_in_measure_filters_data.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/440_replace_key_regexp_by_key_search_in_measure_filters_data.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/441_add_provisioning_permission.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/441_add_provisioning_permission.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/441_add_provisioning_permission.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/441_add_provisioning_permission.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/442_add_technical_debt_to_issue.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/442_add_technical_debt_to_issue.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/442_add_technical_debt_to_issue.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/442_add_technical_debt_to_issue.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/443_rename_widget_sqale_pyramid_to_technical_debt_pyramid.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/443_rename_widget_sqale_pyramid_to_technical_debt_pyramid.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/443_rename_widget_sqale_pyramid_to_technical_debt_pyramid.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/443_rename_widget_sqale_pyramid_to_technical_debt_pyramid.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/444_resize_timeline_widgets.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/444_resize_timeline_widgets.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/444_resize_timeline_widgets.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/444_resize_timeline_widgets.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/460_add_unique_constraint_to_groups_users.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/460_add_unique_constraint_to_groups_users.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/460_add_unique_constraint_to_groups_users.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/460_add_unique_constraint_to_groups_users.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/461_add_characteristics_columns.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/461_add_characteristics_columns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/461_add_characteristics_columns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/461_add_characteristics_columns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/462_migrate_characteristics.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/462_migrate_characteristics.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/462_migrate_characteristics.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/462_migrate_characteristics.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/463_add_administer_issues_perm.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/463_add_administer_issues_perm.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/463_add_administer_issues_perm.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/463_add_administer_issues_perm.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/464_remove_useless_characteristics_data.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/464_remove_useless_characteristics_data.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/464_remove_useless_characteristics_data.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/464_remove_useless_characteristics_data.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/465_add_perm_template_key_pattern_column.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/465_add_perm_template_key_pattern_column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/465_add_perm_template_key_pattern_column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/465_add_perm_template_key_pattern_column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/466_add_network_use_sub_characteristic.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/466_add_network_use_sub_characteristic.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/466_add_network_use_sub_characteristic.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/466_add_network_use_sub_characteristic.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/467_add_issue_change_creation_date.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/467_add_issue_change_creation_date.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/467_add_issue_change_creation_date.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/467_add_issue_change_creation_date.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/480_add_rule_note_columns.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/480_add_rule_note_columns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/480_add_rule_note_columns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/480_add_rule_note_columns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/481_copy_rule_notes_to_rules.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/481_copy_rule_notes_to_rules.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/481_copy_rule_notes_to_rules.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/481_copy_rule_notes_to_rules.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/482_purge_group_roles.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/482_purge_group_roles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/482_purge_group_roles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/482_purge_group_roles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/483_add_rules_parameter_key_to_active_rule_parameters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/483_add_rules_parameter_key_to_active_rule_parameters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/483_add_rules_parameter_key_to_active_rule_parameters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/483_add_rules_parameter_key_to_active_rule_parameters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/484_copy_rule_parameters_name_to_active_rule_parameters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/484_copy_rule_parameters_name_to_active_rule_parameters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/484_copy_rule_parameters_name_to_active_rule_parameters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/484_copy_rule_parameters_name_to_active_rule_parameters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/485_update_rules_without_severity.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/485_update_rules_without_severity.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/485_update_rules_without_severity.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/485_update_rules_without_severity.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/486_add_resource_path_column.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/486_add_resource_path_column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/486_add_resource_path_column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/486_add_resource_path_column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/488_add_project_deprecated_key_column.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/488_add_project_deprecated_key_column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/488_add_project_deprecated_key_column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/488_add_project_deprecated_key_column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/489_add_rule_tags.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/489_add_rule_tags.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/489_add_rule_tags.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/489_add_rule_tags.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/490_migrate_package_keys.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/492_remove_rule_notes_and_active_rule_notes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/492_remove_rule_notes_and_active_rule_notes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/492_remove_rule_notes_and_active_rule_notes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/492_remove_rule_notes_and_active_rule_notes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/493_delete_display_treemap_from_measure_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/493_delete_display_treemap_from_measure_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/493_delete_display_treemap_from_measure_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/493_delete_display_treemap_from_measure_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/494_delete_properties_on_unknown_components.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/494_delete_properties_on_unknown_components.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/494_delete_properties_on_unknown_components.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/494_delete_properties_on_unknown_components.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/495_migrate_base_id_to_base_from_measure_filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/495_migrate_base_id_to_base_from_measure_filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/495_migrate_base_id_to_base_from_measure_filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/495_migrate_base_id_to_base_from_measure_filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/496_delete_language_property.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/496_delete_language_property.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/496_delete_language_property.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/496_delete_language_property.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/497_update_issue_message_by_rule_name_when_no_message.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/498_remove_duplicate_active_rules.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/498_remove_duplicate_active_rules.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/498_remove_duplicate_active_rules.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/498_remove_duplicate_active_rules.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/510_create_quality_gates.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/510_create_quality_gates.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/510_create_quality_gates.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/510_create_quality_gates.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/511_create_quality_gate_conditions.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/511_create_quality_gate_conditions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/511_create_quality_gate_conditions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/511_create_quality_gate_conditions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/512_convert_alerts_to_quality_gates.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/512_convert_alerts_to_quality_gates.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/512_convert_alerts_to_quality_gates.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/512_convert_alerts_to_quality_gates.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/513_convert_issue_debt_to_minutes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/514_update_issue_changelog_debt_to_minutes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/515_update_measures_debt_to_minutes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/516_update_development_cost_to_minutes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/520_add_debt_columns_to_rules.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/520_add_debt_columns_to_rules.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/520_add_debt_columns_to_rules.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/520_add_debt_columns_to_rules.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/521_update_requirement_measures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/522_drop_alerts.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/522_drop_alerts.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/522_drop_alerts.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/522_drop_alerts.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_add_characteristic_reusability_and_sub_characteristic_resource.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_add_characteristic_reusability_and_sub_characteristic_resource.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/523_add_characteristic_reusability_and_sub_characteristic_resource.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_add_characteristic_reusability_and_sub_characteristic_resource.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/524_update_sub_characteristic_network_use_key.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/524_update_sub_characteristic_network_use_key.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/524_update_sub_characteristic_network_use_key.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/524_update_sub_characteristic_network_use_key.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/525_update_not_resolved_issues_on_removed_components.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/530_merge_measure_data_into_project_measures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/531_update_issues_action_plan_key_on_removed_action_plan.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/532_increase_size_of_user_login.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/532_increase_size_of_user_login.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/532_increase_size_of_user_login.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/532_increase_size_of_user_login.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/533_add_rule_tags_columns.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/533_add_rule_tags_columns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/533_add_rule_tags_columns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/533_add_rule_tags_columns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/534_update_measure_filters_on_language.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/534_update_measure_filters_on_language.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/534_update_measure_filters_on_language.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/534_update_measure_filters_on_language.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/535_increase_size_of_measure_text_value.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/535_increase_size_of_measure_text_value.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/535_increase_size_of_measure_text_value.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/535_increase_size_of_measure_text_value.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/536_remove_active_rule_notes.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/536_remove_active_rule_notes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/536_remove_active_rule_notes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/536_remove_active_rule_notes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/537_drop_rule_tags_tables.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/537_drop_rule_tags_tables.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/537_drop_rule_tags_tables.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/537_drop_rule_tags_tables.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/546_inverse_rule_key_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/547_merge_custom_rules_extended_description_with_description.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/547_merge_custom_rules_extended_description_with_description.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/547_merge_custom_rules_extended_description_with_description.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/547_merge_custom_rules_extended_description_with_description.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/548_add_qprofile_keys_columns.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/548_add_qprofile_keys_columns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/548_add_qprofile_keys_columns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/548_add_qprofile_keys_columns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/549_feed_qprofile_keys.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/549_feed_qprofile_keys.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/549_feed_qprofile_keys.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/549_feed_qprofile_keys.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/550_convert_profile_measures.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/550_convert_profile_measures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/550_convert_profile_measures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/550_convert_profile_measures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/551_update_logs_to_activities.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/551_update_logs_to_activities.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/551_update_logs_to_activities.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/551_update_logs_to_activities.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/552_add_qprofile_dates.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/552_add_qprofile_dates.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/552_add_qprofile_dates.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/552_add_qprofile_dates.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/553_feed_qprofile_dates.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/553_feed_qprofile_dates.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/553_feed_qprofile_dates.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/553_feed_qprofile_dates.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/554_add_missing_user_unique_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/555_add_event_data_column.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/555_add_event_data_column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/555_add_event_data_column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/555_add_event_data_column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/556_fill_rules_empty_name_and_desc.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/556_fill_rules_empty_name_and_desc.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/556_fill_rules_empty_name_and_desc.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/556_fill_rules_empty_name_and_desc.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/580_drop_active_rule_changes_tables.rb b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/580_drop_active_rule_changes_tables.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/580_drop_active_rule_changes_tables.rb rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/580_drop_active_rule_changes_tables.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/README.txt b/server/sonar-server/src/main/webapp/WEB-INF/db/migrate/README.txt similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/db/migrate/README.txt rename to server/sonar-server/src/main/webapp/WEB-INF/db/migrate/README.txt diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/CHANGELOG b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/CHANGELOG similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/CHANGELOG rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/CHANGELOG diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/MIT-LICENSE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/MIT-LICENSE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/MIT-LICENSE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/MIT-LICENSE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/README b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/README rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/README diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/install.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/install.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/install.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/install.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/dom_assertions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/dom_assertions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/dom_assertions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/dom_assertions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/model_assertions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/model_assertions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/model_assertions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/model_assertions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/response_assertions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/response_assertions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/response_assertions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/response_assertions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/routing_assertions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/routing_assertions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/routing_assertions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/routing_assertions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/selector_assertions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/selector_assertions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/selector_assertions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/selector_assertions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/tag_assertions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/tag_assertions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/tag_assertions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/assertions/tag_assertions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/base.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/benchmarking.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/benchmarking.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/benchmarking.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/benchmarking.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/actions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/actions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/actions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/actions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/fragments.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/fragments.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/fragments.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/fragments.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/pages.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/pages.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/pages.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/pages.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeping.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeping.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeping.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/caching/sweeping.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/cookie.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/cookie.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/cookie.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/cookie.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/query_extension.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/query_extension.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/query_extension.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/query_extension.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/stdinput.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/stdinput.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/stdinput.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_ext/stdinput.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_process.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_process.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_process.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cgi_process.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cookies.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cookies.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cookies.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/cookies.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/dispatcher.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/dispatcher.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/dispatcher.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/dispatcher.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/failsafe.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/failsafe.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/failsafe.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/failsafe.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/flash.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/flash.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/flash.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/flash.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/headers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/headers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/headers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/headers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/helpers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/helpers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/helpers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/helpers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/http_authentication.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/http_authentication.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/http_authentication.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/http_authentication.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/integration.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/integration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/integration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/integration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/layout.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/layout.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/layout.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/layout.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middleware_stack.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middleware_stack.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middleware_stack.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middleware_stack.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middlewares.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middlewares.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middlewares.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/middlewares.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_responds.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_responds.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_responds.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_responds.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_type.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_type.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_type.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_type.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_types.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_types.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_types.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/mime_types.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/params_parser.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/params_parser.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/params_parser.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/params_parser.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/performance_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/performance_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/performance_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/performance_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/polymorphic_routes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/polymorphic_routes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/polymorphic_routes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/polymorphic_routes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rack_lint_patch.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rack_lint_patch.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rack_lint_patch.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rack_lint_patch.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/record_identifier.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/record_identifier.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/record_identifier.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/record_identifier.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/reloader.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request_forgery_protection.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request_forgery_protection.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request_forgery_protection.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/request_forgery_protection.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rescue.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rescue.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rescue.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/rescue.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/resources.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/resources.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/resources.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/resources.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/response.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/response.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/response.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/response.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/builder.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/builder.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/builder.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/builder.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/optimisations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/optimisations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/optimisations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/optimisations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/recognition_optimisation.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/recognition_optimisation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/recognition_optimisation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/recognition_optimisation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route_set.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route_set.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route_set.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/route_set.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/routing_ext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/routing_ext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/routing_ext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/routing_ext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/segments.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/segments.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/segments.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/routing/segments.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/abstract_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/abstract_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/abstract_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/abstract_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/cookie_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/cookie_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/cookie_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/cookie_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/mem_cache_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/mem_cache_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/mem_cache_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session/mem_cache_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session_management.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session_management.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session_management.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/session_management.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/status_codes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/status_codes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/status_codes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/status_codes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/streaming.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/streaming.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/streaming.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/streaming.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/string_coercion.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/string_coercion.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/string_coercion.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/string_coercion.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_request_and_response.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_request_and_response.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_request_and_response.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_request_and_response.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_trace.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_trace.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_trace.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/_trace.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/diagnostics.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/diagnostics.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/diagnostics.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/diagnostics.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/layout.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/layout.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/layout.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/layout.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/missing_template.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/missing_template.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/missing_template.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/missing_template.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/routing_error.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/routing_error.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/routing_error.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/routing_error.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/template_error.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/template_error.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/template_error.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/template_error.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/unknown_action.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/unknown_action.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/unknown_action.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/templates/rescues/unknown_action.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_case.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_case.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_case.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_case.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_process.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_process.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_process.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/test_process.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/translation.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/translation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/translation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/translation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/uploaded_file.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/uploaded_file.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/uploaded_file.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/uploaded_file.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/url_rewriter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/url_rewriter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/url_rewriter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/url_rewriter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/document.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/document.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/document.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/document.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/node.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/node.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/node.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/node.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/sanitizer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/sanitizer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/sanitizer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/sanitizer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/selector.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/selector.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/selector.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/selector.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/tokenizer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/tokenizer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/tokenizer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/tokenizer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/vendor/html-scanner/html/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/verification.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/verification.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/verification.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_controller/verification.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_pack/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/base.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/active_record_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/active_record_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/active_record_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/active_record_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/asset_tag_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/asset_tag_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/asset_tag_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/asset_tag_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/atom_feed_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/atom_feed_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/atom_feed_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/atom_feed_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/benchmark_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/benchmark_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/benchmark_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/benchmark_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/cache_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/cache_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/cache_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/cache_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/capture_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/capture_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/capture_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/capture_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/csrf_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/csrf_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/csrf_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/csrf_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/date_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/date_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/date_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/date_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/debug_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/debug_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/debug_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/debug_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_options_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_options_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_options_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_options_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_tag_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_tag_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_tag_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/form_tag_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/javascript_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/javascript_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/javascript_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/javascript_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/number_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/number_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/number_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/number_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/prototype_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/prototype_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/prototype_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/prototype_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/raw_output_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/raw_output_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/raw_output_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/raw_output_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_identification_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_identification_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_identification_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_identification_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_tag_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_tag_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_tag_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/record_tag_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/sanitize_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/sanitize_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/sanitize_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/sanitize_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/scriptaculous_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/scriptaculous_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/scriptaculous_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/scriptaculous_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/tag_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/tag_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/tag_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/tag_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/text_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/text_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/text_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/text_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/translation_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/translation_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/translation_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/translation_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/url_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/url_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/url_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/helpers/url_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/inline_template.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/inline_template.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/inline_template.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/inline_template.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/locale/en.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/locale/en.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/locale/en.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/locale/en.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/partials.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/partials.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/partials.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/partials.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/paths.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/paths.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/paths.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/paths.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/reloadable_template.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/reloadable_template.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/reloadable_template.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/reloadable_template.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable_partial.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable_partial.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable_partial.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/renderable_partial.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_error.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_error.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_error.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_error.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/builder.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/builder.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/builder.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/builder.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/erb.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/erb.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/erb.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/erb.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/rjs.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/rjs.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/rjs.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/template_handlers/rjs.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/test_case.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/test_case.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/test_case.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/action_view/test_case.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/actionpack.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/actionpack.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/actionpack.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/actionpack-2.3.15/lib/actionpack.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/CHANGELOG b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/CHANGELOG similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/CHANGELOG rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/CHANGELOG diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/README b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/README rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/README diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/install.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/install.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/install.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/install.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/aggregations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/aggregations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/aggregations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/aggregations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/association_preload.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/association_preload.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/association_preload.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/association_preload.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_collection.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_collection.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_collection.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_collection.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_proxy.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_proxy.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_proxy.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/association_proxy.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_polymorphic_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_polymorphic_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_polymorphic_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/belongs_to_polymorphic_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_and_belongs_to_many_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_and_belongs_to_many_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_and_belongs_to_many_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_and_belongs_to_many_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_through_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_through_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_through_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_many_through_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_through_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_through_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_through_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/associations/has_one_through_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/attribute_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/attribute_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/attribute_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/attribute_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/autosave_association.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/autosave_association.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/autosave_association.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/autosave_association.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/base.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/batches.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/batches.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/batches.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/batches.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/calculations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/calculations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/calculations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/calculations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/callbacks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/callbacks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/callbacks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/callbacks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_pool.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_pool.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_pool.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_pool.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_specification.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_specification.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_specification.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/connection_specification.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_limits.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_limits.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_limits.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_limits.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_statements.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_statements.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_statements.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/database_statements.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/query_cache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/query_cache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/query_cache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/query_cache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/quoting.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/quoting.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/quoting.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/quoting.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_definitions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_definitions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_definitions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_statements.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_statements.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_statements.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract/schema_statements.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/abstract_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/postgresql_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/postgresql_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/postgresql_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/postgresql_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite3_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite3_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite3_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite3_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/sqlite_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dirty.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dirty.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dirty.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dirty.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_finder_match.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_finder_match.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_finder_match.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_finder_match.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_scope_match.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_scope_match.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_scope_match.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/dynamic_scope_match.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/fixtures.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/fixtures.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/fixtures.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/fixtures.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locale/en.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locale/en.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locale/en.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locale/en.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/optimistic.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/optimistic.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/optimistic.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/optimistic.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/pessimistic.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/pessimistic.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/pessimistic.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/locking/pessimistic.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/migration.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/migration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/migration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/migration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/named_scope.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/named_scope.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/named_scope.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/named_scope.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/nested_attributes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/nested_attributes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/nested_attributes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/nested_attributes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/observer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/observer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/observer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/observer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/query_cache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/query_cache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/query_cache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/query_cache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/reflection.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/reflection.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/reflection.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/reflection.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema_dumper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema_dumper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema_dumper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/schema_dumper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serialization.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serialization.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serialization.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serialization.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/json_serializer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/json_serializer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/json_serializer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/json_serializer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/xml_serializer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/xml_serializer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/xml_serializer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/serializers/xml_serializer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/session_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/session_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/session_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/session_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/test_case.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/test_case.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/test_case.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/test_case.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/timestamp.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/timestamp.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/timestamp.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/timestamp.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/transactions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/transactions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/transactions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/transactions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/validations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/validations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/validations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/validations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/activerecord.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/activerecord.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/activerecord.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/activerecord.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.gemtest b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.gemtest similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.gemtest rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.gemtest diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.specification b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.specification similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.specification rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/.specification diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/History.txt b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/History.txt similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/History.txt rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/History.txt diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/LICENSE.txt b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/LICENSE.txt similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/LICENSE.txt rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/LICENSE.txt diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Manifest.txt b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Manifest.txt similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Manifest.txt rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Manifest.txt diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/README.txt b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/README.txt similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/README.txt rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/README.txt diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/derby_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/derby_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/derby_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/derby_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/h2_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/h2_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/h2_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/h2_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/hsqldb_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/hsqldb_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/hsqldb_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/hsqldb_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/informix_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/informix_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/informix_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/informix_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jdbc_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jdbc_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jdbc_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jdbc_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jndi_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jndi_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jndi_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/jndi_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mssql_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mssql_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mssql_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mssql_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql2_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql2_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql2_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql2_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/mysql_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/oracle_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/oracle_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/oracle_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/oracle_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/postgresql_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/postgresql_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/postgresql_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/postgresql_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/sqlite3_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/sqlite3_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/sqlite3_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/active_record/connection_adapters/sqlite3_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/activerecord-jdbc-adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/activerecord-jdbc-adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/activerecord-jdbc-adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/activerecord-jdbc-adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/db2_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/db2_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/db2_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/db2_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/derby_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/derby_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/derby_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/derby_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/h2_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/h2_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/h2_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/h2_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/hsqldb_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/hsqldb_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/hsqldb_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/hsqldb_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/jdbc_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/jdbc_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/jdbc_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/jdbc_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/mssql_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/mssql_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/mssql_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/engines/sql/compilers/mssql_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/compat.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/compat.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/compat.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/compat.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/db2.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/db2.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/db2.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/db2.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/derby.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/derby.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/derby.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/derby.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/firebird.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/firebird.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/firebird.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/firebird.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/hsqldb.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/hsqldb.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/hsqldb.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/hsqldb.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/sql_server.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/sql_server.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/sql_server.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arel/visitors/sql_server.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/db2/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/derby/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/discover.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/discover.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/discover.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/discover.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/firebird/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/h2/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/hsqldb/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/informix/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter_java.jar b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter_java.jar similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter_java.jar rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter_java.jar diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/column.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/column.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/column.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/column.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/compatibility.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/compatibility.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/compatibility.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/compatibility.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/core_ext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/core_ext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/core_ext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/core_ext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/discover.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/discover.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/discover.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/discover.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/driver.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/driver.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/driver.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/driver.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/extension.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/extension.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/extension.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/extension.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/java.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/java.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/java.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/java.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/jdbc.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/jdbc.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/jdbc.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/jdbc.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/missing_functionality_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/missing_functionality_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/missing_functionality_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/missing_functionality_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/quoted_primary_key.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/quoted_primary_key.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/quoted_primary_key.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/quoted_primary_key.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/railtie.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/railtie.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/railtie.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/railtie.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/rake_tasks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/rake_tasks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/rake_tasks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/rake_tasks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/require_driver.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/require_driver.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/require_driver.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/require_driver.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mimer/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/limit_helpers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/limit_helpers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/limit_helpers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/limit_helpers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/tsql_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/tsql_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/tsql_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/tsql_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/connection_methods.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/connection_methods.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/connection_methods.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sqlite3/connection_methods.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase/adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase/adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase/adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/sybase/adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/generators/jdbc/jdbc_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/generators/jdbc/jdbc_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/generators/jdbc/jdbc_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/generators/jdbc/jdbc_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/rake_tasks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/rake_tasks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/rake_tasks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/rake_tasks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/jdbc_adapter/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/pg.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/pg.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/pg.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/pg.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/CHANGELOG b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/CHANGELOG similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/CHANGELOG rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/CHANGELOG diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/README b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/README rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/README diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/all.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/all.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/all.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/all.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/backtrace_cleaner.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/backtrace_cleaner.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/backtrace_cleaner.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/backtrace_cleaner.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/base64.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/base64.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/base64.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/base64.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/basic_object.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/basic_object.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/basic_object.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/basic_object.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/buffered_logger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/buffered_logger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/buffered_logger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/buffered_logger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/compressed_mem_cache_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/compressed_mem_cache_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/compressed_mem_cache_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/compressed_mem_cache_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/drb_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/drb_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/drb_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/drb_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/file_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/file_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/file_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/file_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/mem_cache_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/mem_cache_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/mem_cache_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/mem_cache_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/memory_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/memory_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/memory_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/memory_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/strategy/local_cache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/strategy/local_cache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/strategy/local_cache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/strategy/local_cache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/synchronized_memory_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/synchronized_memory_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/synchronized_memory_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/cache/synchronized_memory_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/callbacks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/callbacks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/callbacks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/callbacks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/access.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/access.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/access.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/access.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/extract_options.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/extract_options.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/extract_options.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/extract_options.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/grouping.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/grouping.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/grouping.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/grouping.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/random_access.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/random_access.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/random_access.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/random_access.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/wrapper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/wrapper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/wrapper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/array/wrapper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64/encoding.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64/encoding.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64/encoding.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/base64/encoding.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/benchmark.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/benchmark.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/benchmark.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/benchmark.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/bigdecimal/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/blank.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/blank.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/blank.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/blank.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute_accessors.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute_accessors.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute_accessors.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/attribute_accessors.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/delegating_attributes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/delegating_attributes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/delegating_attributes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/delegating_attributes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/inheritable_attributes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/inheritable_attributes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/inheritable_attributes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/inheritable_attributes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/removal.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/removal.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/removal.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/class/removal.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/behavior.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/behavior.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/behavior.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/behavior.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/calculations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/calculations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/calculations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/calculations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/calculations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/calculations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/calculations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/calculations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/date_time/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/duplicable.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/duplicable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/duplicable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/duplicable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/enumerable.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/enumerable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/enumerable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/enumerable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/exception.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/exception.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/exception.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/exception.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file/atomic.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file/atomic.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file/atomic.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/file/atomic.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/rounding.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/rounding.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/rounding.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/rounding.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/time.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/time.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/time.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/float/time.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/deep_merge.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/deep_merge.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/deep_merge.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/deep_merge.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/diff.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/diff.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/diff.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/diff.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/except.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/except.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/except.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/except.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/indifferent_access.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/indifferent_access.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/indifferent_access.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/indifferent_access.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/keys.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/keys.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/keys.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/keys.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/reverse_merge.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/reverse_merge.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/reverse_merge.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/reverse_merge.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/slice.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/slice.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/slice.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/hash/slice.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/even_odd.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/even_odd.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/even_odd.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/even_odd.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/inflections.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/inflections.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/inflections.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/inflections.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/time.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/time.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/time.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/integer/time.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/agnostics.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/agnostics.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/agnostics.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/agnostics.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/daemonizing.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/daemonizing.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/daemonizing.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/daemonizing.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/debugger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/debugger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/debugger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/debugger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/reporting.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/reporting.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/reporting.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/reporting.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/requires.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/requires.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/requires.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/requires.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/singleton_class.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/singleton_class.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/singleton_class.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/kernel/singleton_class.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/load_error.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/load_error.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/load_error.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/load_error.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/logger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/logger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/logger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/logger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/aliasing.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/aliasing.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/aliasing.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/aliasing.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_accessor_with_default.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_accessor_with_default.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_accessor_with_default.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_accessor_with_default.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_internal.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_internal.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_internal.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attr_internal.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attribute_accessors.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attribute_accessors.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attribute_accessors.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/attribute_accessors.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/delegation.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/delegation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/delegation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/delegation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/inclusion.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/inclusion.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/inclusion.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/inclusion.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/introspection.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/introspection.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/introspection.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/introspection.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/loading.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/loading.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/loading.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/loading.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/model_naming.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/model_naming.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/model_naming.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/model_naming.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/remove_method.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/remove_method.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/remove_method.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/remove_method.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/synchronization.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/synchronization.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/synchronization.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/module/synchronization.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/name_error.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/name_error.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/name_error.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/name_error.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/bytes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/bytes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/bytes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/bytes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/time.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/time.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/time.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/numeric/time.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/blank.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/blank.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/blank.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/blank.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/extending.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/extending.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/extending.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/extending.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/instance_variables.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/instance_variables.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/instance_variables.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/instance_variables.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/metaclass.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/metaclass.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/metaclass.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/metaclass.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/misc.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/misc.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/misc.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/misc.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/singleton_class.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/singleton_class.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/singleton_class.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/object/singleton_class.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname/clean_within.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname/clean_within.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname/clean_within.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/pathname/clean_within.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/proc.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/proc.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/proc.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/proc.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process/daemon.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process/daemon.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process/daemon.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/process/daemon.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/blockless_step.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/blockless_step.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/blockless_step.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/blockless_step.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/include_range.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/include_range.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/include_range.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/include_range.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/overlaps.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/overlaps.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/overlaps.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/range/overlaps.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/rexml.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/rexml.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/rexml.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/rexml.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/access.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/access.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/access.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/access.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/behavior.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/behavior.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/behavior.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/behavior.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/bytesize.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/bytesize.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/bytesize.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/bytesize.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/filters.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/filters.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/filters.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/filters.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/inflections.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/inflections.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/inflections.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/inflections.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/iterators.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/iterators.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/iterators.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/iterators.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/multibyte.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/multibyte.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/multibyte.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/multibyte.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/output_safety.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/output_safety.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/output_safety.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/output_safety.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/starts_ends_with.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/starts_ends_with.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/starts_ends_with.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/starts_ends_with.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/xchar.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/xchar.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/xchar.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/string/xchar.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/symbol.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/symbol.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/symbol.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/symbol.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/behavior.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/behavior.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/behavior.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/behavior.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/calculations.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/calculations.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/calculations.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/calculations.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/conversions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/conversions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/conversions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/conversions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/zones.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/zones.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/zones.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/time/zones.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/try.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/try.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/try.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/try.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/uri.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/uri.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/uri.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/core_ext/uri.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/dependencies.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/dependencies.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/dependencies.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/dependencies.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/deprecation.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/deprecation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/deprecation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/deprecation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/duration.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/duration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/duration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/duration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/gzip.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/gzip.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/gzip.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/gzip.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflections.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflections.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflections.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflections.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflector.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflector.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflector.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/inflector.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/jsongem.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/jsongem.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/jsongem.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/jsongem.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yajl.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yajl.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yajl.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yajl.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yaml.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yaml.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yaml.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/backends/yaml.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/decoding.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/decoding.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/decoding.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/decoding.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date_time.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date_time.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date_time.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/date_time.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/enumerable.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/enumerable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/enumerable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/enumerable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/false_class.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/false_class.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/false_class.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/false_class.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/hash.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/hash.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/hash.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/hash.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/nil_class.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/nil_class.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/nil_class.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/nil_class.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/numeric.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/numeric.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/numeric.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/numeric.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/object.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/object.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/object.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/object.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/regexp.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/regexp.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/regexp.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/regexp.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/string.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/string.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/string.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/string.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/symbol.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/symbol.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/symbol.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/symbol.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/time.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/time.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/time.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/time.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/true_class.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/true_class.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/true_class.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoders/true_class.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoding.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoding.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoding.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/encoding.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/variable.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/variable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/variable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/json/variable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/locale/en.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/locale/en.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/locale/en.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/locale/en.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/memoizable.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/memoizable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/memoizable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/memoizable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_encryptor.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_encryptor.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_encryptor.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_encryptor.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_verifier.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_verifier.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_verifier.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/message_verifier.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/chars.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/chars.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/chars.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/chars.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/exceptions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/exceptions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/exceptions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/exceptions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/unicode_database.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/unicode_database.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/unicode_database.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/unicode_database.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/utils.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/utils.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/utils.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/multibyte/utils.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/option_merger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/option_merger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/option_merger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/option_merger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_hash.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_hash.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_hash.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_hash.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_options.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_options.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_options.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/ordered_options.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/rescuable.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/rescuable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/rescuable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/rescuable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/secure_random.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/secure_random.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/secure_random.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/secure_random.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/string_inquirer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/string_inquirer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/string_inquirer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/string_inquirer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/test_case.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/test_case.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/test_case.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/test_case.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/assertions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/assertions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/assertions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/assertions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/declarative.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/declarative.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/declarative.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/declarative.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/default.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/default.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/default.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/default.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/deprecation.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/deprecation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/deprecation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/deprecation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/performance.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/performance.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/performance.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/performance.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/setup_and_teardown.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/setup_and_teardown.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/setup_and_teardown.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/testing/setup_and_teardown.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/time_with_zone.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/time_with_zone.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/time_with_zone.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/time_with_zone.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/time_zone.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/time_zone.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/time_zone.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/time_zone.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/unicode_tables.dat b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/unicode_tables.dat similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/unicode_tables.dat rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/values/unicode_tables.dat diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/blankslate.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/blankslate.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/blankslate.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/blankslate.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/css.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/css.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/css.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/css.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/missing.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/missing.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/missing.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/missing.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/store_procs.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/store_procs.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/store_procs.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/store_procs.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/translation.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/translation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/translation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/translation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/base.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cascade.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cascade.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cascade.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cascade.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/chain.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/chain.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/chain.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/chain.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cldr.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cldr.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cldr.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/cldr.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/fallbacks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/fallbacks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/fallbacks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/fallbacks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/gettext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/gettext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/gettext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/gettext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/interpolation_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/interpolation_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/interpolation_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/interpolation_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/metadata.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/metadata.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/metadata.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/metadata.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/pluralization.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/pluralization.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/pluralization.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/pluralization.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/config.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/config.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/config.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/config.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/string/interpolate.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/string/interpolate.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/string/interpolate.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/string/interpolate.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/exceptions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/exceptions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/exceptions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/exceptions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/helpers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/helpers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/helpers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/helpers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/po_parser.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/po_parser.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/po_parser.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/gettext/po_parser.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/fallbacks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/fallbacks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/fallbacks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/fallbacks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/parents.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/parents.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/parents.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/parents.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/rfc4646.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/rfc4646.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/rfc4646.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/rfc4646.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/simple.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/simple.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/simple.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/simple.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/memcache-client-1.7.4/memcache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/memcache-client-1.7.4/memcache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/memcache-client-1.7.4/memcache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/memcache-client-1.7.4/memcache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone_info.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone_info.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone_info.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone_info.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Algiers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Algiers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Algiers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Algiers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Cairo.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Cairo.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Cairo.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Cairo.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Casablanca.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Casablanca.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Casablanca.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Casablanca.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Harare.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Harare.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Harare.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Harare.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Johannesburg.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Johannesburg.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Johannesburg.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Johannesburg.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Monrovia.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Monrovia.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Monrovia.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Monrovia.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Nairobi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Nairobi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Nairobi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Nairobi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/Buenos_Aires.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/Buenos_Aires.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/Buenos_Aires.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/Buenos_Aires.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/San_Juan.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/San_Juan.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/San_Juan.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/San_Juan.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Bogota.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Bogota.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Bogota.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Bogota.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Caracas.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Caracas.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Caracas.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Caracas.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chicago.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chicago.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chicago.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chicago.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chihuahua.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chihuahua.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chihuahua.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Chihuahua.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Denver.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Denver.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Denver.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Denver.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Godthab.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Godthab.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Godthab.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Godthab.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Guatemala.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Guatemala.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Guatemala.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Guatemala.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Halifax.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Halifax.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Halifax.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Halifax.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Indiana/Indianapolis.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Indiana/Indianapolis.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Indiana/Indianapolis.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Indiana/Indianapolis.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Juneau.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Juneau.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Juneau.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Juneau.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/La_Paz.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/La_Paz.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/La_Paz.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/La_Paz.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Lima.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Lima.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Lima.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Lima.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Los_Angeles.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Los_Angeles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Los_Angeles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Los_Angeles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mazatlan.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mazatlan.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mazatlan.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mazatlan.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mexico_City.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mexico_City.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mexico_City.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Mexico_City.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Monterrey.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Monterrey.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Monterrey.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Monterrey.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/New_York.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/New_York.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/New_York.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/New_York.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Phoenix.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Phoenix.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Phoenix.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Phoenix.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Regina.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Regina.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Regina.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Regina.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Santiago.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Santiago.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Santiago.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Santiago.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Sao_Paulo.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Sao_Paulo.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Sao_Paulo.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Sao_Paulo.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/St_Johns.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/St_Johns.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/St_Johns.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/St_Johns.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Tijuana.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Tijuana.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Tijuana.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Tijuana.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Almaty.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Almaty.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Almaty.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Almaty.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baghdad.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baghdad.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baghdad.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baghdad.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baku.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baku.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baku.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baku.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Bangkok.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Bangkok.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Bangkok.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Bangkok.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Chongqing.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Chongqing.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Chongqing.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Chongqing.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Colombo.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Colombo.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Colombo.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Colombo.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Dhaka.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Dhaka.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Dhaka.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Dhaka.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Hong_Kong.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Hong_Kong.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Hong_Kong.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Hong_Kong.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Irkutsk.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Irkutsk.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Irkutsk.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Irkutsk.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jakarta.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jakarta.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jakarta.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jakarta.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jerusalem.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jerusalem.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jerusalem.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Jerusalem.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kabul.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kabul.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kabul.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kabul.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kamchatka.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kamchatka.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kamchatka.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kamchatka.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Karachi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Karachi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Karachi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Karachi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Katmandu.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Katmandu.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Katmandu.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Katmandu.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kolkata.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kolkata.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kolkata.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kolkata.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Krasnoyarsk.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Krasnoyarsk.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Krasnoyarsk.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Krasnoyarsk.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuala_Lumpur.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuala_Lumpur.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuala_Lumpur.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuala_Lumpur.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuwait.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuwait.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuwait.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Kuwait.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Magadan.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Magadan.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Magadan.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Magadan.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Muscat.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Muscat.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Muscat.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Muscat.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Novosibirsk.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Novosibirsk.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Novosibirsk.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Novosibirsk.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Rangoon.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Rangoon.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Rangoon.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Rangoon.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Riyadh.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Riyadh.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Riyadh.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Riyadh.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Seoul.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Seoul.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Seoul.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Seoul.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Shanghai.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Shanghai.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Shanghai.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Shanghai.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Singapore.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Singapore.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Singapore.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Singapore.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Taipei.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Taipei.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Taipei.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Taipei.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tashkent.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tashkent.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tashkent.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tashkent.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tbilisi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tbilisi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tbilisi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tbilisi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tehran.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tehran.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tehran.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tehran.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tokyo.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tokyo.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tokyo.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Tokyo.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Ulaanbaatar.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Ulaanbaatar.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Ulaanbaatar.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Ulaanbaatar.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Urumqi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Urumqi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Urumqi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Urumqi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Vladivostok.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Vladivostok.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Vladivostok.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Vladivostok.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yakutsk.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yakutsk.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yakutsk.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yakutsk.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yekaterinburg.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yekaterinburg.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yekaterinburg.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yekaterinburg.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yerevan.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yerevan.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yerevan.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yerevan.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Azores.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Azores.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Azores.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Azores.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Cape_Verde.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Cape_Verde.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Cape_Verde.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Cape_Verde.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/South_Georgia.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/South_Georgia.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/South_Georgia.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/South_Georgia.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Adelaide.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Adelaide.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Adelaide.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Adelaide.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Brisbane.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Brisbane.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Brisbane.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Brisbane.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Hobart.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Hobart.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Hobart.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Hobart.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Melbourne.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Melbourne.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Melbourne.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Melbourne.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Perth.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Perth.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Perth.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Perth.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Sydney.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Sydney.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Sydney.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Sydney.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Etc/UTC.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Etc/UTC.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Etc/UTC.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Etc/UTC.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Amsterdam.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Amsterdam.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Amsterdam.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Amsterdam.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Athens.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Athens.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Athens.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Athens.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Belgrade.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Belgrade.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Belgrade.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Belgrade.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Berlin.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Berlin.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Berlin.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Berlin.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bratislava.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bratislava.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bratislava.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bratislava.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Brussels.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Brussels.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Brussels.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Brussels.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bucharest.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bucharest.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bucharest.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Bucharest.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Budapest.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Budapest.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Budapest.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Budapest.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Copenhagen.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Copenhagen.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Copenhagen.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Copenhagen.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Dublin.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Dublin.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Dublin.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Dublin.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Helsinki.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Helsinki.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Helsinki.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Helsinki.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Istanbul.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Istanbul.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Istanbul.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Istanbul.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Kiev.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Kiev.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Kiev.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Kiev.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Lisbon.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Lisbon.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Lisbon.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Lisbon.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Ljubljana.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Ljubljana.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Ljubljana.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Ljubljana.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/London.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/London.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/London.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/London.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Madrid.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Madrid.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Madrid.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Madrid.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Minsk.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Minsk.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Minsk.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Minsk.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Moscow.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Moscow.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Moscow.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Moscow.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Paris.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Paris.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Paris.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Paris.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Prague.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Prague.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Prague.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Prague.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Riga.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Riga.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Riga.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Riga.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Rome.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Rome.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Rome.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Rome.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sarajevo.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sarajevo.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sarajevo.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sarajevo.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Skopje.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Skopje.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Skopje.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Skopje.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sofia.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sofia.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sofia.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Sofia.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Stockholm.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Stockholm.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Stockholm.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Stockholm.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Tallinn.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Tallinn.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Tallinn.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Tallinn.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vienna.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vienna.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vienna.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vienna.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vilnius.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vilnius.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vilnius.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vilnius.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Warsaw.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Warsaw.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Warsaw.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Warsaw.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Zagreb.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Zagreb.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Zagreb.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Zagreb.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Auckland.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Auckland.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Auckland.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Auckland.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Fiji.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Fiji.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Fiji.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Fiji.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Guam.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Guam.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Guam.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Guam.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Honolulu.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Honolulu.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Honolulu.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Honolulu.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Majuro.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Majuro.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Majuro.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Majuro.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Midway.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Midway.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Midway.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Midway.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Noumea.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Noumea.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Noumea.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Noumea.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Pago_Pago.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Pago_Pago.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Pago_Pago.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Pago_Pago.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Port_Moresby.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Port_Moresby.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Port_Moresby.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Port_Moresby.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Tongatapu.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Tongatapu.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Tongatapu.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Tongatapu.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/info_timezone.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/info_timezone.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/info_timezone.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/info_timezone.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone_info.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone_info.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone_info.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/linked_timezone_info.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/offset_rationals.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/offset_rationals.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/offset_rationals.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/offset_rationals.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/ruby_core_support.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/ruby_core_support.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/ruby_core_support.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/ruby_core_support.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/time_or_datetime.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/time_or_datetime.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/time_or_datetime.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/time_or_datetime.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_definition.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_definition.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_definition.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_definition.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_info.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_info.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_info.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_info.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_offset_info.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_offset_info.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_offset_info.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_offset_info.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_period.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_period.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_period.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_period.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_transition_info.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_transition_info.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_transition_info.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/timezone_transition_info.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/whiny_nil.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/whiny_nil.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/whiny_nil.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/whiny_nil.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/jdom.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/jdom.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/jdom.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/jdom.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxml.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxml.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxml.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxml.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxmlsax.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxmlsax.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxmlsax.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/libxmlsax.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogiri.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogiri.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogiri.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogiri.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogirisax.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogirisax.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogirisax.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/nokogirisax.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/rexml.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/rexml.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/rexml.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/active_support/xml_mini/rexml.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/activesupport.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/activesupport.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/activesupport.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/activesupport-2.3.15/lib/activesupport.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/.specification b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/.specification similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/.specification rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/.specification diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Changelog b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Changelog similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Changelog rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Changelog diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Install b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Install similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Install rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Install diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/README b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/README rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/README diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/cmyk.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/cmyk.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/cmyk.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/cmyk.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/css.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/css.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/css.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/css.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/grayscale.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/grayscale.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/grayscale.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/grayscale.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/hsl.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/hsl.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/hsl.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/hsl.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/gimp.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/gimp.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/gimp.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/gimp.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/monocontrast.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/monocontrast.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/monocontrast.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/palette/monocontrast.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb-colors.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb-colors.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb-colors.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb-colors.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb/metallic.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb/metallic.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb/metallic.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/rgb/metallic.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/yiq.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/yiq.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/yiq.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/lib/color/yiq.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/metaconfig b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/metaconfig similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/metaconfig rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/metaconfig diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/pre-setup.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/pre-setup.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/pre-setup.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/pre-setup.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/setup.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/setup.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/setup.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/color-tools-1.3.0/setup.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/.specification b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/.specification similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/.specification rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/.specification diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/AUTHORS b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/AUTHORS similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/AUTHORS rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/AUTHORS diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/CHANGELOG b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/CHANGELOG similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/CHANGELOG rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/CHANGELOG diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/COPYING b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/COPYING similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/COPYING rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/COPYING diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/INSTALL b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/INSTALL similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/INSTALL rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/INSTALL diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/LICENSE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/LICENSE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/LICENSE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/LICENSE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/README b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/README rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/README diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/TODO b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/TODO similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/TODO rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/TODO diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/faster_csv.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/faster_csv.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/faster_csv.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/faster_csv.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/fastercsv.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/fastercsv.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/fastercsv.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/lib/fastercsv.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/setup.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/setup.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/setup.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/fastercsv-1.4.0/setup.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/.specification b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/.specification similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/.specification rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/.specification diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/CHANGELOG.textile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/CHANGELOG.textile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/CHANGELOG.textile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/CHANGELOG.textile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/MIT-LICENSE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/MIT-LICENSE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/MIT-LICENSE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/MIT-LICENSE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/README.textile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/README.textile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/README.textile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/README.textile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/missing.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/missing.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/missing.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/missing.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/store_procs.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/store_procs.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/store_procs.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/store_procs.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/translation.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/translation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/translation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/active_record/translation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/base.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cascade.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cascade.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cascade.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cascade.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/chain.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/chain.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/chain.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/chain.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cldr.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cldr.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cldr.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/cldr.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/fallbacks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/fallbacks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/fallbacks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/fallbacks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/flatten.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/flatten.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/flatten.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/flatten.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/gettext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/gettext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/gettext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/gettext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/interpolation_compiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/interpolation_compiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/interpolation_compiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/interpolation_compiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/key_value.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/key_value.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/key_value.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/key_value.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/memoize.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/memoize.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/memoize.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/memoize.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/metadata.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/metadata.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/metadata.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/metadata.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/pluralization.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/pluralization.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/pluralization.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/pluralization.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/simple.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/simple.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/simple.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/simple.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/transliterator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/transliterator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/transliterator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/backend/transliterator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/config.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/config.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/config.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/config.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/hash.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/hash.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/hash.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/hash.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/string/interpolate.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/string/interpolate.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/string/interpolate.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/core_ext/string/interpolate.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/exceptions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/exceptions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/exceptions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/exceptions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/helpers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/helpers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/helpers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/helpers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/po_parser.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/po_parser.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/po_parser.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/gettext/po_parser.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/fallbacks.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/fallbacks.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/fallbacks.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/fallbacks.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/parents.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/parents.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/parents.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/parents.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/rfc4646.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/rfc4646.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/rfc4646.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/rfc4646.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/simple.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/simple.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/simple.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/locale/tag/simple.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/i18n-0.4.2/lib/i18n/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/.specification b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/.specification similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/.specification rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/.specification diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/core.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/core.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/core.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/core.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/rails.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/rails.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/rails.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/add/rails.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/common.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/common.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/common.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/common.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/generator.jar b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/generator.jar similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/generator.jar rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/generator.jar diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/parser.jar b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/parser.jar similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/parser.jar rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/ext/parser.jar diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb.orig b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb.orig similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb.orig rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/generator.rb.orig diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/parser.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/parser.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/parser.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/pure/parser.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb.orig b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb.orig similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb.orig rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/json-jruby-1.2.3-universal-java-1.6/lib/json/version.rb.orig diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/COPYING b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/COPYING similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/COPYING rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/COPYING diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/adapter/camping.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/adapter/camping.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/adapter/camping.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/adapter/camping.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/handler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/handler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/handler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/handler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/request.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/request.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/request.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/abstract/request.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/basic.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/basic.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/basic.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/basic.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/md5.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/md5.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/md5.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/md5.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/nonce.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/nonce.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/nonce.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/nonce.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/params.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/params.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/params.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/params.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/request.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/request.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/request.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/auth/digest/request.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/builder.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/builder.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/builder.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/builder.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/cascade.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/cascade.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/cascade.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/cascade.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/chunked.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/chunked.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/chunked.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/chunked.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/commonlogger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/commonlogger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/commonlogger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/commonlogger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/conditionalget.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/conditionalget.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/conditionalget.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/conditionalget.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/config.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/config.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/config.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/config.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_length.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_length.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_length.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_length.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_type.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_type.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_type.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/content_type.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/deflater.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/deflater.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/deflater.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/deflater.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/directory.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/directory.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/directory.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/directory.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/etag.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/etag.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/etag.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/etag.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/file.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/file.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/file.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/file.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/cgi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/cgi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/cgi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/cgi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/evented_mongrel.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/evented_mongrel.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/evented_mongrel.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/evented_mongrel.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/fastcgi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/fastcgi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/fastcgi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/fastcgi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/lsws.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/lsws.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/lsws.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/lsws.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/mongrel.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/mongrel.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/mongrel.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/mongrel.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/scgi.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/scgi.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/scgi.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/scgi.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/swiftiplied_mongrel.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/swiftiplied_mongrel.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/swiftiplied_mongrel.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/swiftiplied_mongrel.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/thin.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/thin.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/thin.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/thin.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/webrick.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/webrick.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/webrick.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/handler/webrick.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/head.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/head.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/head.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/head.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lint.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lint.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lint.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lint.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lobster.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lobster.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lobster.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lobster.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lock.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lock.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lock.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/lock.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/logger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/logger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/logger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/logger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/methodoverride.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/methodoverride.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/methodoverride.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/methodoverride.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mime.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mime.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mime.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mime.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mock.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mock.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mock.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/mock.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/nulllogger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/nulllogger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/nulllogger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/nulllogger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/recursive.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/recursive.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/recursive.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/recursive.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/reloader.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/reloader.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/reloader.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/reloader.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/request.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/request.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/request.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/request.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/response.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/response.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/response.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/response.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/rewindable_input.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/rewindable_input.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/rewindable_input.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/rewindable_input.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/runtime.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/runtime.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/runtime.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/runtime.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/sendfile.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/sendfile.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/sendfile.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/sendfile.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/server.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/server.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/server.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/server.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/abstract/id.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/abstract/id.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/abstract/id.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/abstract/id.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/cookie.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/cookie.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/cookie.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/cookie.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/memcache.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/memcache.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/memcache.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/memcache.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/pool.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/pool.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/pool.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/session/pool.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showexceptions.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showexceptions.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showexceptions.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showexceptions.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showstatus.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showstatus.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showstatus.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/showstatus.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/static.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/static.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/static.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/static.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/urlmap.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/urlmap.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/urlmap.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/urlmap.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/utils.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/utils.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/utils.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/lib/rack/utils.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/rack.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/rack.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/rack.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rack-1.1.6/rack.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/CHANGELOG b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/CHANGELOG similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/CHANGELOG rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/CHANGELOG diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/MIT-LICENSE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/MIT-LICENSE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/MIT-LICENSE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/MIT-LICENSE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/README b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/README rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/README diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails/info_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails_info_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails_info_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails_info_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/builtin/rails_info/rails_info_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/frontbase.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/frontbase.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/frontbase.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/frontbase.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/ibm_db.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/ibm_db.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/ibm_db.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/ibm_db.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/mysql.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/mysql.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/mysql.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/mysql.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/oracle.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/oracle.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/oracle.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/oracle.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/postgresql.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/postgresql.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/postgresql.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/postgresql.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite2.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite2.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite2.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite2.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite3.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite3.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite3.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/databases/sqlite3.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/empty.log b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/empty.log similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/empty.log rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/empty.log diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/backtrace_silencers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/backtrace_silencers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/backtrace_silencers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/backtrace_silencers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/cookie_verification_secret.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/cookie_verification_secret.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/cookie_verification_secret.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/cookie_verification_secret.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/inflections.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/inflections.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/inflections.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/inflections.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/mime_types.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/mime_types.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/mime_types.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/mime_types.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/new_rails_defaults.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/new_rails_defaults.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/new_rails_defaults.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/new_rails_defaults.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/session_store.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/session_store.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/session_store.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/initializers/session_store.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/locales/en.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/locales/en.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/locales/en.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/locales/en.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/routes.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/routes.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/routes.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/routes.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/seeds.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/seeds.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/seeds.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/configs/seeds.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/config.ru b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/config.ru similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/config.ru rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/config.ru diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.fcgi b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.fcgi similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.fcgi rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.fcgi diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/dispatch.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/gateway.cgi b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/gateway.cgi similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/gateway.cgi rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/dispatches/gateway.cgi diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/boot.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/boot.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/boot.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/boot.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/development.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/development.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/development.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/development.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/environment.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/environment.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/environment.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/environment.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/production.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/production.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/production.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/production.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/environments/test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/fresh_rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/fresh_rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/fresh_rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/fresh_rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/application_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/performance_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/performance_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/performance_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/performance_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/test_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/test_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/test_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/helpers/test_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/404.html b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/404.html similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/404.html rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/404.html diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/422.html b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/422.html similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/422.html rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/422.html diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/500.html b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/500.html similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/500.html rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/500.html diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/favicon.ico b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/favicon.ico similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/favicon.ico rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/favicon.ico diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/images/rails.png b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/images/rails.png similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/images/rails.png rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/images/rails.png diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/index.html b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/index.html similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/index.html rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/index.html diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/application.js b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/application.js similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/application.js rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/application.js diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/controls.js b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/controls.js similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/controls.js rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/controls.js diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/dragdrop.js b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/dragdrop.js similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/dragdrop.js rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/dragdrop.js diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/effects.js b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/effects.js similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/effects.js rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/effects.js diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/prototype.js b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/prototype.js similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/prototype.js rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/javascripts/prototype.js diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/robots.txt b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/robots.txt similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/robots.txt rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/html/robots.txt diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/code_statistics.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/code_statistics.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/code_statistics.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/code_statistics.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/about.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/about.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/about.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/about.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/console.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/console.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/console.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/console.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/dbconsole.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/dbconsole.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/dbconsole.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/dbconsole.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/destroy.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/destroy.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/destroy.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/destroy.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/generate.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/generate.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/generate.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/generate.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/listener b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/listener similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/listener rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/listener diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/tracker b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/tracker similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/tracker rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/ncgi/tracker diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/benchmarker.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/benchmarker.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/benchmarker.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/benchmarker.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/profiler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/profiler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/profiler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/performance/profiler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/plugin.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/plugin.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/plugin.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/plugin.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/runner.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/runner.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/runner.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/runner.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/server.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/server.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/server.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/server.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/update.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/update.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/update.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/commands/update.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_app.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_app.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_app.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_app.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_sandbox.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_sandbox.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_sandbox.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_sandbox.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_with_helpers.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_with_helpers.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_with_helpers.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/console_with_helpers.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/dispatcher.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/dispatcher.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/dispatcher.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/dispatcher.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/fcgi_handler.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/fcgi_handler.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/fcgi_handler.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/fcgi_handler.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/initializer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/initializer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/initializer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/initializer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/performance_test_help.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/performance_test_help.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/performance_test_help.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/performance_test_help.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/backtrace_cleaner.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/backtrace_cleaner.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/backtrace_cleaner.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/backtrace_cleaner.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_builder.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_builder.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_builder.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_builder.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_dependency.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_dependency.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_dependency.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/gem_dependency.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/loader.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/loader.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/loader.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/loader.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/locator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/locator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/locator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/plugin/locator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/debugger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/debugger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/debugger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/debugger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/log_tailer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/log_tailer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/log_tailer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/log_tailer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/metal.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/metal.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/metal.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/metal.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/static.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/static.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/static.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/rack/static.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/vendor_gem_source_index.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/vendor_gem_source_index.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/vendor_gem_source_index.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/vendor_gem_source_index.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/version.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails/version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/base.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/commands.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/commands.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/commands.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/commands.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generated_attribute.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generated_attribute.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generated_attribute.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generated_attribute.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/app_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/app_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/app_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/app_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/git.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/git.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/git.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/git.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/scm.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/scm.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/scm.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/scm.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/svn.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/svn.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/svn.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/scm/svn.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/template_runner.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/template_runner.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/template_runner.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/applications/app/template_runner.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/controller_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/controller_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/controller_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/controller_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/functional_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/functional_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/functional_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/functional_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/helper_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/view.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/view.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/view.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/controller/templates/view.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/helper_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/helper_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/helper_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/helper_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/helper/templates/helper_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/mailer_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/mailer_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/mailer_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/mailer_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/mailer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/mailer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/mailer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/mailer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/unit_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/unit_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/unit_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/unit_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.rhtml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.rhtml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.rhtml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/mailer/templates/view.rhtml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/metal_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/metal_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/metal_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/metal_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/templates/metal.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/templates/metal.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/templates/metal.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/metal/templates/metal.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/migration_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/migration_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/migration_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/migration_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/templates/migration.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/templates/migration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/templates/migration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/migration/templates/migration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/model_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/model_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/model_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/model_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/fixtures.yml b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/fixtures.yml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/fixtures.yml rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/fixtures.yml diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/migration.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/migration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/migration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/migration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/model.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/model.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/model.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/model.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/unit_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/unit_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/unit_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/model/templates/unit_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/observer_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/observer_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/observer_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/observer_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/observer.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/observer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/observer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/observer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/unit_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/unit_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/unit_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/observer/templates/unit_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/performance_test_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/performance_test_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/performance_test_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/performance_test_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/plugin_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/plugin_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/plugin_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/plugin_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/README b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/README rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/README diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/init.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/init.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/init.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/init.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/install.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/install.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/install.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/install.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/plugin.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/plugin.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/plugin.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/plugin.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/tasks.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/tasks.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/tasks.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/tasks.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/test_helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/test_helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/test_helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/test_helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/uninstall.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/uninstall.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/uninstall.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/uninstall.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/unit_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/unit_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/unit_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/plugin/templates/unit_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/resource_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/resource_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/resource_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/resource_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/functional_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/functional_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/functional_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/functional_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/resource/templates/helper_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/controller.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/controller.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/controller.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/controller.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/style.css b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/style.css similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/style.css rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/style.css diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/USAGE b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/USAGE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/USAGE rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/USAGE diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/templates/migration.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/templates/migration.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/templates/migration.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/generators/components/session_migration/templates/migration.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/lookup.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/lookup.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/lookup.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/lookup.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/manifest.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/manifest.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/manifest.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/manifest.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/options.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/options.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/options.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/options.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/destroy.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/destroy.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/destroy.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/destroy.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/generate.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/generate.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/generate.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/generate.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/update.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/update.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/update.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/scripts/update.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/secret_key_generator.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/secret_key_generator.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/secret_key_generator.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/secret_key_generator.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/simple_logger.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/simple_logger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/simple_logger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/simple_logger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/spec.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/spec.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/spec.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rails_generator/spec.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/railties_path.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/railties_path.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/railties_path.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/railties_path.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/ruby_version_check.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/ruby_version_check.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/ruby_version_check.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/ruby_version_check.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rubyprof_ext.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rubyprof_ext.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rubyprof_ext.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/rubyprof_ext.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/source_annotation_extractor.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/source_annotation_extractor.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/source_annotation_extractor.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/source_annotation_extractor.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/annotations.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/annotations.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/annotations.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/annotations.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/databases.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/databases.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/databases.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/databases.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/documentation.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/documentation.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/documentation.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/documentation.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/framework.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/framework.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/framework.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/framework.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/gems.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/gems.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/gems.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/gems.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/log.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/log.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/log.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/log.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/middleware.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/middleware.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/middleware.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/middleware.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/misc.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/misc.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/misc.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/misc.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/rails.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/rails.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/rails.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/rails.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/routes.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/routes.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/routes.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/routes.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/statistics.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/statistics.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/statistics.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/statistics.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/testing.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/testing.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/testing.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/testing.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/tmp.rake b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/tmp.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/tmp.rake rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/tasks/tmp.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/test_help.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/test_help.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/test_help.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/test_help.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/webrick_server.rb b/server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/webrick_server.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/webrick_server.rb rename to server/sonar-server/src/main/webapp/WEB-INF/gems/gems/rails-2.3.15/lib/webrick_server.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/actionpack-2.3.15.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/actionpack-2.3.15.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/actionpack-2.3.15.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/actionpack-2.3.15.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-2.3.15.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-2.3.15.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-2.3.15.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-2.3.15.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-jdbc-adapter-1.1.3.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-jdbc-adapter-1.1.3.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-jdbc-adapter-1.1.3.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activerecord-jdbc-adapter-1.1.3.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activesupport-2.3.15.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activesupport-2.3.15.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/activesupport-2.3.15.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/activesupport-2.3.15.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/color-tools-1.3.0.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/color-tools-1.3.0.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/color-tools-1.3.0.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/color-tools-1.3.0.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/fastercsv-1.4.0.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/fastercsv-1.4.0.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/fastercsv-1.4.0.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/fastercsv-1.4.0.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/i18n-0.4.2.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/i18n-0.4.2.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/i18n-0.4.2.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/i18n-0.4.2.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/json-jruby-1.2.3-universal-java-1.6.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/json-jruby-1.2.3-universal-java-1.6.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/json-jruby-1.2.3-universal-java-1.6.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/json-jruby-1.2.3-universal-java-1.6.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/rack-1.1.6.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/rack-1.1.6.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/rack-1.1.6.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/rack-1.1.6.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/specifications/rails-2.3.15.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/rails-2.3.15.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/gems/specifications/rails-2.3.15.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/gems/specifications/rails-2.3.15.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/authorization/all_pass_authorizer.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/authorization/all_pass_authorizer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/authorization/all_pass_authorizer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/authorization/all_pass_authorizer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/authorization/default_authorizer.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/authorization/default_authorizer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/authorization/default_authorizer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/authorization/default_authorizer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/authorization/logged_in_authorizer.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/authorization/logged_in_authorizer.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/authorization/logged_in_authorizer.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/authorization/logged_in_authorizer.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar b/server/sonar-server/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar rename to server/sonar-server/src/main/webapp/WEB-INF/lib/eastwood-1.1.0.jar diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/java_ws_routing.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/java_ws_routing.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/java_ws_routing.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/java_ws_routing.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/need_authentication.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/need_authentication.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/need_authentication.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/need_authentication.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/need_authorization.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/resourceable.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/color_base.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/color_base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/color_base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/color_base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/gradient_color.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/gradient_color.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/gradient_color.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/gradient_color.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/html_output.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/html_output.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/html_output.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/html_output.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/layout_base.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/layout_base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/layout_base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/layout_base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/node.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/node.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/node.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/node.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/output_base.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/output_base.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/output_base.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/output_base.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/rectangle.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/rectangle.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/rectangle.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/rectangle.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/slice_layout.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/slice_layout.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/slice_layout.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/slice_layout.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/treemap/squarified_layout.rb b/server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/squarified_layout.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/lib/treemap/squarified_layout.rb rename to server/sonar-server/src/main/webapp/WEB-INF/lib/treemap/squarified_layout.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/README b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/README similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/README rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/README diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/init.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/init.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/init.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/init.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/MIT-LICENSE b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/MIT-LICENSE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/MIT-LICENSE rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/MIT-LICENSE diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/README.rdoc b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/README.rdoc similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/README.rdoc rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/README.rdoc diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/init.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/init.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/init.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/init.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/lib/http_accept_language.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/lib/http_accept_language.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/lib/http_accept_language.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/lib/http_accept_language.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/tasks/http_accept_language_tasks.rake b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/tasks/http_accept_language_tasks.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/tasks/http_accept_language_tasks.rake rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/http_accept_language/tasks/http_accept_language_tasks.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/CHANGELOG b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/CHANGELOG similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/CHANGELOG rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/CHANGELOG diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/LICENSE b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/LICENSE similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/LICENSE rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/LICENSE diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/README.textile b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/README.textile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/README.textile rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/README.textile diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/Rakefile b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/Rakefile similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/Rakefile rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/Rakefile diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/TODO b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/TODO similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/TODO rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/TODO diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/init.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/init.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/init.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/init.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_cookie_token.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_cookie_token.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_cookie_token.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_cookie_token.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_password.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_password.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_password.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authentication/by_password.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/aasm_roles.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/aasm_roles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/aasm_roles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/aasm_roles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/stateful_roles.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/stateful_roles.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/stateful_roles.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/authorization/stateful_roles.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification/email_validation.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification/email_validation.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification/email_validation.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/lib/trustification/email_validation.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/rails/init.rb b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/rails/init.rb similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/rails/init.rb rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/rails/init.rb diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/restful-authentication.gemspec b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/restful-authentication.gemspec similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/restful-authentication.gemspec rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/restful-authentication.gemspec diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/tasks/auth.rake b/server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/tasks/auth.rake similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/tasks/auth.rake rename to server/sonar-server/src/main/webapp/WEB-INF/vendor/plugins/restful_authentication/tasks/auth.rake diff --git a/sonar-server/src/main/webapp/WEB-INF/web.xml b/server/sonar-server/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from sonar-server/src/main/webapp/WEB-INF/web.xml rename to server/sonar-server/src/main/webapp/WEB-INF/web.xml diff --git a/sonar-server/src/main/webapp/deploy/readme.txt b/server/sonar-server/src/main/webapp/deploy/readme.txt similarity index 100% rename from sonar-server/src/main/webapp/deploy/readme.txt rename to server/sonar-server/src/main/webapp/deploy/readme.txt diff --git a/sonar-server/src/main/webapp/fonts/roboto-bold.woff b/server/sonar-server/src/main/webapp/fonts/roboto-bold.woff similarity index 100% rename from sonar-server/src/main/webapp/fonts/roboto-bold.woff rename to server/sonar-server/src/main/webapp/fonts/roboto-bold.woff diff --git a/sonar-server/src/main/webapp/fonts/roboto-light.woff b/server/sonar-server/src/main/webapp/fonts/roboto-light.woff similarity index 100% rename from sonar-server/src/main/webapp/fonts/roboto-light.woff rename to server/sonar-server/src/main/webapp/fonts/roboto-light.woff diff --git a/sonar-server/src/main/webapp/fonts/roboto-medium.woff b/server/sonar-server/src/main/webapp/fonts/roboto-medium.woff similarity index 100% rename from sonar-server/src/main/webapp/fonts/roboto-medium.woff rename to server/sonar-server/src/main/webapp/fonts/roboto-medium.woff diff --git a/sonar-server/src/main/webapp/fonts/roboto-normal.woff b/server/sonar-server/src/main/webapp/fonts/roboto-normal.woff similarity index 100% rename from sonar-server/src/main/webapp/fonts/roboto-normal.woff rename to server/sonar-server/src/main/webapp/fonts/roboto-normal.woff diff --git a/sonar-server/src/main/webapp/fonts/sonar.woff b/server/sonar-server/src/main/webapp/fonts/sonar.woff similarity index 100% rename from sonar-server/src/main/webapp/fonts/sonar.woff rename to server/sonar-server/src/main/webapp/fonts/sonar.woff diff --git a/sonar-server/src/main/webapp/fonts/sourcecodepro-regular.woff b/server/sonar-server/src/main/webapp/fonts/sourcecodepro-regular.woff similarity index 100% rename from sonar-server/src/main/webapp/fonts/sourcecodepro-regular.woff rename to server/sonar-server/src/main/webapp/fonts/sourcecodepro-regular.woff diff --git a/sonar-server/src/main/webapp/fonts/sourcecodepro-semibold.woff b/server/sonar-server/src/main/webapp/fonts/sourcecodepro-semibold.woff similarity index 100% rename from sonar-server/src/main/webapp/fonts/sourcecodepro-semibold.woff rename to server/sonar-server/src/main/webapp/fonts/sourcecodepro-semibold.woff diff --git a/sonar-server/src/main/webapp/images/accept.png b/server/sonar-server/src/main/webapp/images/accept.png similarity index 100% rename from sonar-server/src/main/webapp/images/accept.png rename to server/sonar-server/src/main/webapp/images/accept.png diff --git a/sonar-server/src/main/webapp/images/actions.png b/server/sonar-server/src/main/webapp/images/actions.png similarity index 100% rename from sonar-server/src/main/webapp/images/actions.png rename to server/sonar-server/src/main/webapp/images/actions.png diff --git a/sonar-server/src/main/webapp/images/add.png b/server/sonar-server/src/main/webapp/images/add.png similarity index 100% rename from sonar-server/src/main/webapp/images/add.png rename to server/sonar-server/src/main/webapp/images/add.png diff --git a/sonar-server/src/main/webapp/images/asc.png b/server/sonar-server/src/main/webapp/images/asc.png similarity index 100% rename from sonar-server/src/main/webapp/images/asc.png rename to server/sonar-server/src/main/webapp/images/asc.png diff --git a/sonar-server/src/main/webapp/images/asc12.png b/server/sonar-server/src/main/webapp/images/asc12.png similarity index 100% rename from sonar-server/src/main/webapp/images/asc12.png rename to server/sonar-server/src/main/webapp/images/asc12.png diff --git a/sonar-server/src/main/webapp/images/bc-gray.png b/server/sonar-server/src/main/webapp/images/bc-gray.png similarity index 100% rename from sonar-server/src/main/webapp/images/bc-gray.png rename to server/sonar-server/src/main/webapp/images/bc-gray.png diff --git a/sonar-server/src/main/webapp/images/bin_closed.png b/server/sonar-server/src/main/webapp/images/bin_closed.png similarity index 100% rename from sonar-server/src/main/webapp/images/bin_closed.png rename to server/sonar-server/src/main/webapp/images/bin_closed.png diff --git a/sonar-server/src/main/webapp/images/black-down.png b/server/sonar-server/src/main/webapp/images/black-down.png similarity index 100% rename from sonar-server/src/main/webapp/images/black-down.png rename to server/sonar-server/src/main/webapp/images/black-down.png diff --git a/sonar-server/src/main/webapp/images/black-left.png b/server/sonar-server/src/main/webapp/images/black-left.png similarity index 100% rename from sonar-server/src/main/webapp/images/black-left.png rename to server/sonar-server/src/main/webapp/images/black-left.png diff --git a/sonar-server/src/main/webapp/images/black-right.png b/server/sonar-server/src/main/webapp/images/black-right.png similarity index 100% rename from sonar-server/src/main/webapp/images/black-right.png rename to server/sonar-server/src/main/webapp/images/black-right.png diff --git a/sonar-server/src/main/webapp/images/black-up.png b/server/sonar-server/src/main/webapp/images/black-up.png similarity index 100% rename from sonar-server/src/main/webapp/images/black-up.png rename to server/sonar-server/src/main/webapp/images/black-up.png diff --git a/sonar-server/src/main/webapp/images/blue-down.png b/server/sonar-server/src/main/webapp/images/blue-down.png similarity index 100% rename from sonar-server/src/main/webapp/images/blue-down.png rename to server/sonar-server/src/main/webapp/images/blue-down.png diff --git a/sonar-server/src/main/webapp/images/blue-left.png b/server/sonar-server/src/main/webapp/images/blue-left.png similarity index 100% rename from sonar-server/src/main/webapp/images/blue-left.png rename to server/sonar-server/src/main/webapp/images/blue-left.png diff --git a/sonar-server/src/main/webapp/images/blue-right.png b/server/sonar-server/src/main/webapp/images/blue-right.png similarity index 100% rename from sonar-server/src/main/webapp/images/blue-right.png rename to server/sonar-server/src/main/webapp/images/blue-right.png diff --git a/sonar-server/src/main/webapp/images/blue-up.png b/server/sonar-server/src/main/webapp/images/blue-up.png similarity index 100% rename from sonar-server/src/main/webapp/images/blue-up.png rename to server/sonar-server/src/main/webapp/images/blue-up.png diff --git a/sonar-server/src/main/webapp/images/bulk-edit.png b/server/sonar-server/src/main/webapp/images/bulk-edit.png similarity index 100% rename from sonar-server/src/main/webapp/images/bulk-edit.png rename to server/sonar-server/src/main/webapp/images/bulk-edit.png diff --git a/sonar-server/src/main/webapp/images/bullet-blue.png b/server/sonar-server/src/main/webapp/images/bullet-blue.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet-blue.png rename to server/sonar-server/src/main/webapp/images/bullet-blue.png diff --git a/sonar-server/src/main/webapp/images/bullet.png b/server/sonar-server/src/main/webapp/images/bullet.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet.png rename to server/sonar-server/src/main/webapp/images/bullet.png diff --git a/sonar-server/src/main/webapp/images/bullet_arrow_down.gif b/server/sonar-server/src/main/webapp/images/bullet_arrow_down.gif similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_arrow_down.gif rename to server/sonar-server/src/main/webapp/images/bullet_arrow_down.gif diff --git a/sonar-server/src/main/webapp/images/bullet_arrow_down.png b/server/sonar-server/src/main/webapp/images/bullet_arrow_down.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_arrow_down.png rename to server/sonar-server/src/main/webapp/images/bullet_arrow_down.png diff --git a/sonar-server/src/main/webapp/images/bullet_arrow_right.gif b/server/sonar-server/src/main/webapp/images/bullet_arrow_right.gif similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_arrow_right.gif rename to server/sonar-server/src/main/webapp/images/bullet_arrow_right.gif diff --git a/sonar-server/src/main/webapp/images/bullet_arrow_right.png b/server/sonar-server/src/main/webapp/images/bullet_arrow_right.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_arrow_right.png rename to server/sonar-server/src/main/webapp/images/bullet_arrow_right.png diff --git a/sonar-server/src/main/webapp/images/bullet_arrow_up.gif b/server/sonar-server/src/main/webapp/images/bullet_arrow_up.gif similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_arrow_up.gif rename to server/sonar-server/src/main/webapp/images/bullet_arrow_up.gif diff --git a/sonar-server/src/main/webapp/images/bullet_arrow_up.png b/server/sonar-server/src/main/webapp/images/bullet_arrow_up.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_arrow_up.png rename to server/sonar-server/src/main/webapp/images/bullet_arrow_up.png diff --git a/sonar-server/src/main/webapp/images/bullet_black.png b/server/sonar-server/src/main/webapp/images/bullet_black.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_black.png rename to server/sonar-server/src/main/webapp/images/bullet_black.png diff --git a/sonar-server/src/main/webapp/images/bullet_picture.png b/server/sonar-server/src/main/webapp/images/bullet_picture.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_picture.png rename to server/sonar-server/src/main/webapp/images/bullet_picture.png diff --git a/sonar-server/src/main/webapp/images/bullet_toggle_minus.png b/server/sonar-server/src/main/webapp/images/bullet_toggle_minus.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_toggle_minus.png rename to server/sonar-server/src/main/webapp/images/bullet_toggle_minus.png diff --git a/sonar-server/src/main/webapp/images/bullet_white.png b/server/sonar-server/src/main/webapp/images/bullet_white.png similarity index 100% rename from sonar-server/src/main/webapp/images/bullet_white.png rename to server/sonar-server/src/main/webapp/images/bullet_white.png diff --git a/sonar-server/src/main/webapp/images/calendar/calbtn.gif b/server/sonar-server/src/main/webapp/images/calendar/calbtn.gif similarity index 100% rename from sonar-server/src/main/webapp/images/calendar/calbtn.gif rename to server/sonar-server/src/main/webapp/images/calendar/calbtn.gif diff --git a/sonar-server/src/main/webapp/images/calendar/sprite.png b/server/sonar-server/src/main/webapp/images/calendar/sprite.png similarity index 100% rename from sonar-server/src/main/webapp/images/calendar/sprite.png rename to server/sonar-server/src/main/webapp/images/calendar/sprite.png diff --git a/sonar-server/src/main/webapp/images/clock.png b/server/sonar-server/src/main/webapp/images/clock.png similarity index 100% rename from sonar-server/src/main/webapp/images/clock.png rename to server/sonar-server/src/main/webapp/images/clock.png diff --git a/sonar-server/src/main/webapp/images/compare.png b/server/sonar-server/src/main/webapp/images/compare.png similarity index 100% rename from sonar-server/src/main/webapp/images/compare.png rename to server/sonar-server/src/main/webapp/images/compare.png diff --git a/sonar-server/src/main/webapp/images/controls/add.png b/server/sonar-server/src/main/webapp/images/controls/add.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/add.png rename to server/sonar-server/src/main/webapp/images/controls/add.png diff --git a/sonar-server/src/main/webapp/images/controls/cross.png b/server/sonar-server/src/main/webapp/images/controls/cross.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/cross.png rename to server/sonar-server/src/main/webapp/images/controls/cross.png diff --git a/sonar-server/src/main/webapp/images/controls/delete.png b/server/sonar-server/src/main/webapp/images/controls/delete.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/delete.png rename to server/sonar-server/src/main/webapp/images/controls/delete.png diff --git a/sonar-server/src/main/webapp/images/controls/error.gif b/server/sonar-server/src/main/webapp/images/controls/error.gif similarity index 100% rename from sonar-server/src/main/webapp/images/controls/error.gif rename to server/sonar-server/src/main/webapp/images/controls/error.gif diff --git a/sonar-server/src/main/webapp/images/controls/move_down.png b/server/sonar-server/src/main/webapp/images/controls/move_down.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/move_down.png rename to server/sonar-server/src/main/webapp/images/controls/move_down.png diff --git a/sonar-server/src/main/webapp/images/controls/move_left.png b/server/sonar-server/src/main/webapp/images/controls/move_left.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/move_left.png rename to server/sonar-server/src/main/webapp/images/controls/move_left.png diff --git a/sonar-server/src/main/webapp/images/controls/move_right.png b/server/sonar-server/src/main/webapp/images/controls/move_right.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/move_right.png rename to server/sonar-server/src/main/webapp/images/controls/move_right.png diff --git a/sonar-server/src/main/webapp/images/controls/move_up.png b/server/sonar-server/src/main/webapp/images/controls/move_up.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/move_up.png rename to server/sonar-server/src/main/webapp/images/controls/move_up.png diff --git a/sonar-server/src/main/webapp/images/controls/resultset_next.png b/server/sonar-server/src/main/webapp/images/controls/resultset_next.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/resultset_next.png rename to server/sonar-server/src/main/webapp/images/controls/resultset_next.png diff --git a/sonar-server/src/main/webapp/images/controls/resultset_previous.png b/server/sonar-server/src/main/webapp/images/controls/resultset_previous.png similarity index 100% rename from sonar-server/src/main/webapp/images/controls/resultset_previous.png rename to server/sonar-server/src/main/webapp/images/controls/resultset_previous.png diff --git a/sonar-server/src/main/webapp/images/controls/warning.gif b/server/sonar-server/src/main/webapp/images/controls/warning.gif similarity index 100% rename from sonar-server/src/main/webapp/images/controls/warning.gif rename to server/sonar-server/src/main/webapp/images/controls/warning.gif diff --git a/sonar-server/src/main/webapp/images/cross-gray.png b/server/sonar-server/src/main/webapp/images/cross-gray.png similarity index 100% rename from sonar-server/src/main/webapp/images/cross-gray.png rename to server/sonar-server/src/main/webapp/images/cross-gray.png diff --git a/sonar-server/src/main/webapp/images/cross.png b/server/sonar-server/src/main/webapp/images/cross.png similarity index 100% rename from sonar-server/src/main/webapp/images/cross.png rename to server/sonar-server/src/main/webapp/images/cross.png diff --git a/sonar-server/src/main/webapp/images/csv.png b/server/sonar-server/src/main/webapp/images/csv.png similarity index 100% rename from sonar-server/src/main/webapp/images/csv.png rename to server/sonar-server/src/main/webapp/images/csv.png diff --git a/sonar-server/src/main/webapp/images/desc.png b/server/sonar-server/src/main/webapp/images/desc.png similarity index 100% rename from sonar-server/src/main/webapp/images/desc.png rename to server/sonar-server/src/main/webapp/images/desc.png diff --git a/sonar-server/src/main/webapp/images/desc12.png b/server/sonar-server/src/main/webapp/images/desc12.png similarity index 100% rename from sonar-server/src/main/webapp/images/desc12.png rename to server/sonar-server/src/main/webapp/images/desc12.png diff --git a/sonar-server/src/main/webapp/images/down_16.gif b/server/sonar-server/src/main/webapp/images/down_16.gif similarity index 100% rename from sonar-server/src/main/webapp/images/down_16.gif rename to server/sonar-server/src/main/webapp/images/down_16.gif diff --git a/sonar-server/src/main/webapp/images/e16.gif b/server/sonar-server/src/main/webapp/images/e16.gif similarity index 100% rename from sonar-server/src/main/webapp/images/e16.gif rename to server/sonar-server/src/main/webapp/images/e16.gif diff --git a/sonar-server/src/main/webapp/images/event_alert.png b/server/sonar-server/src/main/webapp/images/event_alert.png similarity index 100% rename from sonar-server/src/main/webapp/images/event_alert.png rename to server/sonar-server/src/main/webapp/images/event_alert.png diff --git a/sonar-server/src/main/webapp/images/event_profile.png b/server/sonar-server/src/main/webapp/images/event_profile.png similarity index 100% rename from sonar-server/src/main/webapp/images/event_profile.png rename to server/sonar-server/src/main/webapp/images/event_profile.png diff --git a/sonar-server/src/main/webapp/images/exclamation.png b/server/sonar-server/src/main/webapp/images/exclamation.png similarity index 100% rename from sonar-server/src/main/webapp/images/exclamation.png rename to server/sonar-server/src/main/webapp/images/exclamation.png diff --git a/sonar-server/src/main/webapp/images/expand_collapse.jpg b/server/sonar-server/src/main/webapp/images/expand_collapse.jpg similarity index 100% rename from sonar-server/src/main/webapp/images/expand_collapse.jpg rename to server/sonar-server/src/main/webapp/images/expand_collapse.jpg diff --git a/sonar-server/src/main/webapp/images/favicon.ico b/server/sonar-server/src/main/webapp/images/favicon.ico similarity index 100% rename from sonar-server/src/main/webapp/images/favicon.ico rename to server/sonar-server/src/main/webapp/images/favicon.ico diff --git a/sonar-server/src/main/webapp/images/feed-icon-14x14.png b/server/sonar-server/src/main/webapp/images/feed-icon-14x14.png similarity index 100% rename from sonar-server/src/main/webapp/images/feed-icon-14x14.png rename to server/sonar-server/src/main/webapp/images/feed-icon-14x14.png diff --git a/sonar-server/src/main/webapp/images/gray-stripes.png b/server/sonar-server/src/main/webapp/images/gray-stripes.png similarity index 100% rename from sonar-server/src/main/webapp/images/gray-stripes.png rename to server/sonar-server/src/main/webapp/images/gray-stripes.png diff --git a/sonar-server/src/main/webapp/images/green-down.png b/server/sonar-server/src/main/webapp/images/green-down.png similarity index 100% rename from sonar-server/src/main/webapp/images/green-down.png rename to server/sonar-server/src/main/webapp/images/green-down.png diff --git a/sonar-server/src/main/webapp/images/green-left.png b/server/sonar-server/src/main/webapp/images/green-left.png similarity index 100% rename from sonar-server/src/main/webapp/images/green-left.png rename to server/sonar-server/src/main/webapp/images/green-left.png diff --git a/sonar-server/src/main/webapp/images/green-right.png b/server/sonar-server/src/main/webapp/images/green-right.png similarity index 100% rename from sonar-server/src/main/webapp/images/green-right.png rename to server/sonar-server/src/main/webapp/images/green-right.png diff --git a/sonar-server/src/main/webapp/images/green-up.png b/server/sonar-server/src/main/webapp/images/green-up.png similarity index 100% rename from sonar-server/src/main/webapp/images/green-up.png rename to server/sonar-server/src/main/webapp/images/green-up.png diff --git a/sonar-server/src/main/webapp/images/help.png b/server/sonar-server/src/main/webapp/images/help.png similarity index 100% rename from sonar-server/src/main/webapp/images/help.png rename to server/sonar-server/src/main/webapp/images/help.png diff --git a/sonar-server/src/main/webapp/images/help_gray.gif b/server/sonar-server/src/main/webapp/images/help_gray.gif similarity index 100% rename from sonar-server/src/main/webapp/images/help_gray.gif rename to server/sonar-server/src/main/webapp/images/help_gray.gif diff --git a/sonar-server/src/main/webapp/images/information.png b/server/sonar-server/src/main/webapp/images/information.png similarity index 100% rename from sonar-server/src/main/webapp/images/information.png rename to server/sonar-server/src/main/webapp/images/information.png diff --git a/sonar-server/src/main/webapp/images/inherited.png b/server/sonar-server/src/main/webapp/images/inherited.png similarity index 100% rename from sonar-server/src/main/webapp/images/inherited.png rename to server/sonar-server/src/main/webapp/images/inherited.png diff --git a/sonar-server/src/main/webapp/images/layout/LICENSE.txt b/server/sonar-server/src/main/webapp/images/layout/LICENSE.txt similarity index 100% rename from sonar-server/src/main/webapp/images/layout/LICENSE.txt rename to server/sonar-server/src/main/webapp/images/layout/LICENSE.txt diff --git a/sonar-server/src/main/webapp/images/layout/header-2.png b/server/sonar-server/src/main/webapp/images/layout/header-2.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout/header-2.png rename to server/sonar-server/src/main/webapp/images/layout/header-2.png diff --git a/sonar-server/src/main/webapp/images/layout/header_footer.png b/server/sonar-server/src/main/webapp/images/layout/header_footer.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout/header_footer.png rename to server/sonar-server/src/main/webapp/images/layout/header_footer.png diff --git a/sonar-server/src/main/webapp/images/layout/header_footer_2.png b/server/sonar-server/src/main/webapp/images/layout/header_footer_2.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout/header_footer_2.png rename to server/sonar-server/src/main/webapp/images/layout/header_footer_2.png diff --git a/sonar-server/src/main/webapp/images/layout/header_footer_2_equal.png b/server/sonar-server/src/main/webapp/images/layout/header_footer_2_equal.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout/header_footer_2_equal.png rename to server/sonar-server/src/main/webapp/images/layout/header_footer_2_equal.png diff --git a/sonar-server/src/main/webapp/images/layout/select-content.png b/server/sonar-server/src/main/webapp/images/layout/select-content.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout/select-content.png rename to server/sonar-server/src/main/webapp/images/layout/select-content.png diff --git a/sonar-server/src/main/webapp/images/layout/select-sidebar.png b/server/sonar-server/src/main/webapp/images/layout/select-sidebar.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout/select-sidebar.png rename to server/sonar-server/src/main/webapp/images/layout/select-sidebar.png diff --git a/sonar-server/src/main/webapp/images/layout100.png b/server/sonar-server/src/main/webapp/images/layout100.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout100.png rename to server/sonar-server/src/main/webapp/images/layout100.png diff --git a/sonar-server/src/main/webapp/images/layout3070.png b/server/sonar-server/src/main/webapp/images/layout3070.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout3070.png rename to server/sonar-server/src/main/webapp/images/layout3070.png diff --git a/sonar-server/src/main/webapp/images/layout333333.png b/server/sonar-server/src/main/webapp/images/layout333333.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout333333.png rename to server/sonar-server/src/main/webapp/images/layout333333.png diff --git a/sonar-server/src/main/webapp/images/layout5050.png b/server/sonar-server/src/main/webapp/images/layout5050.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout5050.png rename to server/sonar-server/src/main/webapp/images/layout5050.png diff --git a/sonar-server/src/main/webapp/images/layout7030.png b/server/sonar-server/src/main/webapp/images/layout7030.png similarity index 100% rename from sonar-server/src/main/webapp/images/layout7030.png rename to server/sonar-server/src/main/webapp/images/layout7030.png diff --git a/sonar-server/src/main/webapp/images/levels/error.png b/server/sonar-server/src/main/webapp/images/levels/error.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/error.png rename to server/sonar-server/src/main/webapp/images/levels/error.png diff --git a/sonar-server/src/main/webapp/images/levels/none.png b/server/sonar-server/src/main/webapp/images/levels/none.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/none.png rename to server/sonar-server/src/main/webapp/images/levels/none.png diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/error.png b/server/sonar-server/src/main/webapp/images/levels/notforie6/error.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/notforie6/error.png rename to server/sonar-server/src/main/webapp/images/levels/notforie6/error.png diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/none.png b/server/sonar-server/src/main/webapp/images/levels/notforie6/none.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/notforie6/none.png rename to server/sonar-server/src/main/webapp/images/levels/notforie6/none.png diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/ok.png b/server/sonar-server/src/main/webapp/images/levels/notforie6/ok.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/notforie6/ok.png rename to server/sonar-server/src/main/webapp/images/levels/notforie6/ok.png diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/warn.png b/server/sonar-server/src/main/webapp/images/levels/notforie6/warn.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/notforie6/warn.png rename to server/sonar-server/src/main/webapp/images/levels/notforie6/warn.png diff --git a/sonar-server/src/main/webapp/images/levels/ok.png b/server/sonar-server/src/main/webapp/images/levels/ok.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/ok.png rename to server/sonar-server/src/main/webapp/images/levels/ok.png diff --git a/sonar-server/src/main/webapp/images/levels/warn.png b/server/sonar-server/src/main/webapp/images/levels/warn.png similarity index 100% rename from sonar-server/src/main/webapp/images/levels/warn.png rename to server/sonar-server/src/main/webapp/images/levels/warn.png diff --git a/sonar-server/src/main/webapp/images/links/c_link.png b/server/sonar-server/src/main/webapp/images/links/c_link.png similarity index 100% rename from sonar-server/src/main/webapp/images/links/c_link.png rename to server/sonar-server/src/main/webapp/images/links/c_link.png diff --git a/sonar-server/src/main/webapp/images/links/ci.png b/server/sonar-server/src/main/webapp/images/links/ci.png similarity index 100% rename from sonar-server/src/main/webapp/images/links/ci.png rename to server/sonar-server/src/main/webapp/images/links/ci.png diff --git a/sonar-server/src/main/webapp/images/links/external.png b/server/sonar-server/src/main/webapp/images/links/external.png similarity index 100% rename from sonar-server/src/main/webapp/images/links/external.png rename to server/sonar-server/src/main/webapp/images/links/external.png diff --git a/sonar-server/src/main/webapp/images/links/homepage.png b/server/sonar-server/src/main/webapp/images/links/homepage.png similarity index 100% rename from sonar-server/src/main/webapp/images/links/homepage.png rename to server/sonar-server/src/main/webapp/images/links/homepage.png diff --git a/sonar-server/src/main/webapp/images/links/issue.png b/server/sonar-server/src/main/webapp/images/links/issue.png similarity index 100% rename from sonar-server/src/main/webapp/images/links/issue.png rename to server/sonar-server/src/main/webapp/images/links/issue.png diff --git a/sonar-server/src/main/webapp/images/links/scm.png b/server/sonar-server/src/main/webapp/images/links/scm.png similarity index 100% rename from sonar-server/src/main/webapp/images/links/scm.png rename to server/sonar-server/src/main/webapp/images/links/scm.png diff --git a/sonar-server/src/main/webapp/images/links/scm_dev.png b/server/sonar-server/src/main/webapp/images/links/scm_dev.png similarity index 100% rename from sonar-server/src/main/webapp/images/links/scm_dev.png rename to server/sonar-server/src/main/webapp/images/links/scm_dev.png diff --git a/sonar-server/src/main/webapp/images/loading-small.gif b/server/sonar-server/src/main/webapp/images/loading-small.gif similarity index 100% rename from sonar-server/src/main/webapp/images/loading-small.gif rename to server/sonar-server/src/main/webapp/images/loading-small.gif diff --git a/sonar-server/src/main/webapp/images/loading.gif b/server/sonar-server/src/main/webapp/images/loading.gif similarity index 100% rename from sonar-server/src/main/webapp/images/loading.gif rename to server/sonar-server/src/main/webapp/images/loading.gif diff --git a/sonar-server/src/main/webapp/images/logo.png b/server/sonar-server/src/main/webapp/images/logo.png similarity index 100% rename from sonar-server/src/main/webapp/images/logo.png rename to server/sonar-server/src/main/webapp/images/logo.png diff --git a/sonar-server/src/main/webapp/images/menu_indicator.gif b/server/sonar-server/src/main/webapp/images/menu_indicator.gif similarity index 100% rename from sonar-server/src/main/webapp/images/menu_indicator.gif rename to server/sonar-server/src/main/webapp/images/menu_indicator.gif diff --git a/sonar-server/src/main/webapp/images/move.png b/server/sonar-server/src/main/webapp/images/move.png similarity index 100% rename from sonar-server/src/main/webapp/images/move.png rename to server/sonar-server/src/main/webapp/images/move.png diff --git a/sonar-server/src/main/webapp/images/navigator/favorite-filters.png b/server/sonar-server/src/main/webapp/images/navigator/favorite-filters.png similarity index 100% rename from sonar-server/src/main/webapp/images/navigator/favorite-filters.png rename to server/sonar-server/src/main/webapp/images/navigator/favorite-filters.png diff --git a/sonar-server/src/main/webapp/images/navigator/favorite-filters@2x.png b/server/sonar-server/src/main/webapp/images/navigator/favorite-filters@2x.png similarity index 100% rename from sonar-server/src/main/webapp/images/navigator/favorite-filters@2x.png rename to server/sonar-server/src/main/webapp/images/navigator/favorite-filters@2x.png diff --git a/sonar-server/src/main/webapp/images/new-window-11.gif b/server/sonar-server/src/main/webapp/images/new-window-11.gif similarity index 100% rename from sonar-server/src/main/webapp/images/new-window-11.gif rename to server/sonar-server/src/main/webapp/images/new-window-11.gif diff --git a/sonar-server/src/main/webapp/images/new-window-16.gif b/server/sonar-server/src/main/webapp/images/new-window-16.gif similarity index 100% rename from sonar-server/src/main/webapp/images/new-window-16.gif rename to server/sonar-server/src/main/webapp/images/new-window-16.gif diff --git a/sonar-server/src/main/webapp/images/nodata.png b/server/sonar-server/src/main/webapp/images/nodata.png similarity index 100% rename from sonar-server/src/main/webapp/images/nodata.png rename to server/sonar-server/src/main/webapp/images/nodata.png diff --git a/sonar-server/src/main/webapp/images/opensource-25x23.png b/server/sonar-server/src/main/webapp/images/opensource-25x23.png similarity index 100% rename from sonar-server/src/main/webapp/images/opensource-25x23.png rename to server/sonar-server/src/main/webapp/images/opensource-25x23.png diff --git a/sonar-server/src/main/webapp/images/overrides.png b/server/sonar-server/src/main/webapp/images/overrides.png similarity index 100% rename from sonar-server/src/main/webapp/images/overrides.png rename to server/sonar-server/src/main/webapp/images/overrides.png diff --git a/sonar-server/src/main/webapp/images/pencil-small.png b/server/sonar-server/src/main/webapp/images/pencil-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/pencil-small.png rename to server/sonar-server/src/main/webapp/images/pencil-small.png diff --git a/sonar-server/src/main/webapp/images/pencil.png b/server/sonar-server/src/main/webapp/images/pencil.png similarity index 100% rename from sonar-server/src/main/webapp/images/pencil.png rename to server/sonar-server/src/main/webapp/images/pencil.png diff --git a/sonar-server/src/main/webapp/images/permalink.gif b/server/sonar-server/src/main/webapp/images/permalink.gif similarity index 100% rename from sonar-server/src/main/webapp/images/permalink.gif rename to server/sonar-server/src/main/webapp/images/permalink.gif diff --git a/sonar-server/src/main/webapp/images/permalink.png b/server/sonar-server/src/main/webapp/images/permalink.png similarity index 100% rename from sonar-server/src/main/webapp/images/permalink.png rename to server/sonar-server/src/main/webapp/images/permalink.png diff --git a/sonar-server/src/main/webapp/images/print.gif b/server/sonar-server/src/main/webapp/images/print.gif similarity index 100% rename from sonar-server/src/main/webapp/images/print.gif rename to server/sonar-server/src/main/webapp/images/print.gif diff --git a/sonar-server/src/main/webapp/images/priority/0.gif b/server/sonar-server/src/main/webapp/images/priority/0.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/0.gif rename to server/sonar-server/src/main/webapp/images/priority/0.gif diff --git a/sonar-server/src/main/webapp/images/priority/0.png b/server/sonar-server/src/main/webapp/images/priority/0.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/0.png rename to server/sonar-server/src/main/webapp/images/priority/0.png diff --git a/sonar-server/src/main/webapp/images/priority/1.gif b/server/sonar-server/src/main/webapp/images/priority/1.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/1.gif rename to server/sonar-server/src/main/webapp/images/priority/1.gif diff --git a/sonar-server/src/main/webapp/images/priority/1.png b/server/sonar-server/src/main/webapp/images/priority/1.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/1.png rename to server/sonar-server/src/main/webapp/images/priority/1.png diff --git a/sonar-server/src/main/webapp/images/priority/2.gif b/server/sonar-server/src/main/webapp/images/priority/2.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/2.gif rename to server/sonar-server/src/main/webapp/images/priority/2.gif diff --git a/sonar-server/src/main/webapp/images/priority/2.png b/server/sonar-server/src/main/webapp/images/priority/2.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/2.png rename to server/sonar-server/src/main/webapp/images/priority/2.png diff --git a/sonar-server/src/main/webapp/images/priority/3.gif b/server/sonar-server/src/main/webapp/images/priority/3.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/3.gif rename to server/sonar-server/src/main/webapp/images/priority/3.gif diff --git a/sonar-server/src/main/webapp/images/priority/3.png b/server/sonar-server/src/main/webapp/images/priority/3.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/3.png rename to server/sonar-server/src/main/webapp/images/priority/3.png diff --git a/sonar-server/src/main/webapp/images/priority/4.gif b/server/sonar-server/src/main/webapp/images/priority/4.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/4.gif rename to server/sonar-server/src/main/webapp/images/priority/4.gif diff --git a/sonar-server/src/main/webapp/images/priority/4.png b/server/sonar-server/src/main/webapp/images/priority/4.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/4.png rename to server/sonar-server/src/main/webapp/images/priority/4.png diff --git a/sonar-server/src/main/webapp/images/priority/BLOCKER.gif b/server/sonar-server/src/main/webapp/images/priority/BLOCKER.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/BLOCKER.gif rename to server/sonar-server/src/main/webapp/images/priority/BLOCKER.gif diff --git a/sonar-server/src/main/webapp/images/priority/BLOCKER.png b/server/sonar-server/src/main/webapp/images/priority/BLOCKER.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/BLOCKER.png rename to server/sonar-server/src/main/webapp/images/priority/BLOCKER.png diff --git a/sonar-server/src/main/webapp/images/priority/CRITICAL.gif b/server/sonar-server/src/main/webapp/images/priority/CRITICAL.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/CRITICAL.gif rename to server/sonar-server/src/main/webapp/images/priority/CRITICAL.gif diff --git a/sonar-server/src/main/webapp/images/priority/CRITICAL.png b/server/sonar-server/src/main/webapp/images/priority/CRITICAL.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/CRITICAL.png rename to server/sonar-server/src/main/webapp/images/priority/CRITICAL.png diff --git a/sonar-server/src/main/webapp/images/priority/INFO.gif b/server/sonar-server/src/main/webapp/images/priority/INFO.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/INFO.gif rename to server/sonar-server/src/main/webapp/images/priority/INFO.gif diff --git a/sonar-server/src/main/webapp/images/priority/INFO.png b/server/sonar-server/src/main/webapp/images/priority/INFO.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/INFO.png rename to server/sonar-server/src/main/webapp/images/priority/INFO.png diff --git a/sonar-server/src/main/webapp/images/priority/MAJOR.gif b/server/sonar-server/src/main/webapp/images/priority/MAJOR.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/MAJOR.gif rename to server/sonar-server/src/main/webapp/images/priority/MAJOR.gif diff --git a/sonar-server/src/main/webapp/images/priority/MAJOR.png b/server/sonar-server/src/main/webapp/images/priority/MAJOR.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/MAJOR.png rename to server/sonar-server/src/main/webapp/images/priority/MAJOR.png diff --git a/sonar-server/src/main/webapp/images/priority/MINOR.gif b/server/sonar-server/src/main/webapp/images/priority/MINOR.gif similarity index 100% rename from sonar-server/src/main/webapp/images/priority/MINOR.gif rename to server/sonar-server/src/main/webapp/images/priority/MINOR.gif diff --git a/sonar-server/src/main/webapp/images/priority/MINOR.png b/server/sonar-server/src/main/webapp/images/priority/MINOR.png similarity index 100% rename from sonar-server/src/main/webapp/images/priority/MINOR.png rename to server/sonar-server/src/main/webapp/images/priority/MINOR.png diff --git a/sonar-server/src/main/webapp/images/q/BRC.png b/server/sonar-server/src/main/webapp/images/q/BRC.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/BRC.png rename to server/sonar-server/src/main/webapp/images/q/BRC.png diff --git a/sonar-server/src/main/webapp/images/q/CLA.png b/server/sonar-server/src/main/webapp/images/q/CLA.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/CLA.png rename to server/sonar-server/src/main/webapp/images/q/CLA.png diff --git a/sonar-server/src/main/webapp/images/q/DIR.png b/server/sonar-server/src/main/webapp/images/q/DIR.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/DIR.png rename to server/sonar-server/src/main/webapp/images/q/DIR.png diff --git a/sonar-server/src/main/webapp/images/q/FIL.png b/server/sonar-server/src/main/webapp/images/q/FIL.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/FIL.png rename to server/sonar-server/src/main/webapp/images/q/FIL.png diff --git a/sonar-server/src/main/webapp/images/q/LIB.png b/server/sonar-server/src/main/webapp/images/q/LIB.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/LIB.png rename to server/sonar-server/src/main/webapp/images/q/LIB.png diff --git a/sonar-server/src/main/webapp/images/q/PAC.png b/server/sonar-server/src/main/webapp/images/q/PAC.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/PAC.png rename to server/sonar-server/src/main/webapp/images/q/PAC.png diff --git a/sonar-server/src/main/webapp/images/q/SVW.png b/server/sonar-server/src/main/webapp/images/q/SVW.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/SVW.png rename to server/sonar-server/src/main/webapp/images/q/SVW.png diff --git a/sonar-server/src/main/webapp/images/q/TRK.png b/server/sonar-server/src/main/webapp/images/q/TRK.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/TRK.png rename to server/sonar-server/src/main/webapp/images/q/TRK.png diff --git a/sonar-server/src/main/webapp/images/q/UTS.png b/server/sonar-server/src/main/webapp/images/q/UTS.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/UTS.png rename to server/sonar-server/src/main/webapp/images/q/UTS.png diff --git a/sonar-server/src/main/webapp/images/q/VW.png b/server/sonar-server/src/main/webapp/images/q/VW.png similarity index 100% rename from sonar-server/src/main/webapp/images/q/VW.png rename to server/sonar-server/src/main/webapp/images/q/VW.png diff --git a/sonar-server/src/main/webapp/images/refresh.png b/server/sonar-server/src/main/webapp/images/refresh.png similarity index 100% rename from sonar-server/src/main/webapp/images/refresh.png rename to server/sonar-server/src/main/webapp/images/refresh.png diff --git a/sonar-server/src/main/webapp/images/restore.gif b/server/sonar-server/src/main/webapp/images/restore.gif similarity index 100% rename from sonar-server/src/main/webapp/images/restore.gif rename to server/sonar-server/src/main/webapp/images/restore.gif diff --git a/sonar-server/src/main/webapp/images/reviews/comment.png b/server/sonar-server/src/main/webapp/images/reviews/comment.png similarity index 100% rename from sonar-server/src/main/webapp/images/reviews/comment.png rename to server/sonar-server/src/main/webapp/images/reviews/comment.png diff --git a/sonar-server/src/main/webapp/images/rss-12x12.png b/server/sonar-server/src/main/webapp/images/rss-12x12.png similarity index 100% rename from sonar-server/src/main/webapp/images/rss-12x12.png rename to server/sonar-server/src/main/webapp/images/rss-12x12.png diff --git a/sonar-server/src/main/webapp/images/select2.png b/server/sonar-server/src/main/webapp/images/select2.png similarity index 100% rename from sonar-server/src/main/webapp/images/select2.png rename to server/sonar-server/src/main/webapp/images/select2.png diff --git a/sonar-server/src/main/webapp/images/select2x2.png b/server/sonar-server/src/main/webapp/images/select2x2.png similarity index 100% rename from sonar-server/src/main/webapp/images/select2x2.png rename to server/sonar-server/src/main/webapp/images/select2x2.png diff --git a/sonar-server/src/main/webapp/images/sep12.png b/server/sonar-server/src/main/webapp/images/sep12.png similarity index 100% rename from sonar-server/src/main/webapp/images/sep12.png rename to server/sonar-server/src/main/webapp/images/sep12.png diff --git a/sonar-server/src/main/webapp/images/sonar.png b/server/sonar-server/src/main/webapp/images/sonar.png similarity index 100% rename from sonar-server/src/main/webapp/images/sonar.png rename to server/sonar-server/src/main/webapp/images/sonar.png diff --git a/sonar-server/src/main/webapp/images/spinner.gif b/server/sonar-server/src/main/webapp/images/spinner.gif similarity index 100% rename from sonar-server/src/main/webapp/images/spinner.gif rename to server/sonar-server/src/main/webapp/images/spinner.gif diff --git a/sonar-server/src/main/webapp/images/star.png b/server/sonar-server/src/main/webapp/images/star.png similarity index 100% rename from sonar-server/src/main/webapp/images/star.png rename to server/sonar-server/src/main/webapp/images/star.png diff --git a/sonar-server/src/main/webapp/images/star_off.png b/server/sonar-server/src/main/webapp/images/star_off.png similarity index 100% rename from sonar-server/src/main/webapp/images/star_off.png rename to server/sonar-server/src/main/webapp/images/star_off.png diff --git a/sonar-server/src/main/webapp/images/status/CLOSED.png b/server/sonar-server/src/main/webapp/images/status/CLOSED.png similarity index 100% rename from sonar-server/src/main/webapp/images/status/CLOSED.png rename to server/sonar-server/src/main/webapp/images/status/CLOSED.png diff --git a/sonar-server/src/main/webapp/images/status/OPEN.png b/server/sonar-server/src/main/webapp/images/status/OPEN.png similarity index 100% rename from sonar-server/src/main/webapp/images/status/OPEN.png rename to server/sonar-server/src/main/webapp/images/status/OPEN.png diff --git a/sonar-server/src/main/webapp/images/status/REOPENED.png b/server/sonar-server/src/main/webapp/images/status/REOPENED.png similarity index 100% rename from sonar-server/src/main/webapp/images/status/REOPENED.png rename to server/sonar-server/src/main/webapp/images/status/REOPENED.png diff --git a/sonar-server/src/main/webapp/images/status/RESOLVED.png b/server/sonar-server/src/main/webapp/images/status/RESOLVED.png similarity index 100% rename from sonar-server/src/main/webapp/images/status/RESOLVED.png rename to server/sonar-server/src/main/webapp/images/status/RESOLVED.png diff --git a/sonar-server/src/main/webapp/images/tendency/-1-black-small.png b/server/sonar-server/src/main/webapp/images/tendency/-1-black-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-1-black-small.png rename to server/sonar-server/src/main/webapp/images/tendency/-1-black-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/-1-black.png b/server/sonar-server/src/main/webapp/images/tendency/-1-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-1-black.png rename to server/sonar-server/src/main/webapp/images/tendency/-1-black.png diff --git a/sonar-server/src/main/webapp/images/tendency/-1-green-small.png b/server/sonar-server/src/main/webapp/images/tendency/-1-green-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-1-green-small.png rename to server/sonar-server/src/main/webapp/images/tendency/-1-green-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/-1-green.png b/server/sonar-server/src/main/webapp/images/tendency/-1-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-1-green.png rename to server/sonar-server/src/main/webapp/images/tendency/-1-green.png diff --git a/sonar-server/src/main/webapp/images/tendency/-1-red-small.png b/server/sonar-server/src/main/webapp/images/tendency/-1-red-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-1-red-small.png rename to server/sonar-server/src/main/webapp/images/tendency/-1-red-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/-1-red.png b/server/sonar-server/src/main/webapp/images/tendency/-1-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-1-red.png rename to server/sonar-server/src/main/webapp/images/tendency/-1-red.png diff --git a/sonar-server/src/main/webapp/images/tendency/-2-black-small.png b/server/sonar-server/src/main/webapp/images/tendency/-2-black-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-2-black-small.png rename to server/sonar-server/src/main/webapp/images/tendency/-2-black-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/-2-black.png b/server/sonar-server/src/main/webapp/images/tendency/-2-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-2-black.png rename to server/sonar-server/src/main/webapp/images/tendency/-2-black.png diff --git a/sonar-server/src/main/webapp/images/tendency/-2-green-small.png b/server/sonar-server/src/main/webapp/images/tendency/-2-green-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-2-green-small.png rename to server/sonar-server/src/main/webapp/images/tendency/-2-green-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/-2-green.png b/server/sonar-server/src/main/webapp/images/tendency/-2-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-2-green.png rename to server/sonar-server/src/main/webapp/images/tendency/-2-green.png diff --git a/sonar-server/src/main/webapp/images/tendency/-2-red-small.png b/server/sonar-server/src/main/webapp/images/tendency/-2-red-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-2-red-small.png rename to server/sonar-server/src/main/webapp/images/tendency/-2-red-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/-2-red.png b/server/sonar-server/src/main/webapp/images/tendency/-2-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/-2-red.png rename to server/sonar-server/src/main/webapp/images/tendency/-2-red.png diff --git a/sonar-server/src/main/webapp/images/tendency/1-black-small.png b/server/sonar-server/src/main/webapp/images/tendency/1-black-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/1-black-small.png rename to server/sonar-server/src/main/webapp/images/tendency/1-black-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/1-black.png b/server/sonar-server/src/main/webapp/images/tendency/1-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/1-black.png rename to server/sonar-server/src/main/webapp/images/tendency/1-black.png diff --git a/sonar-server/src/main/webapp/images/tendency/1-green-small.png b/server/sonar-server/src/main/webapp/images/tendency/1-green-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/1-green-small.png rename to server/sonar-server/src/main/webapp/images/tendency/1-green-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/1-green.png b/server/sonar-server/src/main/webapp/images/tendency/1-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/1-green.png rename to server/sonar-server/src/main/webapp/images/tendency/1-green.png diff --git a/sonar-server/src/main/webapp/images/tendency/1-red-small.png b/server/sonar-server/src/main/webapp/images/tendency/1-red-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/1-red-small.png rename to server/sonar-server/src/main/webapp/images/tendency/1-red-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/1-red.png b/server/sonar-server/src/main/webapp/images/tendency/1-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/1-red.png rename to server/sonar-server/src/main/webapp/images/tendency/1-red.png diff --git a/sonar-server/src/main/webapp/images/tendency/2-black-small.png b/server/sonar-server/src/main/webapp/images/tendency/2-black-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/2-black-small.png rename to server/sonar-server/src/main/webapp/images/tendency/2-black-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/2-black.png b/server/sonar-server/src/main/webapp/images/tendency/2-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/2-black.png rename to server/sonar-server/src/main/webapp/images/tendency/2-black.png diff --git a/sonar-server/src/main/webapp/images/tendency/2-green-small.png b/server/sonar-server/src/main/webapp/images/tendency/2-green-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/2-green-small.png rename to server/sonar-server/src/main/webapp/images/tendency/2-green-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/2-green.png b/server/sonar-server/src/main/webapp/images/tendency/2-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/2-green.png rename to server/sonar-server/src/main/webapp/images/tendency/2-green.png diff --git a/sonar-server/src/main/webapp/images/tendency/2-red-small.png b/server/sonar-server/src/main/webapp/images/tendency/2-red-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/2-red-small.png rename to server/sonar-server/src/main/webapp/images/tendency/2-red-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/2-red.png b/server/sonar-server/src/main/webapp/images/tendency/2-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/2-red.png rename to server/sonar-server/src/main/webapp/images/tendency/2-red.png diff --git a/sonar-server/src/main/webapp/images/tendency/none-small.png b/server/sonar-server/src/main/webapp/images/tendency/none-small.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/none-small.png rename to server/sonar-server/src/main/webapp/images/tendency/none-small.png diff --git a/sonar-server/src/main/webapp/images/tendency/none.png b/server/sonar-server/src/main/webapp/images/tendency/none.png similarity index 100% rename from sonar-server/src/main/webapp/images/tendency/none.png rename to server/sonar-server/src/main/webapp/images/tendency/none.png diff --git a/sonar-server/src/main/webapp/images/test/ERROR.png b/server/sonar-server/src/main/webapp/images/test/ERROR.png similarity index 100% rename from sonar-server/src/main/webapp/images/test/ERROR.png rename to server/sonar-server/src/main/webapp/images/test/ERROR.png diff --git a/sonar-server/src/main/webapp/images/test/FAILURE.png b/server/sonar-server/src/main/webapp/images/test/FAILURE.png similarity index 100% rename from sonar-server/src/main/webapp/images/test/FAILURE.png rename to server/sonar-server/src/main/webapp/images/test/FAILURE.png diff --git a/sonar-server/src/main/webapp/images/test/OK.png b/server/sonar-server/src/main/webapp/images/test/OK.png similarity index 100% rename from sonar-server/src/main/webapp/images/test/OK.png rename to server/sonar-server/src/main/webapp/images/test/OK.png diff --git a/sonar-server/src/main/webapp/images/test/SKIPPED.png b/server/sonar-server/src/main/webapp/images/test/SKIPPED.png similarity index 100% rename from sonar-server/src/main/webapp/images/test/SKIPPED.png rename to server/sonar-server/src/main/webapp/images/test/SKIPPED.png diff --git a/sonar-server/src/main/webapp/images/tick.png b/server/sonar-server/src/main/webapp/images/tick.png similarity index 100% rename from sonar-server/src/main/webapp/images/tick.png rename to server/sonar-server/src/main/webapp/images/tick.png diff --git a/sonar-server/src/main/webapp/images/timemachine.png b/server/sonar-server/src/main/webapp/images/timemachine.png similarity index 100% rename from sonar-server/src/main/webapp/images/timemachine.png rename to server/sonar-server/src/main/webapp/images/timemachine.png diff --git a/sonar-server/src/main/webapp/images/transparent.gif b/server/sonar-server/src/main/webapp/images/transparent.gif similarity index 100% rename from sonar-server/src/main/webapp/images/transparent.gif rename to server/sonar-server/src/main/webapp/images/transparent.gif diff --git a/sonar-server/src/main/webapp/images/transparent_16.gif b/server/sonar-server/src/main/webapp/images/transparent_16.gif similarity index 100% rename from sonar-server/src/main/webapp/images/transparent_16.gif rename to server/sonar-server/src/main/webapp/images/transparent_16.gif diff --git a/sonar-server/src/main/webapp/images/treemap_gradient.png b/server/sonar-server/src/main/webapp/images/treemap_gradient.png similarity index 100% rename from sonar-server/src/main/webapp/images/treemap_gradient.png rename to server/sonar-server/src/main/webapp/images/treemap_gradient.png diff --git a/sonar-server/src/main/webapp/images/treemap_gradient_inverted.png b/server/sonar-server/src/main/webapp/images/treemap_gradient_inverted.png similarity index 100% rename from sonar-server/src/main/webapp/images/treemap_gradient_inverted.png rename to server/sonar-server/src/main/webapp/images/treemap_gradient_inverted.png diff --git a/sonar-server/src/main/webapp/images/treemap_icon.png b/server/sonar-server/src/main/webapp/images/treemap_icon.png similarity index 100% rename from sonar-server/src/main/webapp/images/treemap_icon.png rename to server/sonar-server/src/main/webapp/images/treemap_icon.png diff --git a/sonar-server/src/main/webapp/images/trend-up.png b/server/sonar-server/src/main/webapp/images/trend-up.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend-up.png rename to server/sonar-server/src/main/webapp/images/trend-up.png diff --git a/sonar-server/src/main/webapp/images/trend/-1-black-big.png b/server/sonar-server/src/main/webapp/images/trend/-1-black-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-1-black-big.png rename to server/sonar-server/src/main/webapp/images/trend/-1-black-big.png diff --git a/sonar-server/src/main/webapp/images/trend/-1-black.png b/server/sonar-server/src/main/webapp/images/trend/-1-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-1-black.png rename to server/sonar-server/src/main/webapp/images/trend/-1-black.png diff --git a/sonar-server/src/main/webapp/images/trend/-1-green-big.png b/server/sonar-server/src/main/webapp/images/trend/-1-green-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-1-green-big.png rename to server/sonar-server/src/main/webapp/images/trend/-1-green-big.png diff --git a/sonar-server/src/main/webapp/images/trend/-1-green.png b/server/sonar-server/src/main/webapp/images/trend/-1-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-1-green.png rename to server/sonar-server/src/main/webapp/images/trend/-1-green.png diff --git a/sonar-server/src/main/webapp/images/trend/-1-red-big.png b/server/sonar-server/src/main/webapp/images/trend/-1-red-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-1-red-big.png rename to server/sonar-server/src/main/webapp/images/trend/-1-red-big.png diff --git a/sonar-server/src/main/webapp/images/trend/-1-red.png b/server/sonar-server/src/main/webapp/images/trend/-1-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-1-red.png rename to server/sonar-server/src/main/webapp/images/trend/-1-red.png diff --git a/sonar-server/src/main/webapp/images/trend/-2-black-big.png b/server/sonar-server/src/main/webapp/images/trend/-2-black-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-2-black-big.png rename to server/sonar-server/src/main/webapp/images/trend/-2-black-big.png diff --git a/sonar-server/src/main/webapp/images/trend/-2-black.png b/server/sonar-server/src/main/webapp/images/trend/-2-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-2-black.png rename to server/sonar-server/src/main/webapp/images/trend/-2-black.png diff --git a/sonar-server/src/main/webapp/images/trend/-2-green-big.png b/server/sonar-server/src/main/webapp/images/trend/-2-green-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-2-green-big.png rename to server/sonar-server/src/main/webapp/images/trend/-2-green-big.png diff --git a/sonar-server/src/main/webapp/images/trend/-2-green.png b/server/sonar-server/src/main/webapp/images/trend/-2-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-2-green.png rename to server/sonar-server/src/main/webapp/images/trend/-2-green.png diff --git a/sonar-server/src/main/webapp/images/trend/-2-red-big.png b/server/sonar-server/src/main/webapp/images/trend/-2-red-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-2-red-big.png rename to server/sonar-server/src/main/webapp/images/trend/-2-red-big.png diff --git a/sonar-server/src/main/webapp/images/trend/-2-red.png b/server/sonar-server/src/main/webapp/images/trend/-2-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/-2-red.png rename to server/sonar-server/src/main/webapp/images/trend/-2-red.png diff --git a/sonar-server/src/main/webapp/images/trend/0-big.png b/server/sonar-server/src/main/webapp/images/trend/0-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/0-big.png rename to server/sonar-server/src/main/webapp/images/trend/0-big.png diff --git a/sonar-server/src/main/webapp/images/trend/0.png b/server/sonar-server/src/main/webapp/images/trend/0.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/0.png rename to server/sonar-server/src/main/webapp/images/trend/0.png diff --git a/sonar-server/src/main/webapp/images/trend/1-black-big.png b/server/sonar-server/src/main/webapp/images/trend/1-black-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/1-black-big.png rename to server/sonar-server/src/main/webapp/images/trend/1-black-big.png diff --git a/sonar-server/src/main/webapp/images/trend/1-black.png b/server/sonar-server/src/main/webapp/images/trend/1-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/1-black.png rename to server/sonar-server/src/main/webapp/images/trend/1-black.png diff --git a/sonar-server/src/main/webapp/images/trend/1-green-big.png b/server/sonar-server/src/main/webapp/images/trend/1-green-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/1-green-big.png rename to server/sonar-server/src/main/webapp/images/trend/1-green-big.png diff --git a/sonar-server/src/main/webapp/images/trend/1-green.png b/server/sonar-server/src/main/webapp/images/trend/1-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/1-green.png rename to server/sonar-server/src/main/webapp/images/trend/1-green.png diff --git a/sonar-server/src/main/webapp/images/trend/1-red-big.png b/server/sonar-server/src/main/webapp/images/trend/1-red-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/1-red-big.png rename to server/sonar-server/src/main/webapp/images/trend/1-red-big.png diff --git a/sonar-server/src/main/webapp/images/trend/1-red.png b/server/sonar-server/src/main/webapp/images/trend/1-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/1-red.png rename to server/sonar-server/src/main/webapp/images/trend/1-red.png diff --git a/sonar-server/src/main/webapp/images/trend/2-black-big.png b/server/sonar-server/src/main/webapp/images/trend/2-black-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/2-black-big.png rename to server/sonar-server/src/main/webapp/images/trend/2-black-big.png diff --git a/sonar-server/src/main/webapp/images/trend/2-black.png b/server/sonar-server/src/main/webapp/images/trend/2-black.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/2-black.png rename to server/sonar-server/src/main/webapp/images/trend/2-black.png diff --git a/sonar-server/src/main/webapp/images/trend/2-green-big.png b/server/sonar-server/src/main/webapp/images/trend/2-green-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/2-green-big.png rename to server/sonar-server/src/main/webapp/images/trend/2-green-big.png diff --git a/sonar-server/src/main/webapp/images/trend/2-green.png b/server/sonar-server/src/main/webapp/images/trend/2-green.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/2-green.png rename to server/sonar-server/src/main/webapp/images/trend/2-green.png diff --git a/sonar-server/src/main/webapp/images/trend/2-red-big.png b/server/sonar-server/src/main/webapp/images/trend/2-red-big.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/2-red-big.png rename to server/sonar-server/src/main/webapp/images/trend/2-red-big.png diff --git a/sonar-server/src/main/webapp/images/trend/2-red.png b/server/sonar-server/src/main/webapp/images/trend/2-red.png similarity index 100% rename from sonar-server/src/main/webapp/images/trend/2-red.png rename to server/sonar-server/src/main/webapp/images/trend/2-red.png diff --git a/sonar-server/src/main/webapp/images/up-blue-24.png b/server/sonar-server/src/main/webapp/images/up-blue-24.png similarity index 100% rename from sonar-server/src/main/webapp/images/up-blue-24.png rename to server/sonar-server/src/main/webapp/images/up-blue-24.png diff --git a/sonar-server/src/main/webapp/images/up_16.gif b/server/sonar-server/src/main/webapp/images/up_16.gif similarity index 100% rename from sonar-server/src/main/webapp/images/up_16.gif rename to server/sonar-server/src/main/webapp/images/up_16.gif diff --git a/sonar-server/src/main/webapp/images/user.gif b/server/sonar-server/src/main/webapp/images/user.gif similarity index 100% rename from sonar-server/src/main/webapp/images/user.gif rename to server/sonar-server/src/main/webapp/images/user.gif diff --git a/sonar-server/src/main/webapp/images/user.png b/server/sonar-server/src/main/webapp/images/user.png similarity index 100% rename from sonar-server/src/main/webapp/images/user.png rename to server/sonar-server/src/main/webapp/images/user.png diff --git a/sonar-server/src/main/webapp/images/warning.png b/server/sonar-server/src/main/webapp/images/warning.png similarity index 100% rename from sonar-server/src/main/webapp/images/warning.png rename to server/sonar-server/src/main/webapp/images/warning.png diff --git a/sonar-server/src/main/webapp/images/zoom.png b/server/sonar-server/src/main/webapp/images/zoom.png similarity index 100% rename from sonar-server/src/main/webapp/images/zoom.png rename to server/sonar-server/src/main/webapp/images/zoom.png diff --git a/sonar-server/src/main/webapp/robots.txt b/server/sonar-server/src/main/webapp/robots.txt similarity index 100% rename from sonar-server/src/main/webapp/robots.txt rename to server/sonar-server/src/main/webapp/robots.txt diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/activity/RubyQProfileActivityServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/RubyQProfileActivityServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/activity/RubyQProfileActivityServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/activity/RubyQProfileActivityServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ws/ActivitiesWebServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/ws/ActivitiesWebServiceMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/activity/ws/ActivitiesWebServiceMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/activity/ws/ActivitiesWebServiceMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/authentication/ws/AuthenticationWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/ChartFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/ChartFactoryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/ChartFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/ChartFactoryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/FakeChart.java b/server/sonar-server/src/test/java/org/sonar/server/charts/FakeChart.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/FakeChart.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/FakeChart.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BarChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BarChartTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/deprecated/BarChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BarChartTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartWebTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartWebTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartWebTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/BaseChartWebTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/deprecated/CustomBarChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/CustomBarChartTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/deprecated/CustomBarChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/CustomBarChartTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/deprecated/PieChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/PieChartTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/deprecated/PieChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/PieChartTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/charts/deprecated/SparkLinesChartTest.java b/server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/SparkLinesChartTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/charts/deprecated/SparkLinesChartTest.java rename to server/sonar-server/src/test/java/org/sonar/server/charts/deprecated/SparkLinesChartTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/ComponentQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentQueryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/ComponentQueryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/ComponentQueryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/persistence/ComponentDaoTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/ws/ResourcesWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseFactoryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigrationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigrationsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigrationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigrationsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/MassUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/MassUpdaterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/MassUpdaterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/MassUpdaterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/SqlUtilTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/SqlUtilTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/SqlUtilTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/SqlUtilTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ProgressTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ProgressTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ProgressTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ProgressTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationConvertersTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationConvertersTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationConvertersTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationConvertersTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java rename to server/sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java diff --git a/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java rename to server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWriterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWriterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWriterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java b/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java b/server/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/exceptions/VerificationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/exceptions/VerificationsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/exceptions/VerificationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/exceptions/VerificationsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/DefaultIssueFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/DefaultIssueFinderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/DefaultIssueFinderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/DefaultIssueFinderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeQueryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeQueryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeQueryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogFormatterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogFormatterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogFormatterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogFormatterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueStatsFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStatsFinderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssueStatsFinderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssueStatsFinderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/PlanActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/PlanActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/PlanActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/PlanActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueActionsWriterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueSearchActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterConditionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterConditionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterConditionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterConditionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterContextTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterContextTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterContextTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterContextTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterEngineTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterEngineTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterEngineTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterEngineTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterFactoryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/ws/TimeMachineWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/notifications/NotificationCenterTest.java b/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationCenterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/notifications/NotificationCenterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationCenterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/notifications/NotificationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/notifications/NotificationServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/notifications/NotificationTest.java b/server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/notifications/NotificationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/notifications/NotificationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/PermissionChangeQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionChangeQueryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/PermissionChangeQueryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/PermissionChangeQueryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerFileSystemTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerFileSystemTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/DefaultServerFileSystemTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerFileSystemTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/MasterServletFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/MasterServletFilterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/MasterServletFilterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/MasterServletFilterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ProfilingFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ProfilingFilterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ProfilingFilterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ProfilingFilterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/RailsAppsDeployerTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/RailsAppsDeployerTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/RailsAppsDeployerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/RailsAppsDeployerTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ServerIdGeneratorTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ServerSettingsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/SonarHomeTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/SonarHomeTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/SonarHomeTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/SonarHomeTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ws/L10nWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/L10nWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ws/L10nWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/L10nWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartHandlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartHandlerTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ws/RestartHandlerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartHandlerTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/InstalledPluginReferentialFactoryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/MimeTypesTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/MimeTypesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/MimeTypesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/MimeTypesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/PluginReferentialMetadataConverterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarsInstallerTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarsInstallerTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarsInstallerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarsInstallerTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/StaticResourcesServletTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleChangeMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInProfilesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInProfilesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInProfilesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInProfilesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileNameTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileNameTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileNameTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileNameTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRepositoryExporterTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRepositoryExporterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRepositoryExporterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRepositoryExporterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java rename to server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java rename to server/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/search/ESNodeTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/ESNodeTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/search/ESNodeTest.java rename to server/sonar-server/src/test/java/org/sonar/server/search/ESNodeTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/search/QueryOptionsTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/QueryOptionsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/search/QueryOptionsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/search/QueryOptionsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/search/ws/SearchOptionsTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/ws/SearchOptionsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/search/ws/SearchOptionsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/search/ws/SearchOptionsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/CodeColorizersTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/CodeColorizersTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/CodeColorizersTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/CodeColorizersTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/DeprecatedSourceDecoratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/DeprecatedSourceDecoratorTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/DeprecatedSourceDecoratorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/DeprecatedSourceDecoratorTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/ws/ScmWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmWriterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/ws/ScmWriterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmWriterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/CleanPreviewAnalysisCacheTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/CleanPreviewAnalysisCacheTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/CleanPreviewAnalysisCacheTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/CleanPreviewAnalysisCacheTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/GwtPublisherTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/GwtPublisherTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/GwtPublisherTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/GwtPublisherTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/JdbcDriverDeployerTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/RegisterServletFiltersTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/startup/ServerMetadataPersisterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageShowActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/test/ws/CoverageWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/CoverageWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/tester/BackendCleanup.java b/server/sonar-server/src/test/java/org/sonar/server/tester/BackendCleanup.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/tester/BackendCleanup.java rename to server/sonar-server/src/test/java/org/sonar/server/tester/BackendCleanup.java diff --git a/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java b/server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java rename to server/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java diff --git a/sonar-server/src/test/java/org/sonar/server/tester/package-info.java b/server/sonar-server/src/test/java/org/sonar/server/tester/package-info.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/tester/package-info.java rename to server/sonar-server/src/test/java/org/sonar/server/tester/package-info.java diff --git a/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java b/server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/text/RubyTextServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/FakePage.java b/server/sonar-server/src/test/java/org/sonar/server/ui/FakePage.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/FakePage.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/FakePage.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/FakeResourceViewer.java b/server/sonar-server/src/test/java/org/sonar/server/ui/FakeResourceViewer.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/FakeResourceViewer.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/FakeResourceViewer.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/FakeWidget.java b/server/sonar-server/src/test/java/org/sonar/server/ui/FakeWidget.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/FakeWidget.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/FakeWidget.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/JRubyI18nTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/JRubyI18nTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/JRubyI18nTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/JRubyI18nTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/JRubyProfilingTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/JRubyProfilingTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/JRubyProfilingTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/JRubyProfilingTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/ViewProxyTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ViewProxyTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/ViewProxyTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/ViewProxyTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ui/ViewsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ViewsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ui/ViewsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ui/ViewsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/DoPrivilegedTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/MockUserSession.java b/server/sonar-server/src/test/java/org/sonar/server/user/MockUserSession.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/MockUserSession.java rename to server/sonar-server/src/test/java/org/sonar/server/user/MockUserSession.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/MockUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/MockUserSessionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/MockUserSessionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/MockUserSessionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/NewUserNotifierTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/RubyUserSessionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/SecurityRealmFactoryTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/UserSessionFilterTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/UserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/UserSessionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/UserSessionTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/UserSessionTestUtils.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserSessionTestUtils.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/UserSessionTestUtils.java rename to server/sonar-server/src/test/java/org/sonar/server/user/UserSessionTestUtils.java diff --git a/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/RubyUtilsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/SlugTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/SlugTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/SlugTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/SlugTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ws/ListingWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/ListingWsTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ws/ListingWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ws/ListingWsTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java rename to server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java diff --git a/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java similarity index 100% rename from sonar-server/src/test/java/org/sonar/server/ws/WsTester.java rename to server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java diff --git a/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/one.js b/server/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/one.js similarity index 100% rename from sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/one.js rename to server/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/one.js diff --git a/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/two.css b/server/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/two.css similarity index 100% rename from sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/two.css rename to server/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module1/two.css diff --git a/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module2/file.js b/server/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module2/file.js similarity index 100% rename from sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module2/file.js rename to server/sonar-server/src/test/resources/org.sonar.server.startup.GwtPublisherTest.module2/file.js diff --git a/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/empty.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/empty.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/insert-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/insert-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/insert-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/shared.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/component/persistence/ComponentDaoTest/shared.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_extension_having_permission.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_issues_measures_when_period_is_set.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_manual_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures_when_period_is_set.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_periods.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_rules_when_period_is_set.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_severities_when_period_is_set.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_sub_project_equals_to_project.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_sub_project_equals_to_project.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_sub_project_equals_to_project.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_sub_project_equals_to_project.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tabs.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tests_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tests_measure.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tests_measure.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_tests_measure.json diff --git a/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_without_sub_project.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_without_sub_project.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_without_sub_project.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_without_sub_project.json diff --git a/sonar-server/src/test/resources/org/sonar/server/db/invalid_db_data_file b/server/sonar-server/src/test/resources/org/sonar/server/db/invalid_db_data_file similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/invalid_db_data_file rename to server/sonar-server/src/test/resources/org/sonar/server/db/invalid_db_data_file diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/ignore_null_rows.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/ignore_null_rows.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/ignore_null_rows.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/ignore_null_rows.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/migrate_data_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/MassUpdaterTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/migrate_violations_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/no_violations_to_migrate_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v36/ViolationMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/after.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/after.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/after.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/after.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/before.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/before.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/before.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/before.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/after.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/after.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/after.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/after.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/before.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/before.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/before.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/before.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/migrate_issues_debt_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/migrate_dev_cost_measures_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/migrate_issue_changelog_debt_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/IssueChangelogMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/migrate_issues_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/migrate_measures_on_requirements_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_new_technical_debt_measures_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_sqale_measures_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/migrate_technical_debt_measures_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/active_rules_changes.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/active_rules_changes.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/active_rules_changes.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/active_rules_changes.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/migrate_when_no_changelog.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/migrate_when_no_changelog.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/migrate_when_no_changelog.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/migrate_when_no_changelog.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/before.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/before.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/before.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/before.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/feed_keys.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/feed_keys.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/feed_keys.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/feed_keys.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/migrate_issues_action_plan_key_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data.xml rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/migrate_measure_data.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/convert_network_use_key.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/fail_on_bad_xml.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_badly_formatted_xml.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtCharacteristicsXMLImporterTest/import_characteristics.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml b/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml rename to server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml b/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml rename to server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/complex_duplication.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml b/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml rename to server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_removed_file.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml b/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml rename to server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_file.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml b/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml rename to server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplication_on_same_project.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml b/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml rename to server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_different_project.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml b/server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml rename to server/sonar-server/src/test/resources/org/sonar/server/duplication/ws/DuplicationsParserTest/duplications_on_many_blocks.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/filters/FilterExecutorTest/views.xml b/server/sonar-server/src/test/resources/org/sonar/server/filters/FilterExecutorTest/views.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/filters/FilterExecutorTest/views.xml rename to server/sonar-server/src/test/resources/org/sonar/server/filters/FilterExecutorTest/views.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/empty.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/anonymous_page.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/anonymous_page.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/anonymous_page.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/anonymous_page.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_favorites.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_favorites.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_favorites.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_favorites.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_selected_filter.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_selected_filter.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_selected_filter.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/logged_in_page_with_selected_filter.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/selected_filter_can_not_be_modified.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/selected_filter_can_not_be_modified.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/selected_filter_can_not_be_modified.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/filter/AppActionTest/selected_filter_can_not_be_modified.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/filter/ShowActionTest/show_filter.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/filter/ShowActionTest/show_filter.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/filter/ShowActionTest/show_filter.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/filter/ShowActionTest/show_filter.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_action_plans.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_action_plans.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_action_plans.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_action_plans.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_attributes.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_attributes.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_attributes.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_attributes.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_comments.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_comments.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_comments.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_comments.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_components.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_components.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_components.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_components.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_dates.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_dates.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_dates.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_dates.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_debt.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_extra_fields.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_extra_fields.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_extra_fields.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_extra_fields.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_sub_project.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_sub_project.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_sub_project.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_sub_project.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_users.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_users.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_users.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueSearchActionTest/issues_with_users.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_component.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_component.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_component.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_component.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_project_and_component.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_project_and_component.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_project_and_component.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_project_and_component.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_action_plan.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_action_plan.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_action_plan.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_action_plan.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_actions.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_actions.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_actions.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_actions.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_changelog.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_changelog.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_changelog.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_changelog.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_characteristics.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_characteristics.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_characteristics.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_characteristics.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_comments.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_comments.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_comments.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_comments.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_dates.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_dates.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_dates.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_dates.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_transitions.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_transitions.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_transitions.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_transitions.json diff --git a/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_users.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_users.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_users.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_users.json diff --git a/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml rename to server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml rename to server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MeasureDaoTest/shared.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar b/server/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar rename to server/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.jar b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.jar rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules2.jar b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules2.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules2.jar rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindCheckstyleExtensions/extensions/rules/checkstyle/my-rules2.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin1.jar b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin1.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin1.jar rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin1.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin2.jar b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin2.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin2.jar rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldFindPlugins/extensions/plugins/plugin2.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoCheckstyleExtensions/extensions/rules/pmd/pmd.xml b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoCheckstyleExtensions/extensions/rules/pmd/pmd.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoCheckstyleExtensions/extensions/rules/pmd/pmd.xml rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoCheckstyleExtensions/extensions/rules/pmd/pmd.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoPlugins/extensions/plugins/nojar.txt b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoPlugins/extensions/plugins/nojar.txt similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoPlugins/extensions/plugins/nojar.txt rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/shouldNotFailIfNoPlugins/extensions/plugins/nojar.txt diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/mysql/fake.jar b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/mysql/fake.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/mysql/fake.jar rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/mysql/fake.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/none/nojar.txt b/server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/none/nojar.txt similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/none/nojar.txt rename to server/sonar-server/src/test/resources/org/sonar/server/platform/DefaultServerFileSystemTest/testGetJdbcDriver/extensions/jdbc-driver/none/nojar.txt diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/RailsAppsDeployerTest/FakeRubyRailsApp.jar b/server/sonar-server/src/test/resources/org/sonar/server/platform/RailsAppsDeployerTest/FakeRubyRailsApp.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/RailsAppsDeployerTest/FakeRubyRailsApp.jar rename to server/sonar-server/src/test/resources/org/sonar/server/platform/RailsAppsDeployerTest/FakeRubyRailsApp.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties b/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties rename to server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt b/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt rename to server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt b/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt rename to server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/extension.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/extension.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/extension.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/extension.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/foo-plugin.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/foo-plugin.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/foo-plugin.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/foo-plugin.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/sonar-build-breaker-plugin-0.1.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/sonar-build-breaker-plugin-0.1.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/sonar-build-breaker-plugin-0.1.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginClassLoadersTest/sonar-build-breaker-plugin-0.1.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version1/extension.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version1/extension.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version1/extension.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version1/extension.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version2/extension.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version2/extension.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version2/extension.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginExtensionMetadataTest/version2/extension.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-1.0.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-1.0.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-1.0.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-1.0.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-2.0.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-2.0.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-2.0.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/foo-plugin-2.0.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/not-a-plugin.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/not-a-plugin.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/not-a-plugin.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/not-a-plugin.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/old-plugin.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/old-plugin.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/old-plugin.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataLoaderTest/old-plugin.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataTest/foo-plugin.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataTest/foo-plugin.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataTest/foo-plugin.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/PluginMetadataTest/foo-plugin.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/bar-plugin-1.0.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/bar-plugin-1.0.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/bar-plugin-1.0.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/bar-plugin-1.0.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-1.0.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-1.0.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-1.0.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-1.0.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-2.0.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-2.0.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-2.0.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/foo-plugin-2.0.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/not-a-plugin.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/not-a-plugin.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/not-a-plugin.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/not-a-plugin.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/require-sq-2.5.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/require-sq-2.5.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/require-sq-2.5.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginJarsInstallerTest/require-sq-2.5.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ServerPluginRepositoryTest/sonar-artifact-size-plugin-0.2.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/bad-xml-backup.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/bad-xml-backup.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/bad-xml-backup.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/bad-xml-backup.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/empty.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/empty.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/expected-backup.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/expected-backup.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/expected-backup.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/expected-backup.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/keep_other_inherited_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/keep_other_inherited_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/keep_other_inherited_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/keep_other_inherited_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/not-xml-backup.txt b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/not-xml-backup.txt similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/not-xml-backup.txt rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/not-xml-backup.txt diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-child.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-child.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-child.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-child.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-parent.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-parent.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-parent.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore-parent.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/restore.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_rule-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_rule-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_rule-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_from_rule-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameter-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameter-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameter-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameter-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/empty.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/empty.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/insert_parameter.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/shared.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/shared.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update_parameter-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update_parameter-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update_parameter-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/db/ActiveRuleDaoTest/update_parameter-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/empty.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/empty.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_extended_repositories-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_extended_repositories-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_extended_repositories-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_extended_repositories-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/shared.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/shared.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/removed_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule1.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule2.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/RuleRegistryTest/shared/rule3.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/empty.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/empty.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectParameters.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectParameters.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectParameters.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectParameters.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_sub_characteristic_id.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_sub_characteristic_id.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_sub_characteristic_id.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_sub_characteristic_id.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_id.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_id.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_id.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_id.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_ids.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_ids.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_ids.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_ids.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter.xml rename to server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_custom_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_custom_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_custom_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_custom_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule_without_severity.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule_without_severity.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule_without_severity.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_manual_rule_without_severity.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_rule_with_prevent_reactivation_param_to_true.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_rule_with_prevent_reactivation_param_to_true.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_rule_with_prevent_reactivation_param_to_true.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/CreateActionMediumTest/create_rule_with_prevent_reactivation_param_to_true.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleSearchWsHandlerTest/search_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_manuel_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_dates.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_note.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RuleShowWsHandlerTest/show_rule_with_tags.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_custom_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_manual_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_manual_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_manual_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/encode_html_description_of_manual_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_and_overridden_debt_infos.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_no_default_and_no_overridden_debt.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_debt_infos.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_disable_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_disable_debt.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_disable_debt.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_overridden_disable_debt.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/UpdateActionMediumTest/update_custom_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-clean.zip b/server/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-clean.zip similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-clean.zip rename to server/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-clean.zip diff --git a/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-corrupt.zip b/server/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-corrupt.zip similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-corrupt.zip rename to server/sonar-server/src/test/resources/org/sonar/server/search/ESNodeTest/data-es-corrupt.zip diff --git a/sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json rename to server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source.json diff --git a/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json rename to server/sonar-server/src/test/resources/org/sonar/server/source/ws/ShowActionTest/show_source_with_params_from_and_to.json diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/convert_constant_issue_with_coeff_to_constant_issue_with_offset_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/do_nothing_when_already_executed_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics_result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics_result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics_result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/remove_requirements_data_from_characteristics_result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql rename to server/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/one.js b/server/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/one.js similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/one.js rename to server/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/one.js diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/two.js b/server/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/two.js similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/two.js rename to server/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/myview/two.js diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/path with space/archive.jar b/server/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/path with space/archive.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/path with space/archive.jar rename to server/sonar-server/src/test/resources/org/sonar/server/startup/GwtPublisherTest/path with space/archive.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/JdbcDriverDeployerTest/deploy/my-driver.jar b/server/sonar-server/src/test/resources/org/sonar/server/startup/JdbcDriverDeployerTest/deploy/my-driver.jar similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/JdbcDriverDeployerTest/deploy/my-driver.jar rename to server/sonar-server/src/test/resources/org/sonar/server/startup/JdbcDriverDeployerTest/deploy/my-driver.jar diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldAddUserManagesMetric.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldEnableOnlyLoadedMetrics.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldEnableOnlyLoadedMetrics.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldEnableOnlyLoadedMetrics.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldEnableOnlyLoadedMetrics.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml rename to server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage.json diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_integration_test.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_integration_test.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_integration_test.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_integration_test.json diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_overall_test.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_overall_test.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_overall_test.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_for_overall_test.json diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoverageShowActionTest/show_coverage_with_from_and_to.json diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json diff --git a/sonar-server/src/test/resources/org/sonar/server/user/GroupMembershipServiceTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/GroupMembershipServiceTest/shared.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/user/GroupMembershipServiceTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/user/GroupMembershipServiceTest/shared.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list.json b/server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list.json rename to server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list.json diff --git a/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list_including_internals.json b/server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list_including_internals.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list_including_internals.json rename to server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/list_including_internals.json diff --git a/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/metrics_example.json b/server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/metrics_example.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/metrics_example.json rename to server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/metrics_example.json diff --git a/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/response_example.json b/server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/response_example.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/response_example.json rename to server/sonar-server/src/test/resources/org/sonar/server/ws/ListingWsTest/response_example.json