You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jo...@apache.org on 2018/08/22 17:55:14 UTC
[incubator-netbeans] branch master updated: [NETBEANS-1165] nb
cluster move (#748)
This is an automated email from the ASF dual-hosted git repository.
johnmcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new ad14311 [NETBEANS-1165] nb cluster move (#748)
ad14311 is described below
commit ad14311d97385092cceb479be8101a8e18b30195
Author: John McDonnell <mc...@gmail.com>
AuthorDate: Wed Aug 22 18:55:11 2018 +0100
[NETBEANS-1165] nb cluster move (#748)
* Moving nb modules into nb subdirectory
* Adjusting relative paths of the moved build files
---
.../autoupdate.pluginimporter}/build.xml | 4 ++--
.../autoupdate.pluginimporter}/licenseinfo.xml | 0
.../autoupdate.pluginimporter}/manifest.mf | 0
.../autoupdate.pluginimporter}/nbproject/project.properties | 0
.../autoupdate.pluginimporter}/nbproject/project.xml | 0
.../modules/autoupdate/pluginimporter/Bundle.properties | 0
.../autoupdate/pluginimporter/ClusterUpdateProvider.java | 0
.../modules/autoupdate/pluginimporter/ImportManager.form | 0
.../modules/autoupdate/pluginimporter/ImportManager.java | 0
.../modules/autoupdate/pluginimporter/Installer.java | 0
.../modules/autoupdate/pluginimporter/PluginImporter.java | 0
.../pluginimporter/libinstaller/Bundle.properties | 0
.../pluginimporter/libinstaller/InstallLibraryTask.java | 0
.../pluginimporter/libinstaller/JUnitLibraryInstaller.java | 0
.../modules/autoupdate/pluginimporter/resources/import.png | Bin
.../autoupdate/pluginimporter/resources/info_icon.png | Bin
.../modules/autoupdate/pluginimporter/resources/warning.gif | Bin
.../bugzilla.exceptionreporter}/build.xml | 4 ++--
.../bugzilla.exceptionreporter}/manifest.mf | 0
.../nbproject/project.properties | 0
.../bugzilla.exceptionreporter}/nbproject/project.xml | 0
.../modules/bugzilla/exceptionreporter/Bundle.properties | 0
.../bugzilla/exceptionreporter/NBBugzillaAccessorImpl.java | 0
.../bugzilla/exceptionreporter/ReportNBIssueAction.java | 0
{deadlock.detector => nb/deadlock.detector}/build.xml | 4 ++--
{deadlock.detector => nb/deadlock.detector}/manifest.mf | 0
.../deadlock.detector}/nbproject/project.properties | 0
.../deadlock.detector}/nbproject/project.xml | 0
.../netbeans/modules/deadlock/detector/Bundle.properties | 0
.../org/netbeans/modules/deadlock/detector/Detector.java | 0
.../org/netbeans/modules/deadlock/detector/Installer.java | 0
.../netbeans/modules/deadlock/detector/DetectorTest.java | 0
{ide.branding.kit => nb/ide.branding.kit}/build.xml | 4 ++--
{ide.branding.kit => nb/ide.branding.kit}/manifest.mf | 0
.../ide.branding.kit}/nbproject/project.properties | 0
.../ide.branding.kit}/nbproject/project.xml | 0
.../ide.branding.kit}/release/VERSION.txt | 0
.../org/netbeans/modules/ide/branding/kit/Bundle.properties | 0
.../libsrc/org/netbeans/updater/Bundle_nb.properties | 0
.../org/netbeans/updater/resources/updatersplash_nb.gif | Bin
.../org/netbeans/modules/autoupdate/ui/Bundle_nb.properties | 0
.../modules/autoupdate/ui/actions/Bundle_nb.properties | 0
.../modules/autoupdate/ui/wizards/Bundle_nb.properties | 0
{ide.branding => nb/ide.branding}/build.xml | 4 ++--
.../src/org/netbeans/core/netigso/Bundle_nb.properties | 0
.../src/org/netbeans/core/startup/Bundle_nb.properties | 0
.../src/org/netbeans/core/startup/about_dark_nb.png | Bin
.../core.startup/src/org/netbeans/core/startup/about_nb.png | Bin
.../src/org/netbeans/core/startup/frame32_dark_nb.gif | Bin
.../src/org/netbeans/core/startup/frame32_nb.gif | Bin
.../src/org/netbeans/core/startup/frame48_dark_nb.gif | Bin
.../src/org/netbeans/core/startup/frame48_nb.gif | Bin
.../src/org/netbeans/core/startup/frame_dark_nb.gif | Bin
.../core.startup/src/org/netbeans/core/startup/frame_nb.gif | Bin
.../src/org/netbeans/core/startup/splash_dark_nb.gif | Bin
.../src/org/netbeans/core/startup/splash_nb.gif | Bin
.../src/org/netbeans/core/ui/sampler/Bundle_nb.properties | 0
.../src/org/netbeans/core/windows/Bundle_nb.properties | 0
.../org/netbeans/core/windows/view/ui/Bundle_nb.properties | 0
{ide.branding => nb/ide.branding}/l10n.list | 0
{ide.branding => nb/ide.branding}/licenseinfo.xml | 0
{ide.branding => nb/ide.branding}/manifest.mf | 0
.../ide.branding}/nbproject/project.properties | 0
{ide.branding => nb/ide.branding}/nbproject/project.xml | 0
.../o.n.core/src/org/netbeans/core/Bundle_nb.properties | 0
.../netbeans/modules/options/export/Bundle_nb.properties | 0
.../ide.branding}/release-toplevel/CREDITS.html | 0
.../ide.branding}/release-toplevel/README.html | 0
.../ide.branding}/release-toplevel/netbeans.css | 0
{ide.branding => nb/ide.branding}/release/netbeans.icns | Bin
{ide.branding => nb/ide.branding}/release/netbeans.png | Bin
{ide.branding => nb/ide.branding}/release/shortcuts.pdf | Bin
{ide.branding => nb/ide.branding}/release/shortcuts_mac.pdf | Bin
.../netbeans/modules/quicksearch/web/Bundle_nb.properties | 0
.../src/org/netbeans/modules/ide/branding/Bundle.properties | 0
.../src/org/netbeans/modules/ide/branding/layer.xml | 0
.../modules/ide/branding/SaveIsAsynchronousTest.java | 0
.../org/netbeans/modules/exceptions/Bundle_nb.properties | 0
.../src/org/netbeans/modules/uihandler/Bundle_nb.properties | 0
{o.n.upgrader => nb/o.n.upgrader}/arch.xml | 4 ++--
{o.n.upgrader => nb/o.n.upgrader}/build.xml | 4 ++--
{o.n.upgrader => nb/o.n.upgrader}/manifest.mf | 0
.../o.n.upgrader}/nbproject/project.properties | 0
{o.n.upgrader => nb/o.n.upgrader}/nbproject/project.xml | 0
.../src/org/netbeans/license/AcceptLicense.java | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/AutoUpgrade.java | 0
.../src/org/netbeans/upgrade/AutoUpgradePanel.form | 0
.../src/org/netbeans/upgrade/AutoUpgradePanel.java | 0
.../src/org/netbeans/upgrade/Bundle.properties | 0
.../src/org/netbeans/upgrade/ColoringStorage.java | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/Copy.java | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/CopyFiles.java | 0
.../src/org/netbeans/upgrade/IncludeExclude.java | 0
.../src/org/netbeans/upgrade/PathTransformation.java | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/XMLStorage.java | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/copy5.5 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/copy5.5.1 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/copy6.0 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/copy6.1 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/copy6.5 | 0
.../src/org/netbeans/upgrade/copyjstudio_6me_user | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/layer5.5.1.xml | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/layer5.5.xml | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/layer6.0.xml | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/layer6.1.xml | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/nonstandard5.5 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/nonstandard5.5.1 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/nonstandard6.0 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/nonstandard6.1 | 0
.../o.n.upgrader}/src/org/netbeans/upgrade/nonstandard6.5 | 0
.../org/netbeans/upgrade/systemoptions/ColorProcessor.java | 0
.../netbeans/upgrade/systemoptions/ContentProcessor.java | 0
.../upgrade/systemoptions/CvsSettingsProcessor.java | 0
.../org/netbeans/upgrade/systemoptions/DefaultResult.java | 0
.../systemoptions/DocumentationSettingsProcessor.java | 0
.../org/netbeans/upgrade/systemoptions/FileProcessor.java | 0
.../netbeans/upgrade/systemoptions/HashMapProcessor.java | 0
.../netbeans/upgrade/systemoptions/HashSetProcessor.java | 0
.../upgrade/systemoptions/HostPropertyProcessor.java | 0
.../src/org/netbeans/upgrade/systemoptions/Importer.java | 0
.../upgrade/systemoptions/IntrospectedInfoProcessor.java | 0
.../upgrade/systemoptions/JUnitContentProcessor.java | 0
.../org/netbeans/upgrade/systemoptions/ListProcessor.java | 0
.../upgrade/systemoptions/NbClassPathProcessor.java | 0
.../netbeans/upgrade/systemoptions/PropertiesStorage.java | 0
.../netbeans/upgrade/systemoptions/PropertyProcessor.java | 0
.../src/org/netbeans/upgrade/systemoptions/Result.java | 0
.../src/org/netbeans/upgrade/systemoptions/SerParser.java | 0
.../netbeans/upgrade/systemoptions/SettingsRecognizer.java | 0
.../upgrade/systemoptions/StringPropertyProcessor.java | 0
.../netbeans/upgrade/systemoptions/SystemOptionsParser.java | 0
.../netbeans/upgrade/systemoptions/TaskTagsProcessor.java | 0
.../org/netbeans/upgrade/systemoptions/URLProcessor.java | 0
.../src/org/netbeans/upgrade/systemoptions/Utils.java | 0
.../org/netbeans/upgrade/systemoptions/systemoptionsimport | 0
.../o.n.upgrader}/src/org/netbeans/util/Util.java | 0
.../test/unit/src/org/netbeans/upgrade/AutoUpgradeTest.java | 0
.../test/unit/src/org/netbeans/upgrade/CopyFilesTest.java | 0
.../test/unit/src/org/netbeans/upgrade/CopyTest.java | 0
.../unit/src/org/netbeans/upgrade/IncludeExcludeTest.java | 0
.../test/unit/src/org/netbeans/upgrade/copyfoo | 0
.../src/org/netbeans/upgrade/launcher/MainCallback.java | 0
.../upgrade/launcher/PlatformWithAbsolutePathTest.java | 0
.../test/unit/src/org/netbeans/upgrade/layerfoo.xml | 0
.../systemoptions/AntSettings-null-ant-home.settings | 0
.../upgrade/systemoptions/AntSettingsNullAntHomeTest.java | 0
.../org/netbeans/upgrade/systemoptions/AntSettingsTest.java | 0
.../netbeans/upgrade/systemoptions/BasicTestForImport.java | 0
.../netbeans/upgrade/systemoptions/CoreSettingsTest.java | 0
.../org/netbeans/upgrade/systemoptions/CvsSettingsTest.java | 0
.../netbeans/upgrade/systemoptions/DataBaseOptionTest.java | 0
.../netbeans/upgrade/systemoptions/DerbyOptionsTest.java | 0
.../upgrade/systemoptions/DocumentationSettingsTest.java | 0
.../netbeans/upgrade/systemoptions/FormSettingsTest.java | 0
.../upgrade/systemoptions/HttpServerSettingsTest.java | 0
.../org/netbeans/upgrade/systemoptions/I18nOptionsTest.java | 0
.../org/netbeans/upgrade/systemoptions/IDESettingsTest.java | 0
.../netbeans/upgrade/systemoptions/JUnitSettingsTest.java | 0
.../netbeans/upgrade/systemoptions/JavaSettingsTest.java | 0
.../upgrade/systemoptions/ModuleUISettingsTest.java | 0
.../upgrade/systemoptions/PackageViewSettingsTest.java | 0
.../upgrade/systemoptions/ProjectUIOptionsTest.java | 0
.../org/netbeans/upgrade/systemoptions/SvnSettingsTest.java | 0
.../upgrade/systemoptions/TaskListSettingsTest.java | 0
.../netbeans/upgrade/systemoptions/formsettings.settings | 0
.../netbeans/upgrade/systemoptions/javaSettings.settings | 0
.../org-apache-tools-ant-module-AntSettings.settings | 0
.../systemoptions/org-netbeans-core-IDESettings.settings | 0
...netbeans-modules-apisupport-project-ui-ModuleUI.settings | 0
...org-netbeans-modules-db-explorer-DatabaseOption.settings | 0
.../org-netbeans-modules-derby-DerbyOptions.settings | 0
...-netbeans-modules-httpserver-HttpServerSettings.settings | 0
.../org-netbeans-modules-i18n-I18nOptions.settings | 0
...tbeans-modules-java-project-packageViewSettings.settings | 0
...-modules-javadoc-settings-DocumentationSettings.settings | 0
.../org-netbeans-modules-junit-JUnitSettings.settings | 0
...org-netbeans-modules-project-ui-OpenProjectList.settings | 0
...ans-modules-subversion-settings-SvnModuleConfig.settings | 0
.../org-netbeans-modules-tasklist-docscan-Settings.settings | 0
...versioning-system-cvss-settings-CvsModuleConfig.settings | 0
...netbeans-modules-xml-core-settings-CoreSettings.settings | 0
.../uihandler.exceptionreporter}/build.xml | 4 ++--
.../uihandler.exceptionreporter}/manifest.mf | 0
.../nbproject/project.properties | 0
.../uihandler.exceptionreporter}/nbproject/project.xml | 0
.../modules/uihandler/exceptionreporter/Bundle.properties | 0
.../modules/uihandler/exceptionreporter/Installer.java | 0
{updatecenters => nb/updatecenters}/build.xml | 4 ++--
{updatecenters => nb/updatecenters}/licenseinfo.xml | 0
{updatecenters => nb/updatecenters}/manifest.mf | 0
.../updatecenters}/nbproject/project.properties | 0
{updatecenters => nb/updatecenters}/nbproject/project.xml | 0
{updatecenters => nb/updatecenters}/release/core/ide.ks | Bin
.../modules/updatecenters/resources/Bundle.properties | 0
.../updatecenters/resources/NetBeansClusterCreator.java | 0
.../updatecenters/resources/NetBeansKeyStoreProvider.java | 0
.../netbeans/modules/updatecenters/resources/mf-layer.xml | 0
.../modules/updatecenters/resources/updateAction.gif | Bin
.../unit/src/org/netbeans/updatecenters/CountsStruct.java | 0
.../unit/src/org/netbeans/updatecenters/OperationUtils.java | 0
.../src/org/netbeans/updatecenters/install/InstallTest.java | 0
.../netbeans/updatecenters/install/ValidateInstallTest.java | 0
.../org/netbeans/updatecenters/uninstall/UninstallTest.java | 0
.../updatecenters/uninstall/ValidateUninstallTest.java | 0
.../src/org/netbeans/updatecenters/update/UpdateTest.java | 0
.../netbeans/updatecenters/update/ValidateUpdateTest.java | 0
{welcome => nb/welcome}/build.xml | 4 ++--
{welcome => nb/welcome}/l10n.list | 0
{welcome => nb/welcome}/licenseinfo.xml | 0
{welcome => nb/welcome}/manifest.mf | 0
{welcome => nb/welcome}/nbproject/project.properties | 0
{welcome => nb/welcome}/nbproject/project.xml | 0
.../welcome}/release/docs/GUIExamplesDescription.html | 0
.../welcome}/release/docs/SwingInteropDescription.html | 0
{welcome => nb/welcome}/release/docs/images/background.png | Bin
{welcome => nb/welcome}/release/docs/images/banner-left.png | Bin
.../welcome}/release/docs/images/banner-right.png | Bin
{welcome => nb/welcome}/release/docs/images/blue.png | Bin
{welcome => nb/welcome}/release/docs/images/circle1.gif | Bin
{welcome => nb/welcome}/release/docs/images/circle2.gif | Bin
{welcome => nb/welcome}/release/docs/images/circle3.gif | Bin
{welcome => nb/welcome}/release/docs/images/circle4.gif | Bin
{welcome => nb/welcome}/release/docs/images/circle5.gif | Bin
{welcome => nb/welcome}/release/docs/images/circle6.gif | Bin
{welcome => nb/welcome}/release/docs/images/down-left.png | Bin
{welcome => nb/welcome}/release/docs/images/down-right.png | Bin
{welcome => nb/welcome}/release/docs/images/spacer.png | Bin
{welcome => nb/welcome}/release/docs/images/up-left.png | Bin
{welcome => nb/welcome}/release/docs/images/up-right.png | Bin
{welcome => nb/welcome}/release/docs/netbeans.css | 0
.../src/org/netbeans/modules/welcome/Bundle.properties | 0
.../src/org/netbeans/modules/welcome/Bundle_test.properties | 0
.../src/org/netbeans/modules/welcome/FeedbackSurvey.java | 0
.../src/org/netbeans/modules/welcome/Installer.java | 0
.../src/org/netbeans/modules/welcome/ShowWelcomeAction.java | 0
.../src/org/netbeans/modules/welcome/WelcomeComponent.java | 0
.../src/org/netbeans/modules/welcome/WelcomeOptions.java | 0
.../org/netbeans/modules/welcome/content/ActionButton.java | 0
.../org/netbeans/modules/welcome/content/BundleSupport.java | 0
.../org/netbeans/modules/welcome/content/ButtonBorder.java | 0
.../modules/welcome/content/CombinationRSSFeed.java | 0
.../src/org/netbeans/modules/welcome/content/Constants.java | 0
.../netbeans/modules/welcome/content/ContentSection.java | 0
.../netbeans/modules/welcome/content/HttpProxySettings.java | 0
.../org/netbeans/modules/welcome/content/LinkButton.java | 0
.../src/org/netbeans/modules/welcome/content/Logo.java | 0
.../netbeans/modules/welcome/content/RSSEntityResolver.java | 0
.../src/org/netbeans/modules/welcome/content/RSSFeed.java | 0
.../modules/welcome/content/RSSFeedReaderPanel.java | 0
.../modules/welcome/content/RecentProjectsPanel.java | 0
.../src/org/netbeans/modules/welcome/content/Utils.java | 0
.../src/org/netbeans/modules/welcome/content/WebLink.java | 0
.../netbeans/modules/welcome/resources/Bundle.properties | 0
.../org/netbeans/modules/welcome/resources/Welcome.settings | 0
.../org/netbeans/modules/welcome/resources/Welcome.wstcref | 0
.../netbeans/modules/welcome/resources/apache_feather.png | Bin
.../modules/welcome/resources/apache_feather_dark.png | Bin
.../org/netbeans/modules/welcome/resources/broken_image.gif | Bin
.../org/netbeans/modules/welcome/resources/btn_center.png | Bin
.../src/org/netbeans/modules/welcome/resources/btn_left.png | Bin
.../org/netbeans/modules/welcome/resources/btn_right.png | Bin
.../org/netbeans/modules/welcome/resources/community.url | 0
.../netbeans/modules/welcome/resources/content_banner.png | Bin
.../modules/welcome/resources/content_banner_dark.png | Bin
.../org/netbeans/modules/welcome/resources/java_logo.png | Bin
.../netbeans/modules/welcome/resources/java_logo_dark.png | Bin
.../src/org/netbeans/modules/welcome/resources/layer.xml | 0
.../src/org/netbeans/modules/welcome/resources/nb_logo.png | Bin
.../org/netbeans/modules/welcome/resources/nb_logo_dark.png | Bin
.../netbeans/modules/welcome/resources/picture_frame.png | Bin
.../netbeans/modules/welcome/resources/sel_btn_center.png | Bin
.../org/netbeans/modules/welcome/resources/sel_btn_left.png | Bin
.../netbeans/modules/welcome/resources/sel_btn_right.png | Bin
.../org/netbeans/modules/welcome/resources/startpage.gif | Bin
.../org/netbeans/modules/welcome/resources/tab_rollover.png | Bin
.../modules/welcome/resources/tab_rollover_dark.png | Bin
.../org/netbeans/modules/welcome/resources/tab_selected.png | Bin
.../modules/welcome/resources/tab_selected_dark.png | Bin
.../src/org/netbeans/modules/welcome/resources/tour.url | 0
.../org/netbeans/modules/welcome/resources/tutorial1-1.url | 0
.../org/netbeans/modules/welcome/resources/tutorial1.url | 0
.../org/netbeans/modules/welcome/resources/tutorial2.url | 0
.../org/netbeans/modules/welcome/resources/tutorial3.url | 0
.../org/netbeans/modules/welcome/resources/tutorial4.url | 0
.../org/netbeans/modules/welcome/resources/tutorial5.url | 0
.../src/org/netbeans/modules/welcome/resources/welcome.gif | Bin
.../src/org/netbeans/modules/welcome/resources/whatsnew.url | 0
.../org/netbeans/modules/welcome/resources/xhtml-lat1.ent | 0
.../netbeans/modules/welcome/resources/xhtml-special.ent | 0
.../org/netbeans/modules/welcome/resources/xhtml-symbol.ent | 0
.../modules/welcome/resources/xhtml1-transitional.dtd | 0
.../src/org/netbeans/modules/welcome/ui/AbstractTab.java | 0
.../org/netbeans/modules/welcome/ui/ArticlesAndNews.java | 0
.../welcome}/src/org/netbeans/modules/welcome/ui/Blogs.java | 0
.../src/org/netbeans/modules/welcome/ui/BottomBar.java | 0
.../src/org/netbeans/modules/welcome/ui/ContentHeader.java | 0
.../src/org/netbeans/modules/welcome/ui/DemoPanel.java | 0
.../src/org/netbeans/modules/welcome/ui/GetStarted.java | 0
.../src/org/netbeans/modules/welcome/ui/InstallConfig.java | 0
.../netbeans/modules/welcome/ui/LearnAndDiscoverTab.java | 0
.../src/org/netbeans/modules/welcome/ui/MyNetBeansTab.java | 0
.../src/org/netbeans/modules/welcome/ui/PluginsPanel.java | 0
.../netbeans/modules/welcome/ui/SampleProjectAction.java | 0
.../src/org/netbeans/modules/welcome/ui/ShowNextTime.java | 0
.../org/netbeans/modules/welcome/ui/StartPageContent.java | 0
.../src/org/netbeans/modules/welcome/ui/TabContentPane.java | 0
.../src/org/netbeans/modules/welcome/ui/TabbedPane.java | 0
.../src/org/netbeans/modules/welcome/ui/Tutorials.java | 0
.../src/org/netbeans/modules/welcome/ui/WhatsNewTab.java | 0
.../org/netbeans/modules/welcome/Bundle_te_ST.properties | 0
.../org/netbeans/modules/welcome/FeedbackSurveyTest.java | 0
.../unit/src/org/netbeans/modules/welcome/MemoryURL.java | 0
312 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/autoupdate.pluginimporter/build.xml b/nb/autoupdate.pluginimporter/build.xml
similarity index 87%
rename from autoupdate.pluginimporter/build.xml
rename to nb/autoupdate.pluginimporter/build.xml
index 41681f6..8c7dae8 100644
--- a/autoupdate.pluginimporter/build.xml
+++ b/nb/autoupdate.pluginimporter/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="autoupdate.pluginimporter">
+<project basedir="." default="build" name="nb/autoupdate.pluginimporter">
<description>Builds, tests, and runs the project org.netbeans.modules.autoupdate.pluginsimporter</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/autoupdate.pluginimporter/licenseinfo.xml b/nb/autoupdate.pluginimporter/licenseinfo.xml
similarity index 100%
rename from autoupdate.pluginimporter/licenseinfo.xml
rename to nb/autoupdate.pluginimporter/licenseinfo.xml
diff --git a/autoupdate.pluginimporter/manifest.mf b/nb/autoupdate.pluginimporter/manifest.mf
similarity index 100%
rename from autoupdate.pluginimporter/manifest.mf
rename to nb/autoupdate.pluginimporter/manifest.mf
diff --git a/autoupdate.pluginimporter/nbproject/project.properties b/nb/autoupdate.pluginimporter/nbproject/project.properties
similarity index 100%
rename from autoupdate.pluginimporter/nbproject/project.properties
rename to nb/autoupdate.pluginimporter/nbproject/project.properties
diff --git a/autoupdate.pluginimporter/nbproject/project.xml b/nb/autoupdate.pluginimporter/nbproject/project.xml
similarity index 100%
rename from autoupdate.pluginimporter/nbproject/project.xml
rename to nb/autoupdate.pluginimporter/nbproject/project.xml
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Bundle.properties b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Bundle.properties
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Bundle.properties
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Bundle.properties
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ClusterUpdateProvider.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ClusterUpdateProvider.java
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ClusterUpdateProvider.java
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ClusterUpdateProvider.java
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.form b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.form
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.form
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.form
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/PluginImporter.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/PluginImporter.java
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/PluginImporter.java
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/PluginImporter.java
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle.properties b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle.properties
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle.properties
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle.properties
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/InstallLibraryTask.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/InstallLibraryTask.java
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/InstallLibraryTask.java
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/InstallLibraryTask.java
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/import.png b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/import.png
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/import.png
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/import.png
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/info_icon.png b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/info_icon.png
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/info_icon.png
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/info_icon.png
diff --git a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/warning.gif b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/warning.gif
similarity index 100%
rename from autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/warning.gif
rename to nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/resources/warning.gif
diff --git a/bugzilla.exceptionreporter/build.xml b/nb/bugzilla.exceptionreporter/build.xml
similarity index 87%
rename from bugzilla.exceptionreporter/build.xml
rename to nb/bugzilla.exceptionreporter/build.xml
index 16a8506..664e526 100644
--- a/bugzilla.exceptionreporter/build.xml
+++ b/nb/bugzilla.exceptionreporter/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="bugzilla.exceptionreporter">
+<project basedir="." default="build" name="nb/bugzilla.exceptionreporter">
<description>Builds, tests, and runs the project org.netbeans.modules.bugzilla.exceptionreporter</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/bugzilla.exceptionreporter/manifest.mf b/nb/bugzilla.exceptionreporter/manifest.mf
similarity index 100%
rename from bugzilla.exceptionreporter/manifest.mf
rename to nb/bugzilla.exceptionreporter/manifest.mf
diff --git a/bugzilla.exceptionreporter/nbproject/project.properties b/nb/bugzilla.exceptionreporter/nbproject/project.properties
similarity index 100%
rename from bugzilla.exceptionreporter/nbproject/project.properties
rename to nb/bugzilla.exceptionreporter/nbproject/project.properties
diff --git a/bugzilla.exceptionreporter/nbproject/project.xml b/nb/bugzilla.exceptionreporter/nbproject/project.xml
similarity index 100%
rename from bugzilla.exceptionreporter/nbproject/project.xml
rename to nb/bugzilla.exceptionreporter/nbproject/project.xml
diff --git a/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/Bundle.properties b/nb/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/Bundle.properties
similarity index 100%
rename from bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/Bundle.properties
rename to nb/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/Bundle.properties
diff --git a/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/NBBugzillaAccessorImpl.java b/nb/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/NBBugzillaAccessorImpl.java
similarity index 100%
rename from bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/NBBugzillaAccessorImpl.java
rename to nb/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/NBBugzillaAccessorImpl.java
diff --git a/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/ReportNBIssueAction.java b/nb/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/ReportNBIssueAction.java
similarity index 100%
rename from bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/ReportNBIssueAction.java
rename to nb/bugzilla.exceptionreporter/src/org/netbeans/modules/bugzilla/exceptionreporter/ReportNBIssueAction.java
diff --git a/deadlock.detector/build.xml b/nb/deadlock.detector/build.xml
similarity index 88%
rename from deadlock.detector/build.xml
rename to nb/deadlock.detector/build.xml
index 52dec77..e21d504 100644
--- a/deadlock.detector/build.xml
+++ b/nb/deadlock.detector/build.xml
@@ -20,7 +20,7 @@
-->
-<project basedir="." default="build" name="deadlock.detector">
+<project basedir="." default="build" name="nb/deadlock.detector">
<description>Builds, tests, and runs the project org.netbeans.modules.deadlock.detector</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/deadlock.detector/manifest.mf b/nb/deadlock.detector/manifest.mf
similarity index 100%
rename from deadlock.detector/manifest.mf
rename to nb/deadlock.detector/manifest.mf
diff --git a/deadlock.detector/nbproject/project.properties b/nb/deadlock.detector/nbproject/project.properties
similarity index 100%
rename from deadlock.detector/nbproject/project.properties
rename to nb/deadlock.detector/nbproject/project.properties
diff --git a/deadlock.detector/nbproject/project.xml b/nb/deadlock.detector/nbproject/project.xml
similarity index 100%
rename from deadlock.detector/nbproject/project.xml
rename to nb/deadlock.detector/nbproject/project.xml
diff --git a/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Bundle.properties b/nb/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Bundle.properties
similarity index 100%
rename from deadlock.detector/src/org/netbeans/modules/deadlock/detector/Bundle.properties
rename to nb/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Bundle.properties
diff --git a/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Detector.java b/nb/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Detector.java
similarity index 100%
rename from deadlock.detector/src/org/netbeans/modules/deadlock/detector/Detector.java
rename to nb/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Detector.java
diff --git a/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Installer.java b/nb/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Installer.java
similarity index 100%
rename from deadlock.detector/src/org/netbeans/modules/deadlock/detector/Installer.java
rename to nb/deadlock.detector/src/org/netbeans/modules/deadlock/detector/Installer.java
diff --git a/deadlock.detector/test/unit/src/org/netbeans/modules/deadlock/detector/DetectorTest.java b/nb/deadlock.detector/test/unit/src/org/netbeans/modules/deadlock/detector/DetectorTest.java
similarity index 100%
rename from deadlock.detector/test/unit/src/org/netbeans/modules/deadlock/detector/DetectorTest.java
rename to nb/deadlock.detector/test/unit/src/org/netbeans/modules/deadlock/detector/DetectorTest.java
diff --git a/ide.branding.kit/build.xml b/nb/ide.branding.kit/build.xml
similarity index 88%
rename from ide.branding.kit/build.xml
rename to nb/ide.branding.kit/build.xml
index 7f89df4..6dcb4e9 100644
--- a/ide.branding.kit/build.xml
+++ b/nb/ide.branding.kit/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="ide.branding.kit">
+<project basedir="." default="build" name="nb/ide.branding.kit">
<description>Builds, tests, and runs the project org.netbeans.modules.ide.branding.kit</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/ide.branding.kit/manifest.mf b/nb/ide.branding.kit/manifest.mf
similarity index 100%
rename from ide.branding.kit/manifest.mf
rename to nb/ide.branding.kit/manifest.mf
diff --git a/uihandler.exceptionreporter/nbproject/project.properties b/nb/ide.branding.kit/nbproject/project.properties
similarity index 100%
rename from uihandler.exceptionreporter/nbproject/project.properties
rename to nb/ide.branding.kit/nbproject/project.properties
diff --git a/ide.branding.kit/nbproject/project.xml b/nb/ide.branding.kit/nbproject/project.xml
similarity index 100%
rename from ide.branding.kit/nbproject/project.xml
rename to nb/ide.branding.kit/nbproject/project.xml
diff --git a/ide.branding.kit/release/VERSION.txt b/nb/ide.branding.kit/release/VERSION.txt
similarity index 100%
rename from ide.branding.kit/release/VERSION.txt
rename to nb/ide.branding.kit/release/VERSION.txt
diff --git a/ide.branding.kit/src/org/netbeans/modules/ide/branding/kit/Bundle.properties b/nb/ide.branding.kit/src/org/netbeans/modules/ide/branding/kit/Bundle.properties
similarity index 100%
rename from ide.branding.kit/src/org/netbeans/modules/ide/branding/kit/Bundle.properties
rename to nb/ide.branding.kit/src/org/netbeans/modules/ide/branding/kit/Bundle.properties
diff --git a/ide.branding/autoupdate.services/libsrc/org/netbeans/updater/Bundle_nb.properties b/nb/ide.branding/autoupdate.services/libsrc/org/netbeans/updater/Bundle_nb.properties
similarity index 100%
rename from ide.branding/autoupdate.services/libsrc/org/netbeans/updater/Bundle_nb.properties
rename to nb/ide.branding/autoupdate.services/libsrc/org/netbeans/updater/Bundle_nb.properties
diff --git a/ide.branding/autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash_nb.gif b/nb/ide.branding/autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash_nb.gif
similarity index 100%
rename from ide.branding/autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash_nb.gif
rename to nb/ide.branding/autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash_nb.gif
diff --git a/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle_nb.properties b/nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle_nb.properties
similarity index 100%
rename from ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle_nb.properties
rename to nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle_nb.properties
diff --git a/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb.properties b/nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb.properties
similarity index 100%
rename from ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb.properties
rename to nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb.properties
diff --git a/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties b/nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties
similarity index 100%
rename from ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties
rename to nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties
diff --git a/ide.branding/build.xml b/nb/ide.branding/build.xml
similarity index 96%
rename from ide.branding/build.xml
rename to nb/ide.branding/build.xml
index 86a60ff..223ce17 100644
--- a/ide.branding/build.xml
+++ b/nb/ide.branding/build.xml
@@ -22,9 +22,9 @@
<!--
Contributor(s): Vincent Brabant, Maxym Mykhalchuk
-->
-<project basedir="." default="build" name="ide.branding">
+<project basedir="." default="build" name="nb/ide.branding">
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar"
classpath="${nbantext.jar}"/>
diff --git a/ide.branding/core.netigso/src/org/netbeans/core/netigso/Bundle_nb.properties b/nb/ide.branding/core.netigso/src/org/netbeans/core/netigso/Bundle_nb.properties
similarity index 100%
rename from ide.branding/core.netigso/src/org/netbeans/core/netigso/Bundle_nb.properties
rename to nb/ide.branding/core.netigso/src/org/netbeans/core/netigso/Bundle_nb.properties
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/about_dark_nb.png b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/about_dark_nb.png
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/about_dark_nb.png
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/about_dark_nb.png
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/about_nb.png b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/about_nb.png
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/about_nb.png
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/about_nb.png
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/frame32_dark_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame32_dark_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/frame32_dark_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame32_dark_nb.gif
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/frame32_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame32_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/frame32_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame32_nb.gif
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/frame48_dark_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame48_dark_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/frame48_dark_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame48_dark_nb.gif
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/frame48_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame48_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/frame48_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame48_nb.gif
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/frame_dark_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame_dark_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/frame_dark_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame_dark_nb.gif
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/frame_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/frame_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/frame_nb.gif
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/splash_dark_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/splash_dark_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/splash_dark_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/splash_dark_nb.gif
diff --git a/ide.branding/core.startup/src/org/netbeans/core/startup/splash_nb.gif b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/splash_nb.gif
similarity index 100%
rename from ide.branding/core.startup/src/org/netbeans/core/startup/splash_nb.gif
rename to nb/ide.branding/core.startup/src/org/netbeans/core/startup/splash_nb.gif
diff --git a/ide.branding/core.ui/src/org/netbeans/core/ui/sampler/Bundle_nb.properties b/nb/ide.branding/core.ui/src/org/netbeans/core/ui/sampler/Bundle_nb.properties
similarity index 100%
rename from ide.branding/core.ui/src/org/netbeans/core/ui/sampler/Bundle_nb.properties
rename to nb/ide.branding/core.ui/src/org/netbeans/core/ui/sampler/Bundle_nb.properties
diff --git a/ide.branding/core.windows/src/org/netbeans/core/windows/Bundle_nb.properties b/nb/ide.branding/core.windows/src/org/netbeans/core/windows/Bundle_nb.properties
similarity index 100%
rename from ide.branding/core.windows/src/org/netbeans/core/windows/Bundle_nb.properties
rename to nb/ide.branding/core.windows/src/org/netbeans/core/windows/Bundle_nb.properties
diff --git a/ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties b/nb/ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties
similarity index 100%
rename from ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties
rename to nb/ide.branding/core.windows/src/org/netbeans/core/windows/view/ui/Bundle_nb.properties
diff --git a/ide.branding/l10n.list b/nb/ide.branding/l10n.list
similarity index 100%
rename from ide.branding/l10n.list
rename to nb/ide.branding/l10n.list
diff --git a/ide.branding/licenseinfo.xml b/nb/ide.branding/licenseinfo.xml
similarity index 100%
rename from ide.branding/licenseinfo.xml
rename to nb/ide.branding/licenseinfo.xml
diff --git a/ide.branding/manifest.mf b/nb/ide.branding/manifest.mf
similarity index 100%
rename from ide.branding/manifest.mf
rename to nb/ide.branding/manifest.mf
diff --git a/ide.branding/nbproject/project.properties b/nb/ide.branding/nbproject/project.properties
similarity index 100%
rename from ide.branding/nbproject/project.properties
rename to nb/ide.branding/nbproject/project.properties
diff --git a/ide.branding/nbproject/project.xml b/nb/ide.branding/nbproject/project.xml
similarity index 100%
rename from ide.branding/nbproject/project.xml
rename to nb/ide.branding/nbproject/project.xml
diff --git a/ide.branding/o.n.core/src/org/netbeans/core/Bundle_nb.properties b/nb/ide.branding/o.n.core/src/org/netbeans/core/Bundle_nb.properties
similarity index 100%
rename from ide.branding/o.n.core/src/org/netbeans/core/Bundle_nb.properties
rename to nb/ide.branding/o.n.core/src/org/netbeans/core/Bundle_nb.properties
diff --git a/ide.branding/options.api/src/org/netbeans/modules/options/export/Bundle_nb.properties b/nb/ide.branding/options.api/src/org/netbeans/modules/options/export/Bundle_nb.properties
similarity index 100%
rename from ide.branding/options.api/src/org/netbeans/modules/options/export/Bundle_nb.properties
rename to nb/ide.branding/options.api/src/org/netbeans/modules/options/export/Bundle_nb.properties
diff --git a/ide.branding/release-toplevel/CREDITS.html b/nb/ide.branding/release-toplevel/CREDITS.html
similarity index 100%
rename from ide.branding/release-toplevel/CREDITS.html
rename to nb/ide.branding/release-toplevel/CREDITS.html
diff --git a/ide.branding/release-toplevel/README.html b/nb/ide.branding/release-toplevel/README.html
similarity index 100%
rename from ide.branding/release-toplevel/README.html
rename to nb/ide.branding/release-toplevel/README.html
diff --git a/ide.branding/release-toplevel/netbeans.css b/nb/ide.branding/release-toplevel/netbeans.css
similarity index 100%
rename from ide.branding/release-toplevel/netbeans.css
rename to nb/ide.branding/release-toplevel/netbeans.css
diff --git a/ide.branding/release/netbeans.icns b/nb/ide.branding/release/netbeans.icns
similarity index 100%
rename from ide.branding/release/netbeans.icns
rename to nb/ide.branding/release/netbeans.icns
diff --git a/ide.branding/release/netbeans.png b/nb/ide.branding/release/netbeans.png
similarity index 100%
rename from ide.branding/release/netbeans.png
rename to nb/ide.branding/release/netbeans.png
diff --git a/ide.branding/release/shortcuts.pdf b/nb/ide.branding/release/shortcuts.pdf
similarity index 100%
rename from ide.branding/release/shortcuts.pdf
rename to nb/ide.branding/release/shortcuts.pdf
diff --git a/ide.branding/release/shortcuts_mac.pdf b/nb/ide.branding/release/shortcuts_mac.pdf
similarity index 100%
rename from ide.branding/release/shortcuts_mac.pdf
rename to nb/ide.branding/release/shortcuts_mac.pdf
diff --git a/ide.branding/spi.quicksearch/src/org/netbeans/modules/quicksearch/web/Bundle_nb.properties b/nb/ide.branding/spi.quicksearch/src/org/netbeans/modules/quicksearch/web/Bundle_nb.properties
similarity index 100%
rename from ide.branding/spi.quicksearch/src/org/netbeans/modules/quicksearch/web/Bundle_nb.properties
rename to nb/ide.branding/spi.quicksearch/src/org/netbeans/modules/quicksearch/web/Bundle_nb.properties
diff --git a/ide.branding/src/org/netbeans/modules/ide/branding/Bundle.properties b/nb/ide.branding/src/org/netbeans/modules/ide/branding/Bundle.properties
similarity index 100%
rename from ide.branding/src/org/netbeans/modules/ide/branding/Bundle.properties
rename to nb/ide.branding/src/org/netbeans/modules/ide/branding/Bundle.properties
diff --git a/ide.branding/src/org/netbeans/modules/ide/branding/layer.xml b/nb/ide.branding/src/org/netbeans/modules/ide/branding/layer.xml
similarity index 100%
rename from ide.branding/src/org/netbeans/modules/ide/branding/layer.xml
rename to nb/ide.branding/src/org/netbeans/modules/ide/branding/layer.xml
diff --git a/ide.branding/test/unit/src/org/netbeans/modules/ide/branding/SaveIsAsynchronousTest.java b/nb/ide.branding/test/unit/src/org/netbeans/modules/ide/branding/SaveIsAsynchronousTest.java
similarity index 100%
rename from ide.branding/test/unit/src/org/netbeans/modules/ide/branding/SaveIsAsynchronousTest.java
rename to nb/ide.branding/test/unit/src/org/netbeans/modules/ide/branding/SaveIsAsynchronousTest.java
diff --git a/ide.branding/uihandler/src/org/netbeans/modules/exceptions/Bundle_nb.properties b/nb/ide.branding/uihandler/src/org/netbeans/modules/exceptions/Bundle_nb.properties
similarity index 100%
rename from ide.branding/uihandler/src/org/netbeans/modules/exceptions/Bundle_nb.properties
rename to nb/ide.branding/uihandler/src/org/netbeans/modules/exceptions/Bundle_nb.properties
diff --git a/ide.branding/uihandler/src/org/netbeans/modules/uihandler/Bundle_nb.properties b/nb/ide.branding/uihandler/src/org/netbeans/modules/uihandler/Bundle_nb.properties
similarity index 100%
rename from ide.branding/uihandler/src/org/netbeans/modules/uihandler/Bundle_nb.properties
rename to nb/ide.branding/uihandler/src/org/netbeans/modules/uihandler/Bundle_nb.properties
diff --git a/o.n.upgrader/arch.xml b/nb/o.n.upgrader/arch.xml
similarity index 99%
rename from o.n.upgrader/arch.xml
rename to nb/o.n.upgrader/arch.xml
index 0a010e7..fa19f78 100644
--- a/o.n.upgrader/arch.xml
+++ b/nb/o.n.upgrader/arch.xml
@@ -19,8 +19,8 @@
under the License.
-->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
- <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
<api-answers
diff --git a/o.n.upgrader/build.xml b/nb/o.n.upgrader/build.xml
similarity index 87%
rename from o.n.upgrader/build.xml
rename to nb/o.n.upgrader/build.xml
index 14f5446..cfaea98 100644
--- a/o.n.upgrader/build.xml
+++ b/nb/o.n.upgrader/build.xml
@@ -20,8 +20,8 @@
-->
-<project name="o.n.upgrader" default="build" basedir=".">
+<project name="nb/o.n.upgrader" default="build" basedir=".">
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/o.n.upgrader/manifest.mf b/nb/o.n.upgrader/manifest.mf
similarity index 100%
rename from o.n.upgrader/manifest.mf
rename to nb/o.n.upgrader/manifest.mf
diff --git a/o.n.upgrader/nbproject/project.properties b/nb/o.n.upgrader/nbproject/project.properties
similarity index 100%
rename from o.n.upgrader/nbproject/project.properties
rename to nb/o.n.upgrader/nbproject/project.properties
diff --git a/o.n.upgrader/nbproject/project.xml b/nb/o.n.upgrader/nbproject/project.xml
similarity index 100%
rename from o.n.upgrader/nbproject/project.xml
rename to nb/o.n.upgrader/nbproject/project.xml
diff --git a/o.n.upgrader/src/org/netbeans/license/AcceptLicense.java b/nb/o.n.upgrader/src/org/netbeans/license/AcceptLicense.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/license/AcceptLicense.java
rename to nb/o.n.upgrader/src/org/netbeans/license/AcceptLicense.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgrade.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.form b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.form
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.form
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.form
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/AutoUpgradePanel.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/Bundle.properties b/nb/o.n.upgrader/src/org/netbeans/upgrade/Bundle.properties
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/Bundle.properties
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/Bundle.properties
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/ColoringStorage.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/ColoringStorage.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/ColoringStorage.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/ColoringStorage.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/Copy.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/Copy.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/Copy.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/Copy.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/CopyFiles.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/CopyFiles.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/CopyFiles.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/CopyFiles.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/IncludeExclude.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/IncludeExclude.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/IncludeExclude.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/IncludeExclude.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/PathTransformation.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/PathTransformation.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/PathTransformation.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/PathTransformation.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/XMLStorage.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/XMLStorage.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/XMLStorage.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/XMLStorage.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/copy5.5 b/nb/o.n.upgrader/src/org/netbeans/upgrade/copy5.5
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/copy5.5
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/copy5.5
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/copy5.5.1 b/nb/o.n.upgrader/src/org/netbeans/upgrade/copy5.5.1
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/copy5.5.1
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/copy5.5.1
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/copy6.0 b/nb/o.n.upgrader/src/org/netbeans/upgrade/copy6.0
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/copy6.0
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/copy6.0
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/copy6.1 b/nb/o.n.upgrader/src/org/netbeans/upgrade/copy6.1
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/copy6.1
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/copy6.1
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/copy6.5 b/nb/o.n.upgrader/src/org/netbeans/upgrade/copy6.5
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/copy6.5
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/copy6.5
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/copyjstudio_6me_user b/nb/o.n.upgrader/src/org/netbeans/upgrade/copyjstudio_6me_user
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/copyjstudio_6me_user
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/copyjstudio_6me_user
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/layer5.5.1.xml b/nb/o.n.upgrader/src/org/netbeans/upgrade/layer5.5.1.xml
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/layer5.5.1.xml
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/layer5.5.1.xml
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/layer5.5.xml b/nb/o.n.upgrader/src/org/netbeans/upgrade/layer5.5.xml
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/layer5.5.xml
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/layer5.5.xml
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/layer6.0.xml b/nb/o.n.upgrader/src/org/netbeans/upgrade/layer6.0.xml
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/layer6.0.xml
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/layer6.0.xml
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/layer6.1.xml b/nb/o.n.upgrader/src/org/netbeans/upgrade/layer6.1.xml
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/layer6.1.xml
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/layer6.1.xml
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5 b/nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5.1 b/nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5.1
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5.1
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard5.5.1
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.0 b/nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.0
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.0
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.0
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.1 b/nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.1
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.1
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.1
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.5 b/nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.5
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.5
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/nonstandard6.5
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ColorProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ColorProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ColorProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ColorProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ContentProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ContentProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ContentProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ContentProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/CvsSettingsProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/CvsSettingsProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/CvsSettingsProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/CvsSettingsProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DefaultResult.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DefaultResult.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DefaultResult.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DefaultResult.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/FileProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/FileProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/FileProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/FileProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashMapProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashMapProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashMapProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashMapProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashSetProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashSetProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashSetProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HashSetProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HostPropertyProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HostPropertyProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HostPropertyProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/HostPropertyProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Importer.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Importer.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Importer.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Importer.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/IntrospectedInfoProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/IntrospectedInfoProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/IntrospectedInfoProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/IntrospectedInfoProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/JUnitContentProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/JUnitContentProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/JUnitContentProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/JUnitContentProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ListProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ListProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ListProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/ListProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/NbClassPathProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/NbClassPathProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/NbClassPathProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/NbClassPathProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertyProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertyProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertyProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertyProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Result.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Result.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Result.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Result.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/StringPropertyProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/StringPropertyProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/StringPropertyProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/StringPropertyProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SystemOptionsParser.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SystemOptionsParser.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SystemOptionsParser.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SystemOptionsParser.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/TaskTagsProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/TaskTagsProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/TaskTagsProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/TaskTagsProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/URLProcessor.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/URLProcessor.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/URLProcessor.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/URLProcessor.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Utils.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Utils.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Utils.java
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Utils.java
diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport
rename to nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport
diff --git a/o.n.upgrader/src/org/netbeans/util/Util.java b/nb/o.n.upgrader/src/org/netbeans/util/Util.java
similarity index 100%
rename from o.n.upgrader/src/org/netbeans/util/Util.java
rename to nb/o.n.upgrader/src/org/netbeans/util/Util.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/AutoUpgradeTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/AutoUpgradeTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/AutoUpgradeTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/AutoUpgradeTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyFilesTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyFilesTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyFilesTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyFilesTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/CopyTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/IncludeExcludeTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/IncludeExcludeTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/IncludeExcludeTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/IncludeExcludeTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/copyfoo b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/copyfoo
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/copyfoo
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/copyfoo
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/MainCallback.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/MainCallback.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/MainCallback.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/MainCallback.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/PlatformWithAbsolutePathTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/PlatformWithAbsolutePathTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/PlatformWithAbsolutePathTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/launcher/PlatformWithAbsolutePathTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/layerfoo.xml b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/layerfoo.xml
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/layerfoo.xml
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/layerfoo.xml
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettings-null-ant-home.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettings-null-ant-home.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettings-null-ant-home.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettings-null-ant-home.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsNullAntHomeTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsNullAntHomeTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsNullAntHomeTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsNullAntHomeTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/AntSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/BasicTestForImport.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/BasicTestForImport.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/BasicTestForImport.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/BasicTestForImport.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CoreSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CoreSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CoreSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CoreSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CvsSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CvsSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CvsSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/CvsSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DataBaseOptionTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DataBaseOptionTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DataBaseOptionTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DataBaseOptionTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DerbyOptionsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DerbyOptionsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DerbyOptionsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DerbyOptionsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/DocumentationSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/FormSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/FormSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/FormSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/FormSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/HttpServerSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/HttpServerSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/HttpServerSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/HttpServerSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/I18nOptionsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/I18nOptionsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/I18nOptionsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/I18nOptionsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/IDESettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/IDESettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/IDESettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/IDESettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JUnitSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JUnitSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JUnitSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JUnitSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JavaSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JavaSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JavaSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/JavaSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ModuleUISettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ModuleUISettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ModuleUISettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ModuleUISettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/PackageViewSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/PackageViewSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/PackageViewSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/PackageViewSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ProjectUIOptionsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ProjectUIOptionsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ProjectUIOptionsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/ProjectUIOptionsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/SvnSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/SvnSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/SvnSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/SvnSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/TaskListSettingsTest.java b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/TaskListSettingsTest.java
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/TaskListSettingsTest.java
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/TaskListSettingsTest.java
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/formsettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/formsettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/formsettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/formsettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/javaSettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/javaSettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/javaSettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/javaSettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-apache-tools-ant-module-AntSettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-apache-tools-ant-module-AntSettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-apache-tools-ant-module-AntSettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-apache-tools-ant-module-AntSettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-core-IDESettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-core-IDESettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-core-IDESettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-core-IDESettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-apisupport-project-ui-ModuleUI.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-apisupport-project-ui-ModuleUI.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-apisupport-project-ui-ModuleUI.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-apisupport-project-ui-ModuleUI.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-db-explorer-DatabaseOption.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-db-explorer-DatabaseOption.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-db-explorer-DatabaseOption.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-db-explorer-DatabaseOption.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-derby-DerbyOptions.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-derby-DerbyOptions.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-derby-DerbyOptions.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-derby-DerbyOptions.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-httpserver-HttpServerSettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-httpserver-HttpServerSettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-httpserver-HttpServerSettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-httpserver-HttpServerSettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-i18n-I18nOptions.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-i18n-I18nOptions.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-i18n-I18nOptions.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-i18n-I18nOptions.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-java-project-packageViewSettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-java-project-packageViewSettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-java-project-packageViewSettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-java-project-packageViewSettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-javadoc-settings-DocumentationSettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-javadoc-settings-DocumentationSettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-javadoc-settings-DocumentationSettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-javadoc-settings-DocumentationSettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-junit-JUnitSettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-junit-JUnitSettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-junit-JUnitSettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-junit-JUnitSettings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-project-ui-OpenProjectList.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-project-ui-OpenProjectList.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-project-ui-OpenProjectList.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-project-ui-OpenProjectList.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-subversion-settings-SvnModuleConfig.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-subversion-settings-SvnModuleConfig.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-subversion-settings-SvnModuleConfig.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-subversion-settings-SvnModuleConfig.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-tasklist-docscan-Settings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-tasklist-docscan-Settings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-tasklist-docscan-Settings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-tasklist-docscan-Settings.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-versioning-system-cvss-settings-CvsModuleConfig.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-versioning-system-cvss-settings-CvsModuleConfig.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-versioning-system-cvss-settings-CvsModuleConfig.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-versioning-system-cvss-settings-CvsModuleConfig.settings
diff --git a/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-xml-core-settings-CoreSettings.settings b/nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-xml-core-settings-CoreSettings.settings
similarity index 100%
rename from o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-xml-core-settings-CoreSettings.settings
rename to nb/o.n.upgrader/test/unit/src/org/netbeans/upgrade/systemoptions/org-netbeans-modules-xml-core-settings-CoreSettings.settings
diff --git a/uihandler.exceptionreporter/build.xml b/nb/uihandler.exceptionreporter/build.xml
similarity index 87%
rename from uihandler.exceptionreporter/build.xml
rename to nb/uihandler.exceptionreporter/build.xml
index bfe924b..3b21e2f 100644
--- a/uihandler.exceptionreporter/build.xml
+++ b/nb/uihandler.exceptionreporter/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="uihandler.exceptionreporter">
+<project basedir="." default="build" name="nb/uihandler.exceptionreporter">
<description>Builds, tests, and runs the project org.netbeans.modules.uihandler.exceptionreporter</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/uihandler.exceptionreporter/manifest.mf b/nb/uihandler.exceptionreporter/manifest.mf
similarity index 100%
rename from uihandler.exceptionreporter/manifest.mf
rename to nb/uihandler.exceptionreporter/manifest.mf
diff --git a/ide.branding.kit/nbproject/project.properties b/nb/uihandler.exceptionreporter/nbproject/project.properties
similarity index 100%
rename from ide.branding.kit/nbproject/project.properties
rename to nb/uihandler.exceptionreporter/nbproject/project.properties
diff --git a/uihandler.exceptionreporter/nbproject/project.xml b/nb/uihandler.exceptionreporter/nbproject/project.xml
similarity index 100%
rename from uihandler.exceptionreporter/nbproject/project.xml
rename to nb/uihandler.exceptionreporter/nbproject/project.xml
diff --git a/uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Bundle.properties b/nb/uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Bundle.properties
similarity index 100%
rename from uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Bundle.properties
rename to nb/uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Bundle.properties
diff --git a/uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Installer.java b/nb/uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Installer.java
similarity index 100%
rename from uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Installer.java
rename to nb/uihandler.exceptionreporter/src/org/netbeans/modules/uihandler/exceptionreporter/Installer.java
diff --git a/updatecenters/build.xml b/nb/updatecenters/build.xml
similarity index 87%
rename from updatecenters/build.xml
rename to nb/updatecenters/build.xml
index 6370af5..5e450a5 100644
--- a/updatecenters/build.xml
+++ b/nb/updatecenters/build.xml
@@ -20,8 +20,8 @@
-->
-<project name="updatecenters" default="build" basedir=".">
+<project name="nb/updatecenters" default="build" basedir=".">
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/updatecenters/licenseinfo.xml b/nb/updatecenters/licenseinfo.xml
similarity index 100%
rename from updatecenters/licenseinfo.xml
rename to nb/updatecenters/licenseinfo.xml
diff --git a/updatecenters/manifest.mf b/nb/updatecenters/manifest.mf
similarity index 100%
rename from updatecenters/manifest.mf
rename to nb/updatecenters/manifest.mf
diff --git a/updatecenters/nbproject/project.properties b/nb/updatecenters/nbproject/project.properties
similarity index 100%
rename from updatecenters/nbproject/project.properties
rename to nb/updatecenters/nbproject/project.properties
diff --git a/updatecenters/nbproject/project.xml b/nb/updatecenters/nbproject/project.xml
similarity index 100%
rename from updatecenters/nbproject/project.xml
rename to nb/updatecenters/nbproject/project.xml
diff --git a/updatecenters/release/core/ide.ks b/nb/updatecenters/release/core/ide.ks
similarity index 100%
rename from updatecenters/release/core/ide.ks
rename to nb/updatecenters/release/core/ide.ks
diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
similarity index 100%
rename from updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
rename to nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansClusterCreator.java b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansClusterCreator.java
similarity index 100%
rename from updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansClusterCreator.java
rename to nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansClusterCreator.java
diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansKeyStoreProvider.java b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansKeyStoreProvider.java
similarity index 100%
rename from updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansKeyStoreProvider.java
rename to nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/NetBeansKeyStoreProvider.java
diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
similarity index 100%
rename from updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
rename to nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/updateAction.gif b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/updateAction.gif
similarity index 100%
rename from updatecenters/src/org/netbeans/modules/updatecenters/resources/updateAction.gif
rename to nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/updateAction.gif
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/CountsStruct.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/CountsStruct.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/CountsStruct.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/CountsStruct.java
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/OperationUtils.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/OperationUtils.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/OperationUtils.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/OperationUtils.java
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/install/InstallTest.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/install/InstallTest.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/install/InstallTest.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/install/InstallTest.java
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/install/ValidateInstallTest.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/install/ValidateInstallTest.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/install/ValidateInstallTest.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/install/ValidateInstallTest.java
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/UninstallTest.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/UninstallTest.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/UninstallTest.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/UninstallTest.java
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/ValidateUninstallTest.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/ValidateUninstallTest.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/ValidateUninstallTest.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/uninstall/ValidateUninstallTest.java
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/update/UpdateTest.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/update/UpdateTest.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/update/UpdateTest.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/update/UpdateTest.java
diff --git a/updatecenters/test/unit/src/org/netbeans/updatecenters/update/ValidateUpdateTest.java b/nb/updatecenters/test/unit/src/org/netbeans/updatecenters/update/ValidateUpdateTest.java
similarity index 100%
rename from updatecenters/test/unit/src/org/netbeans/updatecenters/update/ValidateUpdateTest.java
rename to nb/updatecenters/test/unit/src/org/netbeans/updatecenters/update/ValidateUpdateTest.java
diff --git a/welcome/build.xml b/nb/welcome/build.xml
similarity index 88%
rename from welcome/build.xml
rename to nb/welcome/build.xml
index b90f6c8..bb20461 100644
--- a/welcome/build.xml
+++ b/nb/welcome/build.xml
@@ -19,6 +19,6 @@
under the License.
-->
-<project basedir="." default="build" name="welcome">
- <import file="../nbbuild/templates/projectized.xml"/>
+<project basedir="." default="build" name="nb/welcome">
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/welcome/l10n.list b/nb/welcome/l10n.list
similarity index 100%
rename from welcome/l10n.list
rename to nb/welcome/l10n.list
diff --git a/welcome/licenseinfo.xml b/nb/welcome/licenseinfo.xml
similarity index 100%
rename from welcome/licenseinfo.xml
rename to nb/welcome/licenseinfo.xml
diff --git a/welcome/manifest.mf b/nb/welcome/manifest.mf
similarity index 100%
rename from welcome/manifest.mf
rename to nb/welcome/manifest.mf
diff --git a/welcome/nbproject/project.properties b/nb/welcome/nbproject/project.properties
similarity index 100%
rename from welcome/nbproject/project.properties
rename to nb/welcome/nbproject/project.properties
diff --git a/welcome/nbproject/project.xml b/nb/welcome/nbproject/project.xml
similarity index 100%
rename from welcome/nbproject/project.xml
rename to nb/welcome/nbproject/project.xml
diff --git a/welcome/release/docs/GUIExamplesDescription.html b/nb/welcome/release/docs/GUIExamplesDescription.html
similarity index 100%
rename from welcome/release/docs/GUIExamplesDescription.html
rename to nb/welcome/release/docs/GUIExamplesDescription.html
diff --git a/welcome/release/docs/SwingInteropDescription.html b/nb/welcome/release/docs/SwingInteropDescription.html
similarity index 100%
rename from welcome/release/docs/SwingInteropDescription.html
rename to nb/welcome/release/docs/SwingInteropDescription.html
diff --git a/welcome/release/docs/images/background.png b/nb/welcome/release/docs/images/background.png
similarity index 100%
rename from welcome/release/docs/images/background.png
rename to nb/welcome/release/docs/images/background.png
diff --git a/welcome/release/docs/images/banner-left.png b/nb/welcome/release/docs/images/banner-left.png
similarity index 100%
rename from welcome/release/docs/images/banner-left.png
rename to nb/welcome/release/docs/images/banner-left.png
diff --git a/welcome/release/docs/images/banner-right.png b/nb/welcome/release/docs/images/banner-right.png
similarity index 100%
rename from welcome/release/docs/images/banner-right.png
rename to nb/welcome/release/docs/images/banner-right.png
diff --git a/welcome/release/docs/images/blue.png b/nb/welcome/release/docs/images/blue.png
similarity index 100%
rename from welcome/release/docs/images/blue.png
rename to nb/welcome/release/docs/images/blue.png
diff --git a/welcome/release/docs/images/circle1.gif b/nb/welcome/release/docs/images/circle1.gif
similarity index 100%
rename from welcome/release/docs/images/circle1.gif
rename to nb/welcome/release/docs/images/circle1.gif
diff --git a/welcome/release/docs/images/circle2.gif b/nb/welcome/release/docs/images/circle2.gif
similarity index 100%
rename from welcome/release/docs/images/circle2.gif
rename to nb/welcome/release/docs/images/circle2.gif
diff --git a/welcome/release/docs/images/circle3.gif b/nb/welcome/release/docs/images/circle3.gif
similarity index 100%
rename from welcome/release/docs/images/circle3.gif
rename to nb/welcome/release/docs/images/circle3.gif
diff --git a/welcome/release/docs/images/circle4.gif b/nb/welcome/release/docs/images/circle4.gif
similarity index 100%
rename from welcome/release/docs/images/circle4.gif
rename to nb/welcome/release/docs/images/circle4.gif
diff --git a/welcome/release/docs/images/circle5.gif b/nb/welcome/release/docs/images/circle5.gif
similarity index 100%
rename from welcome/release/docs/images/circle5.gif
rename to nb/welcome/release/docs/images/circle5.gif
diff --git a/welcome/release/docs/images/circle6.gif b/nb/welcome/release/docs/images/circle6.gif
similarity index 100%
rename from welcome/release/docs/images/circle6.gif
rename to nb/welcome/release/docs/images/circle6.gif
diff --git a/welcome/release/docs/images/down-left.png b/nb/welcome/release/docs/images/down-left.png
similarity index 100%
rename from welcome/release/docs/images/down-left.png
rename to nb/welcome/release/docs/images/down-left.png
diff --git a/welcome/release/docs/images/down-right.png b/nb/welcome/release/docs/images/down-right.png
similarity index 100%
rename from welcome/release/docs/images/down-right.png
rename to nb/welcome/release/docs/images/down-right.png
diff --git a/welcome/release/docs/images/spacer.png b/nb/welcome/release/docs/images/spacer.png
similarity index 100%
rename from welcome/release/docs/images/spacer.png
rename to nb/welcome/release/docs/images/spacer.png
diff --git a/welcome/release/docs/images/up-left.png b/nb/welcome/release/docs/images/up-left.png
similarity index 100%
rename from welcome/release/docs/images/up-left.png
rename to nb/welcome/release/docs/images/up-left.png
diff --git a/welcome/release/docs/images/up-right.png b/nb/welcome/release/docs/images/up-right.png
similarity index 100%
rename from welcome/release/docs/images/up-right.png
rename to nb/welcome/release/docs/images/up-right.png
diff --git a/welcome/release/docs/netbeans.css b/nb/welcome/release/docs/netbeans.css
similarity index 100%
rename from welcome/release/docs/netbeans.css
rename to nb/welcome/release/docs/netbeans.css
diff --git a/welcome/src/org/netbeans/modules/welcome/Bundle.properties b/nb/welcome/src/org/netbeans/modules/welcome/Bundle.properties
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/Bundle.properties
rename to nb/welcome/src/org/netbeans/modules/welcome/Bundle.properties
diff --git a/welcome/src/org/netbeans/modules/welcome/Bundle_test.properties b/nb/welcome/src/org/netbeans/modules/welcome/Bundle_test.properties
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/Bundle_test.properties
rename to nb/welcome/src/org/netbeans/modules/welcome/Bundle_test.properties
diff --git a/welcome/src/org/netbeans/modules/welcome/FeedbackSurvey.java b/nb/welcome/src/org/netbeans/modules/welcome/FeedbackSurvey.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/FeedbackSurvey.java
rename to nb/welcome/src/org/netbeans/modules/welcome/FeedbackSurvey.java
diff --git a/welcome/src/org/netbeans/modules/welcome/Installer.java b/nb/welcome/src/org/netbeans/modules/welcome/Installer.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/Installer.java
rename to nb/welcome/src/org/netbeans/modules/welcome/Installer.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ShowWelcomeAction.java b/nb/welcome/src/org/netbeans/modules/welcome/ShowWelcomeAction.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ShowWelcomeAction.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ShowWelcomeAction.java
diff --git a/welcome/src/org/netbeans/modules/welcome/WelcomeComponent.java b/nb/welcome/src/org/netbeans/modules/welcome/WelcomeComponent.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/WelcomeComponent.java
rename to nb/welcome/src/org/netbeans/modules/welcome/WelcomeComponent.java
diff --git a/welcome/src/org/netbeans/modules/welcome/WelcomeOptions.java b/nb/welcome/src/org/netbeans/modules/welcome/WelcomeOptions.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/WelcomeOptions.java
rename to nb/welcome/src/org/netbeans/modules/welcome/WelcomeOptions.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/ActionButton.java b/nb/welcome/src/org/netbeans/modules/welcome/content/ActionButton.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/ActionButton.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/ActionButton.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/BundleSupport.java b/nb/welcome/src/org/netbeans/modules/welcome/content/BundleSupport.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/BundleSupport.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/BundleSupport.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/ButtonBorder.java b/nb/welcome/src/org/netbeans/modules/welcome/content/ButtonBorder.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/ButtonBorder.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/ButtonBorder.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/CombinationRSSFeed.java b/nb/welcome/src/org/netbeans/modules/welcome/content/CombinationRSSFeed.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/CombinationRSSFeed.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/CombinationRSSFeed.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/Constants.java b/nb/welcome/src/org/netbeans/modules/welcome/content/Constants.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/Constants.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/Constants.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/ContentSection.java b/nb/welcome/src/org/netbeans/modules/welcome/content/ContentSection.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/ContentSection.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/ContentSection.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/HttpProxySettings.java b/nb/welcome/src/org/netbeans/modules/welcome/content/HttpProxySettings.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/HttpProxySettings.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/HttpProxySettings.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/LinkButton.java b/nb/welcome/src/org/netbeans/modules/welcome/content/LinkButton.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/LinkButton.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/LinkButton.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/Logo.java b/nb/welcome/src/org/netbeans/modules/welcome/content/Logo.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/Logo.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/Logo.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/RSSEntityResolver.java b/nb/welcome/src/org/netbeans/modules/welcome/content/RSSEntityResolver.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/RSSEntityResolver.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/RSSEntityResolver.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/RSSFeed.java b/nb/welcome/src/org/netbeans/modules/welcome/content/RSSFeed.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/RSSFeed.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/RSSFeed.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/RSSFeedReaderPanel.java b/nb/welcome/src/org/netbeans/modules/welcome/content/RSSFeedReaderPanel.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/RSSFeedReaderPanel.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/RSSFeedReaderPanel.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/RecentProjectsPanel.java b/nb/welcome/src/org/netbeans/modules/welcome/content/RecentProjectsPanel.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/RecentProjectsPanel.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/RecentProjectsPanel.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/Utils.java b/nb/welcome/src/org/netbeans/modules/welcome/content/Utils.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/Utils.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/Utils.java
diff --git a/welcome/src/org/netbeans/modules/welcome/content/WebLink.java b/nb/welcome/src/org/netbeans/modules/welcome/content/WebLink.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/content/WebLink.java
rename to nb/welcome/src/org/netbeans/modules/welcome/content/WebLink.java
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties b/nb/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/Welcome.settings b/nb/welcome/src/org/netbeans/modules/welcome/resources/Welcome.settings
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/Welcome.settings
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/Welcome.settings
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/Welcome.wstcref b/nb/welcome/src/org/netbeans/modules/welcome/resources/Welcome.wstcref
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/Welcome.wstcref
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/Welcome.wstcref
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/apache_feather.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/apache_feather.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/apache_feather.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/apache_feather.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/apache_feather_dark.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/apache_feather_dark.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/apache_feather_dark.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/apache_feather_dark.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/broken_image.gif b/nb/welcome/src/org/netbeans/modules/welcome/resources/broken_image.gif
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/broken_image.gif
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/broken_image.gif
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/btn_center.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/btn_center.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/btn_center.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/btn_center.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/btn_left.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/btn_left.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/btn_left.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/btn_left.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/btn_right.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/btn_right.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/btn_right.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/btn_right.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/community.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/community.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/community.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/community.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/content_banner.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/content_banner.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/content_banner_dark.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner_dark.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/content_banner_dark.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner_dark.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/java_logo.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/java_logo.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/java_logo.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/java_logo.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/java_logo_dark.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/java_logo_dark.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/java_logo_dark.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/java_logo_dark.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/layer.xml b/nb/welcome/src/org/netbeans/modules/welcome/resources/layer.xml
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/layer.xml
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/layer.xml
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/nb_logo.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/nb_logo.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/nb_logo.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/nb_logo.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/nb_logo_dark.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/nb_logo_dark.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/nb_logo_dark.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/nb_logo_dark.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/picture_frame.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/picture_frame.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/picture_frame.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/picture_frame.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_center.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_center.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/sel_btn_center.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_center.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_left.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_left.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/sel_btn_left.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_left.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_right.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_right.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/sel_btn_right.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/sel_btn_right.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/startpage.gif b/nb/welcome/src/org/netbeans/modules/welcome/resources/startpage.gif
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/startpage.gif
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/startpage.gif
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tab_rollover.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/tab_rollover.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tab_rollover.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tab_rollover.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tab_rollover_dark.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/tab_rollover_dark.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tab_rollover_dark.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tab_rollover_dark.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tab_selected.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/tab_selected.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tab_selected.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tab_selected.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tab_selected_dark.png b/nb/welcome/src/org/netbeans/modules/welcome/resources/tab_selected_dark.png
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tab_selected_dark.png
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tab_selected_dark.png
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tour.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/tour.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tour.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tour.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tutorial1-1.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial1-1.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tutorial1-1.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial1-1.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tutorial1.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial1.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tutorial1.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial1.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tutorial2.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial2.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tutorial2.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial2.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tutorial3.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial3.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tutorial3.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial3.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tutorial4.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial4.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tutorial4.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial4.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/tutorial5.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial5.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/tutorial5.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/tutorial5.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/welcome.gif b/nb/welcome/src/org/netbeans/modules/welcome/resources/welcome.gif
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/welcome.gif
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/welcome.gif
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/whatsnew.url b/nb/welcome/src/org/netbeans/modules/welcome/resources/whatsnew.url
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/whatsnew.url
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/whatsnew.url
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent b/nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml-lat1.ent
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent b/nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml-special.ent
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent b/nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml-symbol.ent
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd b/nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd
rename to nb/welcome/src/org/netbeans/modules/welcome/resources/xhtml1-transitional.dtd
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/AbstractTab.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/AbstractTab.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/AbstractTab.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/AbstractTab.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/ArticlesAndNews.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/ArticlesAndNews.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/ArticlesAndNews.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/ArticlesAndNews.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/Blogs.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/Blogs.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/Blogs.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/Blogs.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/DemoPanel.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/DemoPanel.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/DemoPanel.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/DemoPanel.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/GetStarted.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/GetStarted.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/GetStarted.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/GetStarted.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/InstallConfig.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/InstallConfig.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/InstallConfig.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/InstallConfig.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/LearnAndDiscoverTab.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/LearnAndDiscoverTab.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/LearnAndDiscoverTab.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/LearnAndDiscoverTab.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/MyNetBeansTab.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/MyNetBeansTab.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/MyNetBeansTab.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/MyNetBeansTab.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/PluginsPanel.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/PluginsPanel.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/PluginsPanel.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/PluginsPanel.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/SampleProjectAction.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/SampleProjectAction.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/SampleProjectAction.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/SampleProjectAction.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/TabContentPane.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/TabContentPane.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/TabContentPane.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/TabContentPane.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/Tutorials.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/Tutorials.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/Tutorials.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/Tutorials.java
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/WhatsNewTab.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/WhatsNewTab.java
similarity index 100%
rename from welcome/src/org/netbeans/modules/welcome/ui/WhatsNewTab.java
rename to nb/welcome/src/org/netbeans/modules/welcome/ui/WhatsNewTab.java
diff --git a/welcome/test/unit/src/org/netbeans/modules/welcome/Bundle_te_ST.properties b/nb/welcome/test/unit/src/org/netbeans/modules/welcome/Bundle_te_ST.properties
similarity index 100%
rename from welcome/test/unit/src/org/netbeans/modules/welcome/Bundle_te_ST.properties
rename to nb/welcome/test/unit/src/org/netbeans/modules/welcome/Bundle_te_ST.properties
diff --git a/welcome/test/unit/src/org/netbeans/modules/welcome/FeedbackSurveyTest.java b/nb/welcome/test/unit/src/org/netbeans/modules/welcome/FeedbackSurveyTest.java
similarity index 100%
rename from welcome/test/unit/src/org/netbeans/modules/welcome/FeedbackSurveyTest.java
rename to nb/welcome/test/unit/src/org/netbeans/modules/welcome/FeedbackSurveyTest.java
diff --git a/welcome/test/unit/src/org/netbeans/modules/welcome/MemoryURL.java b/nb/welcome/test/unit/src/org/netbeans/modules/welcome/MemoryURL.java
similarity index 100%
rename from welcome/test/unit/src/org/netbeans/modules/welcome/MemoryURL.java
rename to nb/welcome/test/unit/src/org/netbeans/modules/welcome/MemoryURL.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists