From 8b7a7cbc813653a3248d6cf3a7779e220957bc85 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 8 May 2017 21:28:02 +0200 Subject: [PATCH] =?UTF-8?q?The=20great=20rename:=20the=20old=20=E2=80=98we?= =?UTF-8?q?bsite=E2=80=99=20is=20now=20=E2=80=98website-old=E2=80=99,=20an?= =?UTF-8?q?d=20=E2=80=98website2=E2=80=99=20is=20now=20=E2=80=98website?= =?UTF-8?q?=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildScripts/website.ant.xml | 44 +++++++++--------- src/website/lombok/website/WebsiteMaker.java | 6 +-- {website => website-old}/all-versions.html | 0 {website => website-old}/buttonbar.jpg | Bin {website => website-old}/buttonbar.psd | Bin .../buttonbar_unmodified.png | Bin {website => website-old}/changelog.html | 0 {website => website-old}/clear.gif | Bin {website => website-old}/credits.html | 0 .../disableCheckedExceptions.html | 0 .../download-edge-none.html | 0 {website => website-old}/download-edge.html | 0 {website => website-old}/download.html | 0 {website => website-old}/downloadButton.png | Bin {website => website-old}/downloadButton.svg | 0 {website => website-old}/favicon.ico | Bin .../features/Builder.html | 0 .../features/Cleanup.html | 0 .../features/Constructor.html | 0 {website => website-old}/features/Data.html | 0 .../features/EqualsAndHashCode.html | 0 .../features/GetterLazy.html | 0 .../features/GetterSetter.html | 0 {website => website-old}/features/Log.html | 0 .../features/NonNull.html | 0 .../features/Singular-snippet.html | 0 .../features/SneakyThrows.html | 0 .../features/Synchronized.html | 0 .../features/ToString.html | 0 {website => website-old}/features/Value.html | 0 {website => website-old}/features/clear.gif | Bin .../features/configuration.html | 0 .../features/delombok.html | 0 .../features/experimental/Accessors.html | 0 .../features/experimental/Builder.html | 0 .../features/experimental/Delegate.html | 0 .../experimental/ExtensionMethod.html | 0 .../features/experimental/FieldDefaults.html | 0 .../features/experimental/Value.html | 0 .../features/experimental/Wither.html | 0 .../features/experimental/index.html | 0 .../features/experimental/onX.html | 0 .../features/experimental/var.html | 0 .../features/features.css | 0 .../features/gradient.png | Bin {website => website-old}/features/index.html | 0 .../features/lombok-background.png | Bin {website => website-old}/features/val.html | 0 .../icon_brush_unused.png | Bin {website => website-old}/icon_bugs.png | Bin {website => website-old}/icon_contribute.png | Bin {website => website-old}/icon_discussion.png | Bin {website => website-old}/icon_download.png | Bin {website => website-old}/icon_overview.png | Bin {website => website-old}/index.css | 0 {website => website-old}/index.html | 0 {website => website-old}/logi/iepngfix.htc | 0 .../logi/iepngfix_tilebg.js | 0 {website => website-old}/logi/jQuery-all.js | 0 {website => website-old}/logi/reset.css | 0 {website => website-old}/lombokBullet.png | Bin {website => website-old}/mavenrepo/index.html | 0 {website => website-old}/novideo.html | 0 .../peppery_background_large.jpg | Bin {website => website-old}/poster.png | Bin {website => website-old}/reinier.jpg | Bin {website => website-old}/robbertjan.jpg | Bin {website => website-old}/roel.jpg | Bin {website => website-old}/sander.jpg | Bin {website => website-old}/setup/android.html | 0 {website => website-old}/setup/ecj.html | 0 {website => website-old}/setup/gwt.html | 0 ...enable-annotation-processing-in-editor.png | Bin {website => website-old}/setup/netbeans.html | 0 {website => website-old}/setup/pom.xml | 0 {website => website-old}/unknown_person.gif | Bin .../videos/expressInstall.swf | Bin .../videos/lombok-iPhone.m4v | Bin {website => website-old}/videos/lombok.mp4 | Bin {website => website-old}/videos/lombok.ogv | Bin {website => website-old}/videos/player.swf | Bin {website => website-old}/videos/poster.png | Bin {website => website-old}/videos/swfobject.js | 0 .../resources/css/bootstrap.css | 0 .../resources/css/custom.css | 0 {website2 => website}/resources/files/pom.xml | 0 .../resources/img/eclipse-about.png | Bin .../resources/img/lombok-installer.png | Bin ...enable-annotation-processing-in-editor.png | Bin .../resources/img/reinier.jpg | Bin {website2 => website}/resources/img/roel.jpg | Bin {website2 => website}/resources/js/history.js | 0 {website2 => website}/resources/js/main.js | 0 .../resources/js/swfobject.js | 0 {website2 => website}/resources/robots.txt | 0 .../templates/_scaffold.html | 0 .../templates/all-versions.html | 0 .../templates/changelog.html | 0 {website2 => website}/templates/credits.html | 0 .../templates/disable-checked-exceptions.html | 0 {website2 => website}/templates/download.html | 0 .../templates/features/Builder.html | 0 .../templates/features/BuilderSingular.html | 0 .../templates/features/Cleanup.html | 0 .../templates/features/Data.html | 0 .../templates/features/EqualsAndHashCode.html | 0 .../templates/features/GetterLazy.html | 0 .../templates/features/GetterSetter.html | 0 .../templates/features/NonNull.html | 0 .../templates/features/SneakyThrows.html | 0 .../templates/features/Synchronized.html | 0 .../templates/features/ToString.html | 0 .../templates/features/Value.html | 0 .../templates/features/_features.html | 0 .../templates/features/configuration.html | 0 .../templates/features/constructor.html | 0 .../templates/features/delombok.html | 0 .../features/experimental/Accessors.html | 0 .../features/experimental/Delegate.html | 0 .../experimental/ExtensionMethod.html | 0 .../features/experimental/FieldDefaults.html | 0 .../features/experimental/Helper.html | 0 .../features/experimental/UtilityClass.html | 0 .../features/experimental/Wither.html | 0 .../features/experimental/index.html | 0 .../templates/features/experimental/onX.html | 0 .../templates/features/experimental/var.html | 0 .../templates/features/index.html | 0 .../templates/features/log.html | 0 .../templates/features/val.html | 0 {website2 => website}/templates/main.html | 0 .../templates/setup/_setup.html | 0 .../templates/setup/android.html | 0 .../templates/setup/ecj.html | 0 .../templates/setup/eclipse.html | 0 .../templates/setup/gwt.html | 0 .../templates/setup/intellij.html | 0 .../templates/setup/javac.html | 0 .../templates/setup/netbeans.html | 0 .../usageExamples/BuilderExample_post.jpage | 0 .../usageExamples/BuilderExample_pre.jpage | 0 .../usageExamples/CleanupExample_post.jpage | 0 .../usageExamples/CleanupExample_pre.jpage | 0 .../ConstructorExample_post.jpage | 0 .../ConstructorExample_pre.jpage | 0 .../usageExamples/DataExample_post.jpage | 0 .../usageExamples/DataExample_pre.jpage | 0 .../EqualsAndHashCodeExample_post.jpage | 0 .../EqualsAndHashCodeExample_pre.jpage | 0 .../GetterLazyExample_post.jpage | 0 .../usageExamples/GetterLazyExample_pre.jpage | 0 .../GetterSetterExample_post.jpage | 0 .../GetterSetterExample_pre.jpage | 0 .../usageExamples/LogExample_post.jpage | 0 .../usageExamples/LogExample_pre.jpage | 0 .../usageExamples/NonNullExample_post.jpage | 0 .../usageExamples/NonNullExample_pre.jpage | 0 .../Singular-snippetExample_post.jpage | 0 .../Singular-snippetExample_pre.jpage | 0 .../SneakyThrowsExample_post.jpage | 0 .../SneakyThrowsExample_pre.jpage | 0 .../SynchronizedExample_post.jpage | 0 .../SynchronizedExample_pre.jpage | 0 .../usageExamples/ToStringExample_post.jpage | 0 .../usageExamples/ToStringExample_pre.jpage | 0 .../usageExamples/ValueExample_post.jpage | 0 .../usageExamples/ValueExample_pre.jpage | 0 .../experimental/AccessorsExample_post.jpage | 0 .../experimental/AccessorsExample_pre.jpage | 0 .../experimental/DelegateExample_post.jpage | 0 .../experimental/DelegateExample_pre.jpage | 0 .../ExtensionMethodExample_post.jpage | 0 .../ExtensionMethodExample_pre.jpage | 0 .../FieldDefaultsExample_post.jpage | 0 .../FieldDefaultsExample_pre.jpage | 0 .../experimental/HelperExample_post.jpage | 0 .../experimental/HelperExample_pre.jpage | 0 .../UtilityClassExample_post.jpage | 0 .../UtilityClassExample_pre.jpage | 0 .../experimental/WitherExample_post.jpage | 0 .../experimental/WitherExample_pre.jpage | 0 .../experimental/onXExample_post.jpage | 0 .../experimental/onXExample_pre.jpage | 0 .../usageExamples/valExample_post.jpage | 0 .../usageExamples/valExample_pre.jpage | 0 185 files changed, 25 insertions(+), 25 deletions(-) rename {website => website-old}/all-versions.html (100%) rename {website => website-old}/buttonbar.jpg (100%) rename {website => website-old}/buttonbar.psd (100%) rename {website => website-old}/buttonbar_unmodified.png (100%) rename {website => website-old}/changelog.html (100%) rename {website => website-old}/clear.gif (100%) rename {website => website-old}/credits.html (100%) rename {website => website-old}/disableCheckedExceptions.html (100%) rename {website => website-old}/download-edge-none.html (100%) rename {website => website-old}/download-edge.html (100%) rename {website => website-old}/download.html (100%) rename {website => website-old}/downloadButton.png (100%) rename {website => website-old}/downloadButton.svg (100%) rename {website => website-old}/favicon.ico (100%) rename {website => website-old}/features/Builder.html (100%) rename {website => website-old}/features/Cleanup.html (100%) rename {website => website-old}/features/Constructor.html (100%) rename {website => website-old}/features/Data.html (100%) rename {website => website-old}/features/EqualsAndHashCode.html (100%) rename {website => website-old}/features/GetterLazy.html (100%) rename {website => website-old}/features/GetterSetter.html (100%) rename {website => website-old}/features/Log.html (100%) rename {website => website-old}/features/NonNull.html (100%) rename {website => website-old}/features/Singular-snippet.html (100%) rename {website => website-old}/features/SneakyThrows.html (100%) rename {website => website-old}/features/Synchronized.html (100%) rename {website => website-old}/features/ToString.html (100%) rename {website => website-old}/features/Value.html (100%) rename {website => website-old}/features/clear.gif (100%) rename {website => website-old}/features/configuration.html (100%) rename {website => website-old}/features/delombok.html (100%) rename {website => website-old}/features/experimental/Accessors.html (100%) rename {website => website-old}/features/experimental/Builder.html (100%) rename {website => website-old}/features/experimental/Delegate.html (100%) rename {website => website-old}/features/experimental/ExtensionMethod.html (100%) rename {website => website-old}/features/experimental/FieldDefaults.html (100%) rename {website => website-old}/features/experimental/Value.html (100%) rename {website => website-old}/features/experimental/Wither.html (100%) rename {website => website-old}/features/experimental/index.html (100%) rename {website => website-old}/features/experimental/onX.html (100%) rename {website => website-old}/features/experimental/var.html (100%) rename {website => website-old}/features/features.css (100%) rename {website => website-old}/features/gradient.png (100%) rename {website => website-old}/features/index.html (100%) rename {website => website-old}/features/lombok-background.png (100%) rename {website => website-old}/features/val.html (100%) rename {website => website-old}/icon_brush_unused.png (100%) rename {website => website-old}/icon_bugs.png (100%) rename {website => website-old}/icon_contribute.png (100%) rename {website => website-old}/icon_discussion.png (100%) rename {website => website-old}/icon_download.png (100%) rename {website => website-old}/icon_overview.png (100%) rename {website => website-old}/index.css (100%) rename {website => website-old}/index.html (100%) rename {website => website-old}/logi/iepngfix.htc (100%) rename {website => website-old}/logi/iepngfix_tilebg.js (100%) rename {website => website-old}/logi/jQuery-all.js (100%) rename {website => website-old}/logi/reset.css (100%) rename {website => website-old}/lombokBullet.png (100%) rename {website => website-old}/mavenrepo/index.html (100%) rename {website => website-old}/novideo.html (100%) rename {website => website-old}/peppery_background_large.jpg (100%) rename {website => website-old}/poster.png (100%) rename {website => website-old}/reinier.jpg (100%) rename {website => website-old}/robbertjan.jpg (100%) rename {website => website-old}/roel.jpg (100%) rename {website => website-old}/sander.jpg (100%) rename {website => website-old}/setup/android.html (100%) rename {website => website-old}/setup/ecj.html (100%) rename {website => website-old}/setup/gwt.html (100%) rename {website => website-old}/setup/netbeans-enable-annotation-processing-in-editor.png (100%) rename {website => website-old}/setup/netbeans.html (100%) rename {website => website-old}/setup/pom.xml (100%) rename {website => website-old}/unknown_person.gif (100%) rename {website => website-old}/videos/expressInstall.swf (100%) rename {website => website-old}/videos/lombok-iPhone.m4v (100%) rename {website => website-old}/videos/lombok.mp4 (100%) rename {website => website-old}/videos/lombok.ogv (100%) rename {website => website-old}/videos/player.swf (100%) rename {website => website-old}/videos/poster.png (100%) rename {website => website-old}/videos/swfobject.js (100%) rename {website2 => website}/resources/css/bootstrap.css (100%) rename {website2 => website}/resources/css/custom.css (100%) rename {website2 => website}/resources/files/pom.xml (100%) rename {website2 => website}/resources/img/eclipse-about.png (100%) rename {website2 => website}/resources/img/lombok-installer.png (100%) rename {website2 => website}/resources/img/netbeans-enable-annotation-processing-in-editor.png (100%) rename {website2 => website}/resources/img/reinier.jpg (100%) rename {website2 => website}/resources/img/roel.jpg (100%) rename {website2 => website}/resources/js/history.js (100%) rename {website2 => website}/resources/js/main.js (100%) rename {website2 => website}/resources/js/swfobject.js (100%) rename {website2 => website}/resources/robots.txt (100%) rename {website2 => website}/templates/_scaffold.html (100%) rename {website2 => website}/templates/all-versions.html (100%) rename {website2 => website}/templates/changelog.html (100%) rename {website2 => website}/templates/credits.html (100%) rename {website2 => website}/templates/disable-checked-exceptions.html (100%) rename {website2 => website}/templates/download.html (100%) rename {website2 => website}/templates/features/Builder.html (100%) rename {website2 => website}/templates/features/BuilderSingular.html (100%) rename {website2 => website}/templates/features/Cleanup.html (100%) rename {website2 => website}/templates/features/Data.html (100%) rename {website2 => website}/templates/features/EqualsAndHashCode.html (100%) rename {website2 => website}/templates/features/GetterLazy.html (100%) rename {website2 => website}/templates/features/GetterSetter.html (100%) rename {website2 => website}/templates/features/NonNull.html (100%) rename {website2 => website}/templates/features/SneakyThrows.html (100%) rename {website2 => website}/templates/features/Synchronized.html (100%) rename {website2 => website}/templates/features/ToString.html (100%) rename {website2 => website}/templates/features/Value.html (100%) rename {website2 => website}/templates/features/_features.html (100%) rename {website2 => website}/templates/features/configuration.html (100%) rename {website2 => website}/templates/features/constructor.html (100%) rename {website2 => website}/templates/features/delombok.html (100%) rename {website2 => website}/templates/features/experimental/Accessors.html (100%) rename {website2 => website}/templates/features/experimental/Delegate.html (100%) rename {website2 => website}/templates/features/experimental/ExtensionMethod.html (100%) rename {website2 => website}/templates/features/experimental/FieldDefaults.html (100%) rename {website2 => website}/templates/features/experimental/Helper.html (100%) rename {website2 => website}/templates/features/experimental/UtilityClass.html (100%) rename {website2 => website}/templates/features/experimental/Wither.html (100%) rename {website2 => website}/templates/features/experimental/index.html (100%) rename {website2 => website}/templates/features/experimental/onX.html (100%) rename {website2 => website}/templates/features/experimental/var.html (100%) rename {website2 => website}/templates/features/index.html (100%) rename {website2 => website}/templates/features/log.html (100%) rename {website2 => website}/templates/features/val.html (100%) rename {website2 => website}/templates/main.html (100%) rename {website2 => website}/templates/setup/_setup.html (100%) rename {website2 => website}/templates/setup/android.html (100%) rename {website2 => website}/templates/setup/ecj.html (100%) rename {website2 => website}/templates/setup/eclipse.html (100%) rename {website2 => website}/templates/setup/gwt.html (100%) rename {website2 => website}/templates/setup/intellij.html (100%) rename {website2 => website}/templates/setup/javac.html (100%) rename {website2 => website}/templates/setup/netbeans.html (100%) rename {website2 => website}/usageExamples/BuilderExample_post.jpage (100%) rename {website2 => website}/usageExamples/BuilderExample_pre.jpage (100%) rename {website2 => website}/usageExamples/CleanupExample_post.jpage (100%) rename {website2 => website}/usageExamples/CleanupExample_pre.jpage (100%) rename {website2 => website}/usageExamples/ConstructorExample_post.jpage (100%) rename {website2 => website}/usageExamples/ConstructorExample_pre.jpage (100%) rename {website2 => website}/usageExamples/DataExample_post.jpage (100%) rename {website2 => website}/usageExamples/DataExample_pre.jpage (100%) rename {website2 => website}/usageExamples/EqualsAndHashCodeExample_post.jpage (100%) rename {website2 => website}/usageExamples/EqualsAndHashCodeExample_pre.jpage (100%) rename {website2 => website}/usageExamples/GetterLazyExample_post.jpage (100%) rename {website2 => website}/usageExamples/GetterLazyExample_pre.jpage (100%) rename {website2 => website}/usageExamples/GetterSetterExample_post.jpage (100%) rename {website2 => website}/usageExamples/GetterSetterExample_pre.jpage (100%) rename {website2 => website}/usageExamples/LogExample_post.jpage (100%) rename {website2 => website}/usageExamples/LogExample_pre.jpage (100%) rename {website2 => website}/usageExamples/NonNullExample_post.jpage (100%) rename {website2 => website}/usageExamples/NonNullExample_pre.jpage (100%) rename {website2 => website}/usageExamples/Singular-snippetExample_post.jpage (100%) rename {website2 => website}/usageExamples/Singular-snippetExample_pre.jpage (100%) rename {website2 => website}/usageExamples/SneakyThrowsExample_post.jpage (100%) rename {website2 => website}/usageExamples/SneakyThrowsExample_pre.jpage (100%) rename {website2 => website}/usageExamples/SynchronizedExample_post.jpage (100%) rename {website2 => website}/usageExamples/SynchronizedExample_pre.jpage (100%) rename {website2 => website}/usageExamples/ToStringExample_post.jpage (100%) rename {website2 => website}/usageExamples/ToStringExample_pre.jpage (100%) rename {website2 => website}/usageExamples/ValueExample_post.jpage (100%) rename {website2 => website}/usageExamples/ValueExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/AccessorsExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/AccessorsExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/DelegateExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/DelegateExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/ExtensionMethodExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/ExtensionMethodExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/FieldDefaultsExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/FieldDefaultsExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/HelperExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/HelperExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/UtilityClassExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/UtilityClassExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/WitherExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/WitherExample_pre.jpage (100%) rename {website2 => website}/usageExamples/experimental/onXExample_post.jpage (100%) rename {website2 => website}/usageExamples/experimental/onXExample_pre.jpage (100%) rename {website2 => website}/usageExamples/valExample_post.jpage (100%) rename {website2 => website}/usageExamples/valExample_pre.jpage (100%) diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index c1c780ae..697a5ad7 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -34,7 +34,7 @@ such as converting the changelog into HTML, and creating javadoc. - + @@ -63,23 +63,23 @@ such as converting the changelog into HTML, and creating javadoc. - + Your videos are newer than those on the website. They will be included too. - - - + + + - - - + + + @@ -94,9 +94,9 @@ such as converting the changelog into HTML, and creating javadoc. - - - + + + @@ -186,7 +186,7 @@ such as converting the changelog into HTML, and creating javadoc. - + @@ -207,10 +207,10 @@ such as converting the changelog into HTML, and creating javadoc. - + - + @@ -233,7 +233,7 @@ such as converting the changelog into HTML, and creating javadoc. - + @@ -276,7 +276,7 @@ such as converting the changelog into HTML, and creating javadoc. - + @@ -311,9 +311,9 @@ such as converting the changelog into HTML, and creating javadoc. - + - + @@ -322,10 +322,10 @@ such as converting the changelog into HTML, and creating javadoc. - - - - + + + + diff --git a/src/website/lombok/website/WebsiteMaker.java b/src/website/lombok/website/WebsiteMaker.java index ef078db6..d903340b 100644 --- a/src/website/lombok/website/WebsiteMaker.java +++ b/src/website/lombok/website/WebsiteMaker.java @@ -42,14 +42,14 @@ public class WebsiteMaker { File in, out; if (args.length == 0) { in = new File("."); - if (new File(in, "build.xml").isFile() && new File(in, "website2").isDirectory()) in = new File(in, "website2"); + if (new File(in, "build.xml").isFile() && new File(in, "website").isDirectory()) in = new File(in, "website"); } else { in = new File(args[0]); } if (args.length < 2) { - if (new File("./build.xml").isFile() && new File("./website2").isDirectory() && new File("./build").isDirectory()) { - out = new File("./build/website2"); + if (new File("./build.xml").isFile() && new File("./website").isDirectory() && new File("./build").isDirectory()) { + out = new File("./build/website"); } else { out = new File(in, "output"); } diff --git a/website/all-versions.html b/website-old/all-versions.html similarity index 100% rename from website/all-versions.html rename to website-old/all-versions.html diff --git a/website/buttonbar.jpg b/website-old/buttonbar.jpg similarity index 100% rename from website/buttonbar.jpg rename to website-old/buttonbar.jpg diff --git a/website/buttonbar.psd b/website-old/buttonbar.psd similarity index 100% rename from website/buttonbar.psd rename to website-old/buttonbar.psd diff --git a/website/buttonbar_unmodified.png b/website-old/buttonbar_unmodified.png similarity index 100% rename from website/buttonbar_unmodified.png rename to website-old/buttonbar_unmodified.png diff --git a/website/changelog.html b/website-old/changelog.html similarity index 100% rename from website/changelog.html rename to website-old/changelog.html diff --git a/website/clear.gif b/website-old/clear.gif similarity index 100% rename from website/clear.gif rename to website-old/clear.gif diff --git a/website/credits.html b/website-old/credits.html similarity index 100% rename from website/credits.html rename to website-old/credits.html diff --git a/website/disableCheckedExceptions.html b/website-old/disableCheckedExceptions.html similarity index 100% rename from website/disableCheckedExceptions.html rename to website-old/disableCheckedExceptions.html diff --git a/website/download-edge-none.html b/website-old/download-edge-none.html similarity index 100% rename from website/download-edge-none.html rename to website-old/download-edge-none.html diff --git a/website/download-edge.html b/website-old/download-edge.html similarity index 100% rename from website/download-edge.html rename to website-old/download-edge.html diff --git a/website/download.html b/website-old/download.html similarity index 100% rename from website/download.html rename to website-old/download.html diff --git a/website/downloadButton.png b/website-old/downloadButton.png similarity index 100% rename from website/downloadButton.png rename to website-old/downloadButton.png diff --git a/website/downloadButton.svg b/website-old/downloadButton.svg similarity index 100% rename from website/downloadButton.svg rename to website-old/downloadButton.svg diff --git a/website/favicon.ico b/website-old/favicon.ico similarity index 100% rename from website/favicon.ico rename to website-old/favicon.ico diff --git a/website/features/Builder.html b/website-old/features/Builder.html similarity index 100% rename from website/features/Builder.html rename to website-old/features/Builder.html diff --git a/website/features/Cleanup.html b/website-old/features/Cleanup.html similarity index 100% rename from website/features/Cleanup.html rename to website-old/features/Cleanup.html diff --git a/website/features/Constructor.html b/website-old/features/Constructor.html similarity index 100% rename from website/features/Constructor.html rename to website-old/features/Constructor.html diff --git a/website/features/Data.html b/website-old/features/Data.html similarity index 100% rename from website/features/Data.html rename to website-old/features/Data.html diff --git a/website/features/EqualsAndHashCode.html b/website-old/features/EqualsAndHashCode.html similarity index 100% rename from website/features/EqualsAndHashCode.html rename to website-old/features/EqualsAndHashCode.html diff --git a/website/features/GetterLazy.html b/website-old/features/GetterLazy.html similarity index 100% rename from website/features/GetterLazy.html rename to website-old/features/GetterLazy.html diff --git a/website/features/GetterSetter.html b/website-old/features/GetterSetter.html similarity index 100% rename from website/features/GetterSetter.html rename to website-old/features/GetterSetter.html diff --git a/website/features/Log.html b/website-old/features/Log.html similarity index 100% rename from website/features/Log.html rename to website-old/features/Log.html diff --git a/website/features/NonNull.html b/website-old/features/NonNull.html similarity index 100% rename from website/features/NonNull.html rename to website-old/features/NonNull.html diff --git a/website/features/Singular-snippet.html b/website-old/features/Singular-snippet.html similarity index 100% rename from website/features/Singular-snippet.html rename to website-old/features/Singular-snippet.html diff --git a/website/features/SneakyThrows.html b/website-old/features/SneakyThrows.html similarity index 100% rename from website/features/SneakyThrows.html rename to website-old/features/SneakyThrows.html diff --git a/website/features/Synchronized.html b/website-old/features/Synchronized.html similarity index 100% rename from website/features/Synchronized.html rename to website-old/features/Synchronized.html diff --git a/website/features/ToString.html b/website-old/features/ToString.html similarity index 100% rename from website/features/ToString.html rename to website-old/features/ToString.html diff --git a/website/features/Value.html b/website-old/features/Value.html similarity index 100% rename from website/features/Value.html rename to website-old/features/Value.html diff --git a/website/features/clear.gif b/website-old/features/clear.gif similarity index 100% rename from website/features/clear.gif rename to website-old/features/clear.gif diff --git a/website/features/configuration.html b/website-old/features/configuration.html similarity index 100% rename from website/features/configuration.html rename to website-old/features/configuration.html diff --git a/website/features/delombok.html b/website-old/features/delombok.html similarity index 100% rename from website/features/delombok.html rename to website-old/features/delombok.html diff --git a/website/features/experimental/Accessors.html b/website-old/features/experimental/Accessors.html similarity index 100% rename from website/features/experimental/Accessors.html rename to website-old/features/experimental/Accessors.html diff --git a/website/features/experimental/Builder.html b/website-old/features/experimental/Builder.html similarity index 100% rename from website/features/experimental/Builder.html rename to website-old/features/experimental/Builder.html diff --git a/website/features/experimental/Delegate.html b/website-old/features/experimental/Delegate.html similarity index 100% rename from website/features/experimental/Delegate.html rename to website-old/features/experimental/Delegate.html diff --git a/website/features/experimental/ExtensionMethod.html b/website-old/features/experimental/ExtensionMethod.html similarity index 100% rename from website/features/experimental/ExtensionMethod.html rename to website-old/features/experimental/ExtensionMethod.html diff --git a/website/features/experimental/FieldDefaults.html b/website-old/features/experimental/FieldDefaults.html similarity index 100% rename from website/features/experimental/FieldDefaults.html rename to website-old/features/experimental/FieldDefaults.html diff --git a/website/features/experimental/Value.html b/website-old/features/experimental/Value.html similarity index 100% rename from website/features/experimental/Value.html rename to website-old/features/experimental/Value.html diff --git a/website/features/experimental/Wither.html b/website-old/features/experimental/Wither.html similarity index 100% rename from website/features/experimental/Wither.html rename to website-old/features/experimental/Wither.html diff --git a/website/features/experimental/index.html b/website-old/features/experimental/index.html similarity index 100% rename from website/features/experimental/index.html rename to website-old/features/experimental/index.html diff --git a/website/features/experimental/onX.html b/website-old/features/experimental/onX.html similarity index 100% rename from website/features/experimental/onX.html rename to website-old/features/experimental/onX.html diff --git a/website/features/experimental/var.html b/website-old/features/experimental/var.html similarity index 100% rename from website/features/experimental/var.html rename to website-old/features/experimental/var.html diff --git a/website/features/features.css b/website-old/features/features.css similarity index 100% rename from website/features/features.css rename to website-old/features/features.css diff --git a/website/features/gradient.png b/website-old/features/gradient.png similarity index 100% rename from website/features/gradient.png rename to website-old/features/gradient.png diff --git a/website/features/index.html b/website-old/features/index.html similarity index 100% rename from website/features/index.html rename to website-old/features/index.html diff --git a/website/features/lombok-background.png b/website-old/features/lombok-background.png similarity index 100% rename from website/features/lombok-background.png rename to website-old/features/lombok-background.png diff --git a/website/features/val.html b/website-old/features/val.html similarity index 100% rename from website/features/val.html rename to website-old/features/val.html diff --git a/website/icon_brush_unused.png b/website-old/icon_brush_unused.png similarity index 100% rename from website/icon_brush_unused.png rename to website-old/icon_brush_unused.png diff --git a/website/icon_bugs.png b/website-old/icon_bugs.png similarity index 100% rename from website/icon_bugs.png rename to website-old/icon_bugs.png diff --git a/website/icon_contribute.png b/website-old/icon_contribute.png similarity index 100% rename from website/icon_contribute.png rename to website-old/icon_contribute.png diff --git a/website/icon_discussion.png b/website-old/icon_discussion.png similarity index 100% rename from website/icon_discussion.png rename to website-old/icon_discussion.png diff --git a/website/icon_download.png b/website-old/icon_download.png similarity index 100% rename from website/icon_download.png rename to website-old/icon_download.png diff --git a/website/icon_overview.png b/website-old/icon_overview.png similarity index 100% rename from website/icon_overview.png rename to website-old/icon_overview.png diff --git a/website/index.css b/website-old/index.css similarity index 100% rename from website/index.css rename to website-old/index.css diff --git a/website/index.html b/website-old/index.html similarity index 100% rename from website/index.html rename to website-old/index.html diff --git a/website/logi/iepngfix.htc b/website-old/logi/iepngfix.htc similarity index 100% rename from website/logi/iepngfix.htc rename to website-old/logi/iepngfix.htc diff --git a/website/logi/iepngfix_tilebg.js b/website-old/logi/iepngfix_tilebg.js similarity index 100% rename from website/logi/iepngfix_tilebg.js rename to website-old/logi/iepngfix_tilebg.js diff --git a/website/logi/jQuery-all.js b/website-old/logi/jQuery-all.js similarity index 100% rename from website/logi/jQuery-all.js rename to website-old/logi/jQuery-all.js diff --git a/website/logi/reset.css b/website-old/logi/reset.css similarity index 100% rename from website/logi/reset.css rename to website-old/logi/reset.css diff --git a/website/lombokBullet.png b/website-old/lombokBullet.png similarity index 100% rename from website/lombokBullet.png rename to website-old/lombokBullet.png diff --git a/website/mavenrepo/index.html b/website-old/mavenrepo/index.html similarity index 100% rename from website/mavenrepo/index.html rename to website-old/mavenrepo/index.html diff --git a/website/novideo.html b/website-old/novideo.html similarity index 100% rename from website/novideo.html rename to website-old/novideo.html diff --git a/website/peppery_background_large.jpg b/website-old/peppery_background_large.jpg similarity index 100% rename from website/peppery_background_large.jpg rename to website-old/peppery_background_large.jpg diff --git a/website/poster.png b/website-old/poster.png similarity index 100% rename from website/poster.png rename to website-old/poster.png diff --git a/website/reinier.jpg b/website-old/reinier.jpg similarity index 100% rename from website/reinier.jpg rename to website-old/reinier.jpg diff --git a/website/robbertjan.jpg b/website-old/robbertjan.jpg similarity index 100% rename from website/robbertjan.jpg rename to website-old/robbertjan.jpg diff --git a/website/roel.jpg b/website-old/roel.jpg similarity index 100% rename from website/roel.jpg rename to website-old/roel.jpg diff --git a/website/sander.jpg b/website-old/sander.jpg similarity index 100% rename from website/sander.jpg rename to website-old/sander.jpg diff --git a/website/setup/android.html b/website-old/setup/android.html similarity index 100% rename from website/setup/android.html rename to website-old/setup/android.html diff --git a/website/setup/ecj.html b/website-old/setup/ecj.html similarity index 100% rename from website/setup/ecj.html rename to website-old/setup/ecj.html diff --git a/website/setup/gwt.html b/website-old/setup/gwt.html similarity index 100% rename from website/setup/gwt.html rename to website-old/setup/gwt.html diff --git a/website/setup/netbeans-enable-annotation-processing-in-editor.png b/website-old/setup/netbeans-enable-annotation-processing-in-editor.png similarity index 100% rename from website/setup/netbeans-enable-annotation-processing-in-editor.png rename to website-old/setup/netbeans-enable-annotation-processing-in-editor.png diff --git a/website/setup/netbeans.html b/website-old/setup/netbeans.html similarity index 100% rename from website/setup/netbeans.html rename to website-old/setup/netbeans.html diff --git a/website/setup/pom.xml b/website-old/setup/pom.xml similarity index 100% rename from website/setup/pom.xml rename to website-old/setup/pom.xml diff --git a/website/unknown_person.gif b/website-old/unknown_person.gif similarity index 100% rename from website/unknown_person.gif rename to website-old/unknown_person.gif diff --git a/website/videos/expressInstall.swf b/website-old/videos/expressInstall.swf similarity index 100% rename from website/videos/expressInstall.swf rename to website-old/videos/expressInstall.swf diff --git a/website/videos/lombok-iPhone.m4v b/website-old/videos/lombok-iPhone.m4v similarity index 100% rename from website/videos/lombok-iPhone.m4v rename to website-old/videos/lombok-iPhone.m4v diff --git a/website/videos/lombok.mp4 b/website-old/videos/lombok.mp4 similarity index 100% rename from website/videos/lombok.mp4 rename to website-old/videos/lombok.mp4 diff --git a/website/videos/lombok.ogv b/website-old/videos/lombok.ogv similarity index 100% rename from website/videos/lombok.ogv rename to website-old/videos/lombok.ogv diff --git a/website/videos/player.swf b/website-old/videos/player.swf similarity index 100% rename from website/videos/player.swf rename to website-old/videos/player.swf diff --git a/website/videos/poster.png b/website-old/videos/poster.png similarity index 100% rename from website/videos/poster.png rename to website-old/videos/poster.png diff --git a/website/videos/swfobject.js b/website-old/videos/swfobject.js similarity index 100% rename from website/videos/swfobject.js rename to website-old/videos/swfobject.js diff --git a/website2/resources/css/bootstrap.css b/website/resources/css/bootstrap.css similarity index 100% rename from website2/resources/css/bootstrap.css rename to website/resources/css/bootstrap.css diff --git a/website2/resources/css/custom.css b/website/resources/css/custom.css similarity index 100% rename from website2/resources/css/custom.css rename to website/resources/css/custom.css diff --git a/website2/resources/files/pom.xml b/website/resources/files/pom.xml similarity index 100% rename from website2/resources/files/pom.xml rename to website/resources/files/pom.xml diff --git a/website2/resources/img/eclipse-about.png b/website/resources/img/eclipse-about.png similarity index 100% rename from website2/resources/img/eclipse-about.png rename to website/resources/img/eclipse-about.png diff --git a/website2/resources/img/lombok-installer.png b/website/resources/img/lombok-installer.png similarity index 100% rename from website2/resources/img/lombok-installer.png rename to website/resources/img/lombok-installer.png diff --git a/website2/resources/img/netbeans-enable-annotation-processing-in-editor.png b/website/resources/img/netbeans-enable-annotation-processing-in-editor.png similarity index 100% rename from website2/resources/img/netbeans-enable-annotation-processing-in-editor.png rename to website/resources/img/netbeans-enable-annotation-processing-in-editor.png diff --git a/website2/resources/img/reinier.jpg b/website/resources/img/reinier.jpg similarity index 100% rename from website2/resources/img/reinier.jpg rename to website/resources/img/reinier.jpg diff --git a/website2/resources/img/roel.jpg b/website/resources/img/roel.jpg similarity index 100% rename from website2/resources/img/roel.jpg rename to website/resources/img/roel.jpg diff --git a/website2/resources/js/history.js b/website/resources/js/history.js similarity index 100% rename from website2/resources/js/history.js rename to website/resources/js/history.js diff --git a/website2/resources/js/main.js b/website/resources/js/main.js similarity index 100% rename from website2/resources/js/main.js rename to website/resources/js/main.js diff --git a/website2/resources/js/swfobject.js b/website/resources/js/swfobject.js similarity index 100% rename from website2/resources/js/swfobject.js rename to website/resources/js/swfobject.js diff --git a/website2/resources/robots.txt b/website/resources/robots.txt similarity index 100% rename from website2/resources/robots.txt rename to website/resources/robots.txt diff --git a/website2/templates/_scaffold.html b/website/templates/_scaffold.html similarity index 100% rename from website2/templates/_scaffold.html rename to website/templates/_scaffold.html diff --git a/website2/templates/all-versions.html b/website/templates/all-versions.html similarity index 100% rename from website2/templates/all-versions.html rename to website/templates/all-versions.html diff --git a/website2/templates/changelog.html b/website/templates/changelog.html similarity index 100% rename from website2/templates/changelog.html rename to website/templates/changelog.html diff --git a/website2/templates/credits.html b/website/templates/credits.html similarity index 100% rename from website2/templates/credits.html rename to website/templates/credits.html diff --git a/website2/templates/disable-checked-exceptions.html b/website/templates/disable-checked-exceptions.html similarity index 100% rename from website2/templates/disable-checked-exceptions.html rename to website/templates/disable-checked-exceptions.html diff --git a/website2/templates/download.html b/website/templates/download.html similarity index 100% rename from website2/templates/download.html rename to website/templates/download.html diff --git a/website2/templates/features/Builder.html b/website/templates/features/Builder.html similarity index 100% rename from website2/templates/features/Builder.html rename to website/templates/features/Builder.html diff --git a/website2/templates/features/BuilderSingular.html b/website/templates/features/BuilderSingular.html similarity index 100% rename from website2/templates/features/BuilderSingular.html rename to website/templates/features/BuilderSingular.html diff --git a/website2/templates/features/Cleanup.html b/website/templates/features/Cleanup.html similarity index 100% rename from website2/templates/features/Cleanup.html rename to website/templates/features/Cleanup.html diff --git a/website2/templates/features/Data.html b/website/templates/features/Data.html similarity index 100% rename from website2/templates/features/Data.html rename to website/templates/features/Data.html diff --git a/website2/templates/features/EqualsAndHashCode.html b/website/templates/features/EqualsAndHashCode.html similarity index 100% rename from website2/templates/features/EqualsAndHashCode.html rename to website/templates/features/EqualsAndHashCode.html diff --git a/website2/templates/features/GetterLazy.html b/website/templates/features/GetterLazy.html similarity index 100% rename from website2/templates/features/GetterLazy.html rename to website/templates/features/GetterLazy.html diff --git a/website2/templates/features/GetterSetter.html b/website/templates/features/GetterSetter.html similarity index 100% rename from website2/templates/features/GetterSetter.html rename to website/templates/features/GetterSetter.html diff --git a/website2/templates/features/NonNull.html b/website/templates/features/NonNull.html similarity index 100% rename from website2/templates/features/NonNull.html rename to website/templates/features/NonNull.html diff --git a/website2/templates/features/SneakyThrows.html b/website/templates/features/SneakyThrows.html similarity index 100% rename from website2/templates/features/SneakyThrows.html rename to website/templates/features/SneakyThrows.html diff --git a/website2/templates/features/Synchronized.html b/website/templates/features/Synchronized.html similarity index 100% rename from website2/templates/features/Synchronized.html rename to website/templates/features/Synchronized.html diff --git a/website2/templates/features/ToString.html b/website/templates/features/ToString.html similarity index 100% rename from website2/templates/features/ToString.html rename to website/templates/features/ToString.html diff --git a/website2/templates/features/Value.html b/website/templates/features/Value.html similarity index 100% rename from website2/templates/features/Value.html rename to website/templates/features/Value.html diff --git a/website2/templates/features/_features.html b/website/templates/features/_features.html similarity index 100% rename from website2/templates/features/_features.html rename to website/templates/features/_features.html diff --git a/website2/templates/features/configuration.html b/website/templates/features/configuration.html similarity index 100% rename from website2/templates/features/configuration.html rename to website/templates/features/configuration.html diff --git a/website2/templates/features/constructor.html b/website/templates/features/constructor.html similarity index 100% rename from website2/templates/features/constructor.html rename to website/templates/features/constructor.html diff --git a/website2/templates/features/delombok.html b/website/templates/features/delombok.html similarity index 100% rename from website2/templates/features/delombok.html rename to website/templates/features/delombok.html diff --git a/website2/templates/features/experimental/Accessors.html b/website/templates/features/experimental/Accessors.html similarity index 100% rename from website2/templates/features/experimental/Accessors.html rename to website/templates/features/experimental/Accessors.html diff --git a/website2/templates/features/experimental/Delegate.html b/website/templates/features/experimental/Delegate.html similarity index 100% rename from website2/templates/features/experimental/Delegate.html rename to website/templates/features/experimental/Delegate.html diff --git a/website2/templates/features/experimental/ExtensionMethod.html b/website/templates/features/experimental/ExtensionMethod.html similarity index 100% rename from website2/templates/features/experimental/ExtensionMethod.html rename to website/templates/features/experimental/ExtensionMethod.html diff --git a/website2/templates/features/experimental/FieldDefaults.html b/website/templates/features/experimental/FieldDefaults.html similarity index 100% rename from website2/templates/features/experimental/FieldDefaults.html rename to website/templates/features/experimental/FieldDefaults.html diff --git a/website2/templates/features/experimental/Helper.html b/website/templates/features/experimental/Helper.html similarity index 100% rename from website2/templates/features/experimental/Helper.html rename to website/templates/features/experimental/Helper.html diff --git a/website2/templates/features/experimental/UtilityClass.html b/website/templates/features/experimental/UtilityClass.html similarity index 100% rename from website2/templates/features/experimental/UtilityClass.html rename to website/templates/features/experimental/UtilityClass.html diff --git a/website2/templates/features/experimental/Wither.html b/website/templates/features/experimental/Wither.html similarity index 100% rename from website2/templates/features/experimental/Wither.html rename to website/templates/features/experimental/Wither.html diff --git a/website2/templates/features/experimental/index.html b/website/templates/features/experimental/index.html similarity index 100% rename from website2/templates/features/experimental/index.html rename to website/templates/features/experimental/index.html diff --git a/website2/templates/features/experimental/onX.html b/website/templates/features/experimental/onX.html similarity index 100% rename from website2/templates/features/experimental/onX.html rename to website/templates/features/experimental/onX.html diff --git a/website2/templates/features/experimental/var.html b/website/templates/features/experimental/var.html similarity index 100% rename from website2/templates/features/experimental/var.html rename to website/templates/features/experimental/var.html diff --git a/website2/templates/features/index.html b/website/templates/features/index.html similarity index 100% rename from website2/templates/features/index.html rename to website/templates/features/index.html diff --git a/website2/templates/features/log.html b/website/templates/features/log.html similarity index 100% rename from website2/templates/features/log.html rename to website/templates/features/log.html diff --git a/website2/templates/features/val.html b/website/templates/features/val.html similarity index 100% rename from website2/templates/features/val.html rename to website/templates/features/val.html diff --git a/website2/templates/main.html b/website/templates/main.html similarity index 100% rename from website2/templates/main.html rename to website/templates/main.html diff --git a/website2/templates/setup/_setup.html b/website/templates/setup/_setup.html similarity index 100% rename from website2/templates/setup/_setup.html rename to website/templates/setup/_setup.html diff --git a/website2/templates/setup/android.html b/website/templates/setup/android.html similarity index 100% rename from website2/templates/setup/android.html rename to website/templates/setup/android.html diff --git a/website2/templates/setup/ecj.html b/website/templates/setup/ecj.html similarity index 100% rename from website2/templates/setup/ecj.html rename to website/templates/setup/ecj.html diff --git a/website2/templates/setup/eclipse.html b/website/templates/setup/eclipse.html similarity index 100% rename from website2/templates/setup/eclipse.html rename to website/templates/setup/eclipse.html diff --git a/website2/templates/setup/gwt.html b/website/templates/setup/gwt.html similarity index 100% rename from website2/templates/setup/gwt.html rename to website/templates/setup/gwt.html diff --git a/website2/templates/setup/intellij.html b/website/templates/setup/intellij.html similarity index 100% rename from website2/templates/setup/intellij.html rename to website/templates/setup/intellij.html diff --git a/website2/templates/setup/javac.html b/website/templates/setup/javac.html similarity index 100% rename from website2/templates/setup/javac.html rename to website/templates/setup/javac.html diff --git a/website2/templates/setup/netbeans.html b/website/templates/setup/netbeans.html similarity index 100% rename from website2/templates/setup/netbeans.html rename to website/templates/setup/netbeans.html diff --git a/website2/usageExamples/BuilderExample_post.jpage b/website/usageExamples/BuilderExample_post.jpage similarity index 100% rename from website2/usageExamples/BuilderExample_post.jpage rename to website/usageExamples/BuilderExample_post.jpage diff --git a/website2/usageExamples/BuilderExample_pre.jpage b/website/usageExamples/BuilderExample_pre.jpage similarity index 100% rename from website2/usageExamples/BuilderExample_pre.jpage rename to website/usageExamples/BuilderExample_pre.jpage diff --git a/website2/usageExamples/CleanupExample_post.jpage b/website/usageExamples/CleanupExample_post.jpage similarity index 100% rename from website2/usageExamples/CleanupExample_post.jpage rename to website/usageExamples/CleanupExample_post.jpage diff --git a/website2/usageExamples/CleanupExample_pre.jpage b/website/usageExamples/CleanupExample_pre.jpage similarity index 100% rename from website2/usageExamples/CleanupExample_pre.jpage rename to website/usageExamples/CleanupExample_pre.jpage diff --git a/website2/usageExamples/ConstructorExample_post.jpage b/website/usageExamples/ConstructorExample_post.jpage similarity index 100% rename from website2/usageExamples/ConstructorExample_post.jpage rename to website/usageExamples/ConstructorExample_post.jpage diff --git a/website2/usageExamples/ConstructorExample_pre.jpage b/website/usageExamples/ConstructorExample_pre.jpage similarity index 100% rename from website2/usageExamples/ConstructorExample_pre.jpage rename to website/usageExamples/ConstructorExample_pre.jpage diff --git a/website2/usageExamples/DataExample_post.jpage b/website/usageExamples/DataExample_post.jpage similarity index 100% rename from website2/usageExamples/DataExample_post.jpage rename to website/usageExamples/DataExample_post.jpage diff --git a/website2/usageExamples/DataExample_pre.jpage b/website/usageExamples/DataExample_pre.jpage similarity index 100% rename from website2/usageExamples/DataExample_pre.jpage rename to website/usageExamples/DataExample_pre.jpage diff --git a/website2/usageExamples/EqualsAndHashCodeExample_post.jpage b/website/usageExamples/EqualsAndHashCodeExample_post.jpage similarity index 100% rename from website2/usageExamples/EqualsAndHashCodeExample_post.jpage rename to website/usageExamples/EqualsAndHashCodeExample_post.jpage diff --git a/website2/usageExamples/EqualsAndHashCodeExample_pre.jpage b/website/usageExamples/EqualsAndHashCodeExample_pre.jpage similarity index 100% rename from website2/usageExamples/EqualsAndHashCodeExample_pre.jpage rename to website/usageExamples/EqualsAndHashCodeExample_pre.jpage diff --git a/website2/usageExamples/GetterLazyExample_post.jpage b/website/usageExamples/GetterLazyExample_post.jpage similarity index 100% rename from website2/usageExamples/GetterLazyExample_post.jpage rename to website/usageExamples/GetterLazyExample_post.jpage diff --git a/website2/usageExamples/GetterLazyExample_pre.jpage b/website/usageExamples/GetterLazyExample_pre.jpage similarity index 100% rename from website2/usageExamples/GetterLazyExample_pre.jpage rename to website/usageExamples/GetterLazyExample_pre.jpage diff --git a/website2/usageExamples/GetterSetterExample_post.jpage b/website/usageExamples/GetterSetterExample_post.jpage similarity index 100% rename from website2/usageExamples/GetterSetterExample_post.jpage rename to website/usageExamples/GetterSetterExample_post.jpage diff --git a/website2/usageExamples/GetterSetterExample_pre.jpage b/website/usageExamples/GetterSetterExample_pre.jpage similarity index 100% rename from website2/usageExamples/GetterSetterExample_pre.jpage rename to website/usageExamples/GetterSetterExample_pre.jpage diff --git a/website2/usageExamples/LogExample_post.jpage b/website/usageExamples/LogExample_post.jpage similarity index 100% rename from website2/usageExamples/LogExample_post.jpage rename to website/usageExamples/LogExample_post.jpage diff --git a/website2/usageExamples/LogExample_pre.jpage b/website/usageExamples/LogExample_pre.jpage similarity index 100% rename from website2/usageExamples/LogExample_pre.jpage rename to website/usageExamples/LogExample_pre.jpage diff --git a/website2/usageExamples/NonNullExample_post.jpage b/website/usageExamples/NonNullExample_post.jpage similarity index 100% rename from website2/usageExamples/NonNullExample_post.jpage rename to website/usageExamples/NonNullExample_post.jpage diff --git a/website2/usageExamples/NonNullExample_pre.jpage b/website/usageExamples/NonNullExample_pre.jpage similarity index 100% rename from website2/usageExamples/NonNullExample_pre.jpage rename to website/usageExamples/NonNullExample_pre.jpage diff --git a/website2/usageExamples/Singular-snippetExample_post.jpage b/website/usageExamples/Singular-snippetExample_post.jpage similarity index 100% rename from website2/usageExamples/Singular-snippetExample_post.jpage rename to website/usageExamples/Singular-snippetExample_post.jpage diff --git a/website2/usageExamples/Singular-snippetExample_pre.jpage b/website/usageExamples/Singular-snippetExample_pre.jpage similarity index 100% rename from website2/usageExamples/Singular-snippetExample_pre.jpage rename to website/usageExamples/Singular-snippetExample_pre.jpage diff --git a/website2/usageExamples/SneakyThrowsExample_post.jpage b/website/usageExamples/SneakyThrowsExample_post.jpage similarity index 100% rename from website2/usageExamples/SneakyThrowsExample_post.jpage rename to website/usageExamples/SneakyThrowsExample_post.jpage diff --git a/website2/usageExamples/SneakyThrowsExample_pre.jpage b/website/usageExamples/SneakyThrowsExample_pre.jpage similarity index 100% rename from website2/usageExamples/SneakyThrowsExample_pre.jpage rename to website/usageExamples/SneakyThrowsExample_pre.jpage diff --git a/website2/usageExamples/SynchronizedExample_post.jpage b/website/usageExamples/SynchronizedExample_post.jpage similarity index 100% rename from website2/usageExamples/SynchronizedExample_post.jpage rename to website/usageExamples/SynchronizedExample_post.jpage diff --git a/website2/usageExamples/SynchronizedExample_pre.jpage b/website/usageExamples/SynchronizedExample_pre.jpage similarity index 100% rename from website2/usageExamples/SynchronizedExample_pre.jpage rename to website/usageExamples/SynchronizedExample_pre.jpage diff --git a/website2/usageExamples/ToStringExample_post.jpage b/website/usageExamples/ToStringExample_post.jpage similarity index 100% rename from website2/usageExamples/ToStringExample_post.jpage rename to website/usageExamples/ToStringExample_post.jpage diff --git a/website2/usageExamples/ToStringExample_pre.jpage b/website/usageExamples/ToStringExample_pre.jpage similarity index 100% rename from website2/usageExamples/ToStringExample_pre.jpage rename to website/usageExamples/ToStringExample_pre.jpage diff --git a/website2/usageExamples/ValueExample_post.jpage b/website/usageExamples/ValueExample_post.jpage similarity index 100% rename from website2/usageExamples/ValueExample_post.jpage rename to website/usageExamples/ValueExample_post.jpage diff --git a/website2/usageExamples/ValueExample_pre.jpage b/website/usageExamples/ValueExample_pre.jpage similarity index 100% rename from website2/usageExamples/ValueExample_pre.jpage rename to website/usageExamples/ValueExample_pre.jpage diff --git a/website2/usageExamples/experimental/AccessorsExample_post.jpage b/website/usageExamples/experimental/AccessorsExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/AccessorsExample_post.jpage rename to website/usageExamples/experimental/AccessorsExample_post.jpage diff --git a/website2/usageExamples/experimental/AccessorsExample_pre.jpage b/website/usageExamples/experimental/AccessorsExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/AccessorsExample_pre.jpage rename to website/usageExamples/experimental/AccessorsExample_pre.jpage diff --git a/website2/usageExamples/experimental/DelegateExample_post.jpage b/website/usageExamples/experimental/DelegateExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/DelegateExample_post.jpage rename to website/usageExamples/experimental/DelegateExample_post.jpage diff --git a/website2/usageExamples/experimental/DelegateExample_pre.jpage b/website/usageExamples/experimental/DelegateExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/DelegateExample_pre.jpage rename to website/usageExamples/experimental/DelegateExample_pre.jpage diff --git a/website2/usageExamples/experimental/ExtensionMethodExample_post.jpage b/website/usageExamples/experimental/ExtensionMethodExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/ExtensionMethodExample_post.jpage rename to website/usageExamples/experimental/ExtensionMethodExample_post.jpage diff --git a/website2/usageExamples/experimental/ExtensionMethodExample_pre.jpage b/website/usageExamples/experimental/ExtensionMethodExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/ExtensionMethodExample_pre.jpage rename to website/usageExamples/experimental/ExtensionMethodExample_pre.jpage diff --git a/website2/usageExamples/experimental/FieldDefaultsExample_post.jpage b/website/usageExamples/experimental/FieldDefaultsExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/FieldDefaultsExample_post.jpage rename to website/usageExamples/experimental/FieldDefaultsExample_post.jpage diff --git a/website2/usageExamples/experimental/FieldDefaultsExample_pre.jpage b/website/usageExamples/experimental/FieldDefaultsExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/FieldDefaultsExample_pre.jpage rename to website/usageExamples/experimental/FieldDefaultsExample_pre.jpage diff --git a/website2/usageExamples/experimental/HelperExample_post.jpage b/website/usageExamples/experimental/HelperExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/HelperExample_post.jpage rename to website/usageExamples/experimental/HelperExample_post.jpage diff --git a/website2/usageExamples/experimental/HelperExample_pre.jpage b/website/usageExamples/experimental/HelperExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/HelperExample_pre.jpage rename to website/usageExamples/experimental/HelperExample_pre.jpage diff --git a/website2/usageExamples/experimental/UtilityClassExample_post.jpage b/website/usageExamples/experimental/UtilityClassExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/UtilityClassExample_post.jpage rename to website/usageExamples/experimental/UtilityClassExample_post.jpage diff --git a/website2/usageExamples/experimental/UtilityClassExample_pre.jpage b/website/usageExamples/experimental/UtilityClassExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/UtilityClassExample_pre.jpage rename to website/usageExamples/experimental/UtilityClassExample_pre.jpage diff --git a/website2/usageExamples/experimental/WitherExample_post.jpage b/website/usageExamples/experimental/WitherExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/WitherExample_post.jpage rename to website/usageExamples/experimental/WitherExample_post.jpage diff --git a/website2/usageExamples/experimental/WitherExample_pre.jpage b/website/usageExamples/experimental/WitherExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/WitherExample_pre.jpage rename to website/usageExamples/experimental/WitherExample_pre.jpage diff --git a/website2/usageExamples/experimental/onXExample_post.jpage b/website/usageExamples/experimental/onXExample_post.jpage similarity index 100% rename from website2/usageExamples/experimental/onXExample_post.jpage rename to website/usageExamples/experimental/onXExample_post.jpage diff --git a/website2/usageExamples/experimental/onXExample_pre.jpage b/website/usageExamples/experimental/onXExample_pre.jpage similarity index 100% rename from website2/usageExamples/experimental/onXExample_pre.jpage rename to website/usageExamples/experimental/onXExample_pre.jpage diff --git a/website2/usageExamples/valExample_post.jpage b/website/usageExamples/valExample_post.jpage similarity index 100% rename from website2/usageExamples/valExample_post.jpage rename to website/usageExamples/valExample_post.jpage diff --git a/website2/usageExamples/valExample_pre.jpage b/website/usageExamples/valExample_pre.jpage similarity index 100% rename from website2/usageExamples/valExample_pre.jpage rename to website/usageExamples/valExample_pre.jpage