diff --git a/Andrea1/archive-articles.ftl b/Andrea/archive-articles.ftl
similarity index 100%
rename from Andrea1/archive-articles.ftl
rename to Andrea/archive-articles.ftl
diff --git a/Andrea1/article-list.ftl b/Andrea/article-list.ftl
similarity index 100%
rename from Andrea1/article-list.ftl
rename to Andrea/article-list.ftl
diff --git a/Andrea1/article.ftl b/Andrea/article.ftl
similarity index 100%
rename from Andrea1/article.ftl
rename to Andrea/article.ftl
diff --git a/Andrea1/author-articles.ftl b/Andrea/author-articles.ftl
similarity index 100%
rename from Andrea1/author-articles.ftl
rename to Andrea/author-articles.ftl
diff --git a/Andrea1/category-articles.ftl b/Andrea/category-articles.ftl
similarity index 100%
rename from Andrea1/category-articles.ftl
rename to Andrea/category-articles.ftl
diff --git a/Andrea1/common-comment.ftl b/Andrea/common-comment.ftl
similarity index 100%
rename from Andrea1/common-comment.ftl
rename to Andrea/common-comment.ftl
diff --git a/Andrea1/css/Andrea.css b/Andrea/css/Andrea.css
similarity index 100%
rename from Andrea1/css/Andrea.css
rename to Andrea/css/Andrea.css
diff --git a/Andrea1/css/Andrea.min.css b/Andrea/css/Andrea.min.css
similarity index 100%
rename from Andrea1/css/Andrea.min.css
rename to Andrea/css/Andrea.min.css
diff --git a/Andrea1/footer.ftl b/Andrea/footer.ftl
similarity index 100%
rename from Andrea1/footer.ftl
rename to Andrea/footer.ftl
diff --git a/Andrea1/header.ftl b/Andrea/header.ftl
similarity index 100%
rename from Andrea1/header.ftl
rename to Andrea/header.ftl
diff --git a/Andrea1/images/bg-blue.jpg b/Andrea/images/bg-blue.jpg
similarity index 100%
rename from Andrea1/images/bg-blue.jpg
rename to Andrea/images/bg-blue.jpg
diff --git a/Andrea1/images/bg-brown.jpg b/Andrea/images/bg-brown.jpg
similarity index 100%
rename from Andrea1/images/bg-brown.jpg
rename to Andrea/images/bg-brown.jpg
diff --git a/Andrea1/images/bg-grey.jpg b/Andrea/images/bg-grey.jpg
similarity index 100%
rename from Andrea1/images/bg-grey.jpg
rename to Andrea/images/bg-grey.jpg
diff --git a/Andrea1/images/bg-transparent.png b/Andrea/images/bg-transparent.png
similarity index 100%
rename from Andrea1/images/bg-transparent.png
rename to Andrea/images/bg-transparent.png
diff --git a/Andrea1/images/bgs.png b/Andrea/images/bgs.png
similarity index 100%
rename from Andrea1/images/bgs.png
rename to Andrea/images/bgs.png
diff --git a/Andrea1/images/footer.png b/Andrea/images/footer.png
similarity index 100%
rename from Andrea1/images/footer.png
rename to Andrea/images/footer.png
diff --git a/Andrea1/images/icon.png b/Andrea/images/icon.png
similarity index 100%
rename from Andrea1/images/icon.png
rename to Andrea/images/icon.png
diff --git a/Andrea1/images/paint.png b/Andrea/images/paint.png
similarity index 100%
rename from Andrea1/images/paint.png
rename to Andrea/images/paint.png
diff --git a/Andrea1/index.ftl b/Andrea/index.ftl
similarity index 100%
rename from Andrea1/index.ftl
rename to Andrea/index.ftl
diff --git a/Andrea1/lang/lang_en_US.properties b/Andrea/lang/lang_en_US.properties
similarity index 100%
rename from Andrea1/lang/lang_en_US.properties
rename to Andrea/lang/lang_en_US.properties
diff --git a/Andrea1/lang/lang_zh_CN.properties b/Andrea/lang/lang_zh_CN.properties
similarity index 100%
rename from Andrea1/lang/lang_zh_CN.properties
rename to Andrea/lang/lang_zh_CN.properties
diff --git a/Andrea1/macro-comments.ftl b/Andrea/macro-comments.ftl
similarity index 100%
rename from Andrea1/macro-comments.ftl
rename to Andrea/macro-comments.ftl
diff --git a/Andrea1/macro-head.ftl b/Andrea/macro-head.ftl
similarity index 100%
rename from Andrea1/macro-head.ftl
rename to Andrea/macro-head.ftl
diff --git a/Andrea1/page.ftl b/Andrea/page.ftl
similarity index 100%
rename from Andrea1/page.ftl
rename to Andrea/page.ftl
diff --git a/Andrea1/preview.png b/Andrea/preview.png
similarity index 100%
rename from Andrea1/preview.png
rename to Andrea/preview.png
diff --git a/Andrea1/side-tool.ftl b/Andrea/side-tool.ftl
similarity index 100%
rename from Andrea1/side-tool.ftl
rename to Andrea/side-tool.ftl
diff --git a/Andrea1/side.ftl b/Andrea/side.ftl
similarity index 100%
rename from Andrea1/side.ftl
rename to Andrea/side.ftl
diff --git a/Andrea1/skin.properties b/Andrea/skin.properties
similarity index 100%
rename from Andrea1/skin.properties
rename to Andrea/skin.properties
diff --git a/Andrea1/tag-articles.ftl b/Andrea/tag-articles.ftl
similarity index 100%
rename from Andrea1/tag-articles.ftl
rename to Andrea/tag-articles.ftl
diff --git a/Andrea1/tags.ftl b/Andrea/tags.ftl
similarity index 100%
rename from Andrea1/tags.ftl
rename to Andrea/tags.ftl
diff --git a/Bruce1/archive-articles.ftl b/Bruce/archive-articles.ftl
similarity index 100%
rename from Bruce1/archive-articles.ftl
rename to Bruce/archive-articles.ftl
diff --git a/Bruce1/archives.ftl b/Bruce/archives.ftl
similarity index 100%
rename from Bruce1/archives.ftl
rename to Bruce/archives.ftl
diff --git a/Bruce1/article-list.ftl b/Bruce/article-list.ftl
similarity index 100%
rename from Bruce1/article-list.ftl
rename to Bruce/article-list.ftl
diff --git a/Bruce1/article.ftl b/Bruce/article.ftl
similarity index 100%
rename from Bruce1/article.ftl
rename to Bruce/article.ftl
diff --git a/Bruce1/category-articles.ftl b/Bruce/category-articles.ftl
similarity index 100%
rename from Bruce1/category-articles.ftl
rename to Bruce/category-articles.ftl
diff --git a/Bruce1/common-comment.ftl b/Bruce/common-comment.ftl
similarity index 100%
rename from Bruce1/common-comment.ftl
rename to Bruce/common-comment.ftl
diff --git a/Bruce1/css/Bruce.css b/Bruce/css/Bruce.css
similarity index 100%
rename from Bruce1/css/Bruce.css
rename to Bruce/css/Bruce.css
diff --git a/Bruce1/css/Bruce.min.css b/Bruce/css/Bruce.min.css
similarity index 100%
rename from Bruce1/css/Bruce.min.css
rename to Bruce/css/Bruce.min.css
diff --git a/Bruce1/css/bootstrap-theme.css b/Bruce/css/bootstrap-theme.css
similarity index 100%
rename from Bruce1/css/bootstrap-theme.css
rename to Bruce/css/bootstrap-theme.css
diff --git a/Bruce1/css/bootstrap-theme.css.map b/Bruce/css/bootstrap-theme.css.map
similarity index 100%
rename from Bruce1/css/bootstrap-theme.css.map
rename to Bruce/css/bootstrap-theme.css.map
diff --git a/Bruce1/css/bootstrap-theme.min.css b/Bruce/css/bootstrap-theme.min.css
similarity index 100%
rename from Bruce1/css/bootstrap-theme.min.css
rename to Bruce/css/bootstrap-theme.min.css
diff --git a/Bruce1/css/bootstrap.css b/Bruce/css/bootstrap.css
similarity index 100%
rename from Bruce1/css/bootstrap.css
rename to Bruce/css/bootstrap.css
diff --git a/Bruce1/css/bootstrap.css.map b/Bruce/css/bootstrap.css.map
similarity index 100%
rename from Bruce1/css/bootstrap.css.map
rename to Bruce/css/bootstrap.css.map
diff --git a/Bruce1/css/bootstrap.min.css b/Bruce/css/bootstrap.min.css
similarity index 100%
rename from Bruce1/css/bootstrap.min.css
rename to Bruce/css/bootstrap.min.css
diff --git a/Bruce1/fonts/glyphicons-halflings-regular.eot b/Bruce/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from Bruce1/fonts/glyphicons-halflings-regular.eot
rename to Bruce/fonts/glyphicons-halflings-regular.eot
diff --git a/Bruce1/fonts/glyphicons-halflings-regular.svg b/Bruce/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from Bruce1/fonts/glyphicons-halflings-regular.svg
rename to Bruce/fonts/glyphicons-halflings-regular.svg
diff --git a/Bruce1/fonts/glyphicons-halflings-regular.ttf b/Bruce/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from Bruce1/fonts/glyphicons-halflings-regular.ttf
rename to Bruce/fonts/glyphicons-halflings-regular.ttf
diff --git a/Bruce1/fonts/glyphicons-halflings-regular.woff b/Bruce/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from Bruce1/fonts/glyphicons-halflings-regular.woff
rename to Bruce/fonts/glyphicons-halflings-regular.woff
diff --git a/Bruce1/footer.ftl b/Bruce/footer.ftl
similarity index 100%
rename from Bruce1/footer.ftl
rename to Bruce/footer.ftl
diff --git a/Bruce1/header.ftl b/Bruce/header.ftl
similarity index 100%
rename from Bruce1/header.ftl
rename to Bruce/header.ftl
diff --git a/Bruce1/index.ftl b/Bruce/index.ftl
similarity index 100%
rename from Bruce1/index.ftl
rename to Bruce/index.ftl
diff --git a/Bruce1/js/bootstrap.js b/Bruce/js/bootstrap.js
similarity index 100%
rename from Bruce1/js/bootstrap.js
rename to Bruce/js/bootstrap.js
diff --git a/Bruce1/js/bootstrap.min.js b/Bruce/js/bootstrap.min.js
similarity index 100%
rename from Bruce1/js/bootstrap.min.js
rename to Bruce/js/bootstrap.min.js
diff --git a/Bruce1/lang/lang_en_US.properties b/Bruce/lang/lang_en_US.properties
similarity index 100%
rename from Bruce1/lang/lang_en_US.properties
rename to Bruce/lang/lang_en_US.properties
diff --git a/Bruce1/lang/lang_zh_CN.properties b/Bruce/lang/lang_zh_CN.properties
similarity index 100%
rename from Bruce1/lang/lang_zh_CN.properties
rename to Bruce/lang/lang_zh_CN.properties
diff --git a/Bruce1/links.ftl b/Bruce/links.ftl
similarity index 100%
rename from Bruce1/links.ftl
rename to Bruce/links.ftl
diff --git a/Bruce1/macro-comments.ftl b/Bruce/macro-comments.ftl
similarity index 100%
rename from Bruce1/macro-comments.ftl
rename to Bruce/macro-comments.ftl
diff --git a/Bruce1/macro-head.ftl b/Bruce/macro-head.ftl
similarity index 100%
rename from Bruce1/macro-head.ftl
rename to Bruce/macro-head.ftl
diff --git a/Bruce1/page.ftl b/Bruce/page.ftl
similarity index 100%
rename from Bruce1/page.ftl
rename to Bruce/page.ftl
diff --git a/Bruce1/preview.png b/Bruce/preview.png
similarity index 100%
rename from Bruce1/preview.png
rename to Bruce/preview.png
diff --git a/Bruce1/skin.properties b/Bruce/skin.properties
similarity index 100%
rename from Bruce1/skin.properties
rename to Bruce/skin.properties
diff --git a/Bruce1/tag-articles.ftl b/Bruce/tag-articles.ftl
similarity index 100%
rename from Bruce1/tag-articles.ftl
rename to Bruce/tag-articles.ftl
diff --git a/Bruce1/tags.ftl b/Bruce/tags.ftl
similarity index 100%
rename from Bruce1/tags.ftl
rename to Bruce/tags.ftl
diff --git a/Community1/archive-articles.ftl b/Community/archive-articles.ftl
similarity index 100%
rename from Community1/archive-articles.ftl
rename to Community/archive-articles.ftl
diff --git a/Community1/article-list.ftl b/Community/article-list.ftl
similarity index 100%
rename from Community1/article-list.ftl
rename to Community/article-list.ftl
diff --git a/Community1/article.ftl b/Community/article.ftl
similarity index 100%
rename from Community1/article.ftl
rename to Community/article.ftl
diff --git a/Community1/author-articles.ftl b/Community/author-articles.ftl
similarity index 100%
rename from Community1/author-articles.ftl
rename to Community/author-articles.ftl
diff --git a/Community1/category-articles.ftl b/Community/category-articles.ftl
similarity index 100%
rename from Community1/category-articles.ftl
rename to Community/category-articles.ftl
diff --git a/Community1/common-comment.ftl b/Community/common-comment.ftl
similarity index 100%
rename from Community1/common-comment.ftl
rename to Community/common-comment.ftl
diff --git a/Community1/css/Community.css b/Community/css/Community.css
similarity index 100%
rename from Community1/css/Community.css
rename to Community/css/Community.css
diff --git a/Community1/css/Community.min.css b/Community/css/Community.min.css
similarity index 100%
rename from Community1/css/Community.min.css
rename to Community/css/Community.min.css
diff --git a/Community1/footer.ftl b/Community/footer.ftl
similarity index 100%
rename from Community1/footer.ftl
rename to Community/footer.ftl
diff --git a/Community1/header.ftl b/Community/header.ftl
similarity index 100%
rename from Community1/header.ftl
rename to Community/header.ftl
diff --git a/Community1/images/author-header.png b/Community/images/author-header.png
similarity index 100%
rename from Community1/images/author-header.png
rename to Community/images/author-header.png
diff --git a/Community1/images/icon.png b/Community/images/icon.png
similarity index 100%
rename from Community1/images/icon.png
rename to Community/images/icon.png
diff --git a/Community1/images/indentline-light.png b/Community/images/indentline-light.png
similarity index 100%
rename from Community1/images/indentline-light.png
rename to Community/images/indentline-light.png
diff --git a/Community1/images/indentline.png b/Community/images/indentline.png
similarity index 100%
rename from Community1/images/indentline.png
rename to Community/images/indentline.png
diff --git a/Community1/index.ftl b/Community/index.ftl
similarity index 100%
rename from Community1/index.ftl
rename to Community/index.ftl
diff --git a/Community1/lang/lang_en_US.properties b/Community/lang/lang_en_US.properties
similarity index 100%
rename from Community1/lang/lang_en_US.properties
rename to Community/lang/lang_en_US.properties
diff --git a/Community1/lang/lang_zh_CN.properties b/Community/lang/lang_zh_CN.properties
similarity index 100%
rename from Community1/lang/lang_zh_CN.properties
rename to Community/lang/lang_zh_CN.properties
diff --git a/Community1/macro-comments.ftl b/Community/macro-comments.ftl
similarity index 100%
rename from Community1/macro-comments.ftl
rename to Community/macro-comments.ftl
diff --git a/Community1/macro-head.ftl b/Community/macro-head.ftl
similarity index 100%
rename from Community1/macro-head.ftl
rename to Community/macro-head.ftl
diff --git a/Community1/page.ftl b/Community/page.ftl
similarity index 100%
rename from Community1/page.ftl
rename to Community/page.ftl
diff --git a/Community1/preview.png b/Community/preview.png
similarity index 100%
rename from Community1/preview.png
rename to Community/preview.png
diff --git a/Community1/side.ftl b/Community/side.ftl
similarity index 100%
rename from Community1/side.ftl
rename to Community/side.ftl
diff --git a/Community1/skin.properties b/Community/skin.properties
similarity index 100%
rename from Community1/skin.properties
rename to Community/skin.properties
diff --git a/Community1/tag-articles.ftl b/Community/tag-articles.ftl
similarity index 100%
rename from Community1/tag-articles.ftl
rename to Community/tag-articles.ftl
diff --git a/Community1/tags.ftl b/Community/tags.ftl
similarity index 100%
rename from Community1/tags.ftl
rename to Community/tags.ftl
diff --git a/Finding1/archive-articles.ftl b/Finding/archive-articles.ftl
similarity index 100%
rename from Finding1/archive-articles.ftl
rename to Finding/archive-articles.ftl
diff --git a/Finding1/archives.ftl b/Finding/archives.ftl
similarity index 100%
rename from Finding1/archives.ftl
rename to Finding/archives.ftl
diff --git a/Finding1/article-list.ftl b/Finding/article-list.ftl
similarity index 100%
rename from Finding1/article-list.ftl
rename to Finding/article-list.ftl
diff --git a/Finding1/article.ftl b/Finding/article.ftl
similarity index 100%
rename from Finding1/article.ftl
rename to Finding/article.ftl
diff --git a/Finding1/author-articles.ftl b/Finding/author-articles.ftl
similarity index 100%
rename from Finding1/author-articles.ftl
rename to Finding/author-articles.ftl
diff --git a/Finding1/category-articles.ftl b/Finding/category-articles.ftl
similarity index 100%
rename from Finding1/category-articles.ftl
rename to Finding/category-articles.ftl
diff --git a/Finding1/category.ftl b/Finding/category.ftl
similarity index 100%
rename from Finding1/category.ftl
rename to Finding/category.ftl
diff --git a/Finding1/common-comment.ftl b/Finding/common-comment.ftl
similarity index 100%
rename from Finding1/common-comment.ftl
rename to Finding/common-comment.ftl
diff --git a/Finding1/css/Finding.css b/Finding/css/Finding.css
similarity index 100%
rename from Finding1/css/Finding.css
rename to Finding/css/Finding.css
diff --git a/Finding1/css/Finding.min.css b/Finding/css/Finding.min.css
similarity index 100%
rename from Finding1/css/Finding.min.css
rename to Finding/css/Finding.min.css
diff --git a/Finding1/css/fonts/icomoon.eot b/Finding/css/fonts/icomoon.eot
similarity index 100%
rename from Finding1/css/fonts/icomoon.eot
rename to Finding/css/fonts/icomoon.eot
diff --git a/Finding1/css/fonts/icomoon.svg b/Finding/css/fonts/icomoon.svg
similarity index 100%
rename from Finding1/css/fonts/icomoon.svg
rename to Finding/css/fonts/icomoon.svg
diff --git a/Finding1/css/fonts/icomoon.ttf b/Finding/css/fonts/icomoon.ttf
similarity index 100%
rename from Finding1/css/fonts/icomoon.ttf
rename to Finding/css/fonts/icomoon.ttf
diff --git a/Finding1/css/fonts/icomoon.woff b/Finding/css/fonts/icomoon.woff
similarity index 100%
rename from Finding1/css/fonts/icomoon.woff
rename to Finding/css/fonts/icomoon.woff
diff --git a/Finding1/css/fonts/selection.json b/Finding/css/fonts/selection.json
similarity index 100%
rename from Finding1/css/fonts/selection.json
rename to Finding/css/fonts/selection.json
diff --git a/Finding1/dynamic.ftl b/Finding/dynamic.ftl
similarity index 100%
rename from Finding1/dynamic.ftl
rename to Finding/dynamic.ftl
diff --git a/Finding1/footer.ftl b/Finding/footer.ftl
similarity index 100%
rename from Finding1/footer.ftl
rename to Finding/footer.ftl
diff --git a/Finding1/header.ftl b/Finding/header.ftl
similarity index 100%
rename from Finding1/header.ftl
rename to Finding/header.ftl
diff --git a/Finding1/images/header-bg.jpg b/Finding/images/header-bg.jpg
similarity index 100%
rename from Finding1/images/header-bg.jpg
rename to Finding/images/header-bg.jpg
diff --git a/Finding1/images/next.jpg b/Finding/images/next.jpg
similarity index 100%
rename from Finding1/images/next.jpg
rename to Finding/images/next.jpg
diff --git a/Finding1/images/preview.jpg b/Finding/images/preview.jpg
similarity index 100%
rename from Finding1/images/preview.jpg
rename to Finding/images/preview.jpg
diff --git a/Finding1/index.ftl b/Finding/index.ftl
similarity index 100%
rename from Finding1/index.ftl
rename to Finding/index.ftl
diff --git a/Finding1/js/Finding.js b/Finding/js/Finding.js
similarity index 100%
rename from Finding1/js/Finding.js
rename to Finding/js/Finding.js
diff --git a/Finding1/js/Finding.min.js b/Finding/js/Finding.min.js
similarity index 100%
rename from Finding1/js/Finding.min.js
rename to Finding/js/Finding.min.js
diff --git a/Finding1/lang/lang_en_US.properties b/Finding/lang/lang_en_US.properties
similarity index 100%
rename from Finding1/lang/lang_en_US.properties
rename to Finding/lang/lang_en_US.properties
diff --git a/Finding1/lang/lang_zh_CN.properties b/Finding/lang/lang_zh_CN.properties
similarity index 100%
rename from Finding1/lang/lang_zh_CN.properties
rename to Finding/lang/lang_zh_CN.properties
diff --git a/Finding1/links.ftl b/Finding/links.ftl
similarity index 100%
rename from Finding1/links.ftl
rename to Finding/links.ftl
diff --git a/Finding1/macro-comments.ftl b/Finding/macro-comments.ftl
similarity index 100%
rename from Finding1/macro-comments.ftl
rename to Finding/macro-comments.ftl
diff --git a/Finding1/macro-head.ftl b/Finding/macro-head.ftl
similarity index 100%
rename from Finding1/macro-head.ftl
rename to Finding/macro-head.ftl
diff --git a/Finding1/page.ftl b/Finding/page.ftl
similarity index 100%
rename from Finding1/page.ftl
rename to Finding/page.ftl
diff --git a/Finding1/preview.png b/Finding/preview.png
similarity index 100%
rename from Finding1/preview.png
rename to Finding/preview.png
diff --git a/Finding1/side.ftl b/Finding/side.ftl
similarity index 100%
rename from Finding1/side.ftl
rename to Finding/side.ftl
diff --git a/Finding1/skin.properties b/Finding/skin.properties
similarity index 100%
rename from Finding1/skin.properties
rename to Finding/skin.properties
diff --git a/Finding1/tag-articles.ftl b/Finding/tag-articles.ftl
similarity index 100%
rename from Finding1/tag-articles.ftl
rename to Finding/tag-articles.ftl
diff --git a/Finding1/tags.ftl b/Finding/tags.ftl
similarity index 100%
rename from Finding1/tags.ftl
rename to Finding/tags.ftl
diff --git a/NeoEase1/archive-articles.ftl b/NeoEase/archive-articles.ftl
similarity index 100%
rename from NeoEase1/archive-articles.ftl
rename to NeoEase/archive-articles.ftl
diff --git a/NeoEase1/article-list.ftl b/NeoEase/article-list.ftl
similarity index 100%
rename from NeoEase1/article-list.ftl
rename to NeoEase/article-list.ftl
diff --git a/NeoEase1/article.ftl b/NeoEase/article.ftl
similarity index 100%
rename from NeoEase1/article.ftl
rename to NeoEase/article.ftl
diff --git a/NeoEase1/author-articles.ftl b/NeoEase/author-articles.ftl
similarity index 100%
rename from NeoEase1/author-articles.ftl
rename to NeoEase/author-articles.ftl
diff --git a/NeoEase1/category-articles.ftl b/NeoEase/category-articles.ftl
similarity index 100%
rename from NeoEase1/category-articles.ftl
rename to NeoEase/category-articles.ftl
diff --git a/NeoEase1/common-comment.ftl b/NeoEase/common-comment.ftl
similarity index 100%
rename from NeoEase1/common-comment.ftl
rename to NeoEase/common-comment.ftl
diff --git a/NeoEase1/css/NeoEase.css b/NeoEase/css/NeoEase.css
similarity index 100%
rename from NeoEase1/css/NeoEase.css
rename to NeoEase/css/NeoEase.css
diff --git a/NeoEase1/css/NeoEase.min.css b/NeoEase/css/NeoEase.min.css
similarity index 100%
rename from NeoEase1/css/NeoEase.min.css
rename to NeoEase/css/NeoEase.min.css
diff --git a/NeoEase1/footer.ftl b/NeoEase/footer.ftl
similarity index 100%
rename from NeoEase1/footer.ftl
rename to NeoEase/footer.ftl
diff --git a/NeoEase1/header.ftl b/NeoEase/header.ftl
similarity index 100%
rename from NeoEase1/header.ftl
rename to NeoEase/header.ftl
diff --git a/NeoEase1/images/404.png b/NeoEase/images/404.png
similarity index 100%
rename from NeoEase1/images/404.png
rename to NeoEase/images/404.png
diff --git a/NeoEase1/images/ajax-loader.gif b/NeoEase/images/ajax-loader.gif
similarity index 100%
rename from NeoEase1/images/ajax-loader.gif
rename to NeoEase/images/ajax-loader.gif
diff --git a/NeoEase1/images/icons.png b/NeoEase/images/icons.png
similarity index 100%
rename from NeoEase1/images/icons.png
rename to NeoEase/images/icons.png
diff --git a/NeoEase1/index.ftl b/NeoEase/index.ftl
similarity index 100%
rename from NeoEase1/index.ftl
rename to NeoEase/index.ftl
diff --git a/NeoEase1/js/NeoEase.js b/NeoEase/js/NeoEase.js
similarity index 100%
rename from NeoEase1/js/NeoEase.js
rename to NeoEase/js/NeoEase.js
diff --git a/NeoEase1/js/NeoEase.min.js b/NeoEase/js/NeoEase.min.js
similarity index 100%
rename from NeoEase1/js/NeoEase.min.js
rename to NeoEase/js/NeoEase.min.js
diff --git a/NeoEase1/lang/lang_en_US.properties b/NeoEase/lang/lang_en_US.properties
similarity index 100%
rename from NeoEase1/lang/lang_en_US.properties
rename to NeoEase/lang/lang_en_US.properties
diff --git a/NeoEase1/lang/lang_zh_CN.properties b/NeoEase/lang/lang_zh_CN.properties
similarity index 100%
rename from NeoEase1/lang/lang_zh_CN.properties
rename to NeoEase/lang/lang_zh_CN.properties
diff --git a/NeoEase1/macro-comments.ftl b/NeoEase/macro-comments.ftl
similarity index 100%
rename from NeoEase1/macro-comments.ftl
rename to NeoEase/macro-comments.ftl
diff --git a/NeoEase1/macro-head.ftl b/NeoEase/macro-head.ftl
similarity index 100%
rename from NeoEase1/macro-head.ftl
rename to NeoEase/macro-head.ftl
diff --git a/NeoEase1/page.ftl b/NeoEase/page.ftl
similarity index 100%
rename from NeoEase1/page.ftl
rename to NeoEase/page.ftl
diff --git a/NeoEase1/preview.png b/NeoEase/preview.png
similarity index 100%
rename from NeoEase1/preview.png
rename to NeoEase/preview.png
diff --git a/NeoEase1/side.ftl b/NeoEase/side.ftl
similarity index 100%
rename from NeoEase1/side.ftl
rename to NeoEase/side.ftl
diff --git a/NeoEase1/skin.properties b/NeoEase/skin.properties
similarity index 100%
rename from NeoEase1/skin.properties
rename to NeoEase/skin.properties
diff --git a/NeoEase1/tag-articles.ftl b/NeoEase/tag-articles.ftl
similarity index 100%
rename from NeoEase1/tag-articles.ftl
rename to NeoEase/tag-articles.ftl
diff --git a/NeoEase1/tags.ftl b/NeoEase/tags.ftl
similarity index 100%
rename from NeoEase1/tags.ftl
rename to NeoEase/tags.ftl