diff --git a/branches/rails2.1.2/README b/README
similarity index 100%
rename from branches/rails2.1.2/README
rename to README
diff --git a/branches/rails2.1.2/Rakefile b/Rakefile
similarity index 100%
rename from branches/rails2.1.2/Rakefile
rename to Rakefile
diff --git a/branches/rails2.1.2/app/controllers/application.rb b/app/controllers/application.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/application.rb
rename to app/controllers/application.rb
diff --git a/branches/rails2.1.2/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/comment_controller.rb
rename to app/controllers/comment_controller.rb
diff --git a/branches/rails2.1.2/app/controllers/edit_controller.rb b/app/controllers/edit_controller.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/edit_controller.rb
rename to app/controllers/edit_controller.rb
diff --git a/branches/rails2.1.2/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/list_controller.rb
rename to app/controllers/list_controller.rb
diff --git a/branches/rails2.1.2/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/login_controller.rb
rename to app/controllers/login_controller.rb
diff --git a/branches/rails2.1.2/app/controllers/page_controller.rb b/app/controllers/page_controller.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/page_controller.rb
rename to app/controllers/page_controller.rb
diff --git a/branches/rails2.1.2/app/controllers/sitemap_controller.rb b/app/controllers/sitemap_controller.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/sitemap_controller.rb
rename to app/controllers/sitemap_controller.rb
diff --git a/branches/rails2.1.2/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
similarity index 100%
rename from branches/rails2.1.2/app/controllers/tags_controller.rb
rename to app/controllers/tags_controller.rb
diff --git a/branches/rails2.1.2/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
similarity index 100%
rename from branches/rails2.1.2/app/helpers/application_helper.rb
rename to app/helpers/application_helper.rb
diff --git a/branches/rails2.1.2/app/helpers/breadcrumbs_helper.rb b/app/helpers/breadcrumbs_helper.rb
similarity index 100%
rename from branches/rails2.1.2/app/helpers/breadcrumbs_helper.rb
rename to app/helpers/breadcrumbs_helper.rb
diff --git a/branches/rails2.1.2/app/helpers/edit_helper.rb b/app/helpers/edit_helper.rb
similarity index 100%
rename from branches/rails2.1.2/app/helpers/edit_helper.rb
rename to app/helpers/edit_helper.rb
diff --git a/branches/rails2.1.2/app/helpers/gravatar_helper.rb b/app/helpers/gravatar_helper.rb
similarity index 100%
rename from branches/rails2.1.2/app/helpers/gravatar_helper.rb
rename to app/helpers/gravatar_helper.rb
diff --git a/branches/rails2.1.2/app/helpers/red_cloth_helper.rb b/app/helpers/red_cloth_helper.rb
similarity index 100%
rename from branches/rails2.1.2/app/helpers/red_cloth_helper.rb
rename to app/helpers/red_cloth_helper.rb
diff --git a/branches/rails2.1.2/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
similarity index 100%
rename from branches/rails2.1.2/app/helpers/tags_helper.rb
rename to app/helpers/tags_helper.rb
diff --git a/branches/rails2.1.2/app/models/captcha.rb b/app/models/captcha.rb
similarity index 100%
rename from branches/rails2.1.2/app/models/captcha.rb
rename to app/models/captcha.rb
diff --git a/branches/rails2.1.2/app/models/comment.rb b/app/models/comment.rb
similarity index 100%
rename from branches/rails2.1.2/app/models/comment.rb
rename to app/models/comment.rb
diff --git a/branches/rails2.1.2/app/models/errors.rb b/app/models/errors.rb
similarity index 100%
rename from branches/rails2.1.2/app/models/errors.rb
rename to app/models/errors.rb
diff --git a/branches/rails2.1.2/app/models/page.rb b/app/models/page.rb
similarity index 100%
rename from branches/rails2.1.2/app/models/page.rb
rename to app/models/page.rb
diff --git a/branches/rails2.1.2/app/models/resource.rb b/app/models/resource.rb
similarity index 100%
rename from branches/rails2.1.2/app/models/resource.rb
rename to app/models/resource.rb
diff --git a/branches/rails2.1.2/app/models/user.rb b/app/models/user.rb
similarity index 100%
rename from branches/rails2.1.2/app/models/user.rb
rename to app/models/user.rb
diff --git a/branches/rails2.1.2/app/views/comment/_form.html.erb b/app/views/comment/_form.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/comment/_form.html.erb
rename to app/views/comment/_form.html.erb
diff --git a/branches/rails2.1.2/app/views/comment/new.rjs b/app/views/comment/new.rjs
similarity index 100%
rename from branches/rails2.1.2/app/views/comment/new.rjs
rename to app/views/comment/new.rjs
diff --git a/branches/rails2.1.2/app/views/comment/save.rjs b/app/views/comment/save.rjs
similarity index 100%
rename from branches/rails2.1.2/app/views/comment/save.rjs
rename to app/views/comment/save.rjs
diff --git a/branches/rails2.1.2/app/views/edit/read.html.erb b/app/views/edit/read.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/edit/read.html.erb
rename to app/views/edit/read.html.erb
diff --git a/branches/rails2.1.2/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/layouts/application.html.erb
rename to app/views/layouts/application.html.erb
diff --git a/branches/rails2.1.2/app/views/list/comment.rss.builder b/app/views/list/comment.rss.builder
similarity index 100%
rename from branches/rails2.1.2/app/views/list/comment.rss.builder
rename to app/views/list/comment.rss.builder
diff --git a/branches/rails2.1.2/app/views/list/list.html.erb b/app/views/list/list.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/list/list.html.erb
rename to app/views/list/list.html.erb
diff --git a/branches/rails2.1.2/app/views/list/list.rss.builder b/app/views/list/list.rss.builder
similarity index 100%
rename from branches/rails2.1.2/app/views/list/list.rss.builder
rename to app/views/list/list.rss.builder
diff --git a/branches/rails2.1.2/app/views/login/index.html.erb b/app/views/login/index.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/login/index.html.erb
rename to app/views/login/index.html.erb
diff --git a/branches/rails2.1.2/app/views/page/_comments.html.erb b/app/views/page/_comments.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/page/_comments.html.erb
rename to app/views/page/_comments.html.erb
diff --git a/branches/rails2.1.2/app/views/page/_tags.html.erb b/app/views/page/_tags.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/page/_tags.html.erb
rename to app/views/page/_tags.html.erb
diff --git a/branches/rails2.1.2/app/views/page/view.html.erb b/app/views/page/view.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/page/view.html.erb
rename to app/views/page/view.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_comment.html.erb b/app/views/shared/_comment.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_comment.html.erb
rename to app/views/shared/_comment.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_content.html.erb b/app/views/shared/_content.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_content.html.erb
rename to app/views/shared/_content.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_entry.html.erb b/app/views/shared/_entry.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_entry.html.erb
rename to app/views/shared/_entry.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_login.html.erb b/app/views/shared/_login.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_login.html.erb
rename to app/views/shared/_login.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_meta.html.erb b/app/views/shared/_meta.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_meta.html.erb
rename to app/views/shared/_meta.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_newcomment.html.erb b/app/views/shared/_newcomment.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_newcomment.html.erb
rename to app/views/shared/_newcomment.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_nothing.html.erb b/app/views/shared/_nothing.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_nothing.html.erb
rename to app/views/shared/_nothing.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_translate.html.erb b/app/views/shared/_translate.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_translate.html.erb
rename to app/views/shared/_translate.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_urchin.html.erb b/app/views/shared/_urchin.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_urchin.html.erb
rename to app/views/shared/_urchin.html.erb
diff --git a/branches/rails2.1.2/app/views/shared/_youarehere.html.erb b/app/views/shared/_youarehere.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/shared/_youarehere.html.erb
rename to app/views/shared/_youarehere.html.erb
diff --git a/branches/rails2.1.2/app/views/sitemap/view.html.erb b/app/views/sitemap/view.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/sitemap/view.html.erb
rename to app/views/sitemap/view.html.erb
diff --git a/branches/rails2.1.2/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/tags/index.html.erb
rename to app/views/tags/index.html.erb
diff --git a/branches/rails2.1.2/app/views/tags/show.html.erb b/app/views/tags/show.html.erb
similarity index 100%
rename from branches/rails2.1.2/app/views/tags/show.html.erb
rename to app/views/tags/show.html.erb
diff --git a/branches/rails2.1.2/config/boot.rb b/config/boot.rb
similarity index 100%
rename from branches/rails2.1.2/config/boot.rb
rename to config/boot.rb
diff --git a/branches/rails2.1.2/config/database.yml b/config/database.yml
similarity index 100%
rename from branches/rails2.1.2/config/database.yml
rename to config/database.yml
diff --git a/branches/rails2.1.2/config/environment.rb b/config/environment.rb
similarity index 100%
rename from branches/rails2.1.2/config/environment.rb
rename to config/environment.rb
diff --git a/branches/rails2.1.2/config/environments/borg_development.rb b/config/environments/borg_development.rb
similarity index 100%
rename from branches/rails2.1.2/config/environments/borg_development.rb
rename to config/environments/borg_development.rb
diff --git a/branches/rails2.1.2/config/environments/development.rb b/config/environments/development.rb
similarity index 100%
rename from branches/rails2.1.2/config/environments/development.rb
rename to config/environments/development.rb
diff --git a/branches/rails2.1.2/config/environments/production.rb b/config/environments/production.rb
similarity index 100%
rename from branches/rails2.1.2/config/environments/production.rb
rename to config/environments/production.rb
diff --git a/branches/rails2.1.2/config/environments/test.rb b/config/environments/test.rb
similarity index 100%
rename from branches/rails2.1.2/config/environments/test.rb
rename to config/environments/test.rb
diff --git a/branches/rails2.1.2/config/initializers/inflections.rb b/config/initializers/inflections.rb
similarity index 100%
rename from branches/rails2.1.2/config/initializers/inflections.rb
rename to config/initializers/inflections.rb
diff --git a/branches/rails2.1.2/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
similarity index 100%
rename from branches/rails2.1.2/config/initializers/mime_types.rb
rename to config/initializers/mime_types.rb
diff --git a/branches/rails2.1.2/config/initializers/new_rails_defaults.rb b/config/initializers/new_rails_defaults.rb
similarity index 100%
rename from branches/rails2.1.2/config/initializers/new_rails_defaults.rb
rename to config/initializers/new_rails_defaults.rb
diff --git a/branches/rails2.1.2/config/routes.rb b/config/routes.rb
similarity index 100%
rename from branches/rails2.1.2/config/routes.rb
rename to config/routes.rb
diff --git a/branches/rails2.1.2/doc/README_FOR_APP b/doc/README_FOR_APP
similarity index 100%
rename from branches/rails2.1.2/doc/README_FOR_APP
rename to doc/README_FOR_APP
diff --git a/branches/rails2.1.2/lib/borg/filesystem.rb b/lib/borg/filesystem.rb
similarity index 100%
rename from branches/rails2.1.2/lib/borg/filesystem.rb
rename to lib/borg/filesystem.rb
diff --git a/branches/rails2.1.2/lib/borg/finder.rb b/lib/borg/finder.rb
similarity index 100%
rename from branches/rails2.1.2/lib/borg/finder.rb
rename to lib/borg/finder.rb
diff --git a/branches/rails2.1.2/lib/borg/lister.rb b/lib/borg/lister.rb
similarity index 100%
rename from branches/rails2.1.2/lib/borg/lister.rb
rename to lib/borg/lister.rb
diff --git a/branches/rails2.1.2/lib/borg/util.rb b/lib/borg/util.rb
similarity index 100%
rename from branches/rails2.1.2/lib/borg/util.rb
rename to lib/borg/util.rb
diff --git a/log/dummy.txt b/log/dummy.txt
new file mode 100644
index 0000000..e69de29
diff --git a/branches/rails2.1.2/public/404.html b/public/404.html
similarity index 100%
rename from branches/rails2.1.2/public/404.html
rename to public/404.html
diff --git a/branches/rails2.1.2/public/422.html b/public/422.html
similarity index 100%
rename from branches/rails2.1.2/public/422.html
rename to public/422.html
diff --git a/branches/rails2.1.2/public/500.html b/public/500.html
similarity index 100%
rename from branches/rails2.1.2/public/500.html
rename to public/500.html
diff --git a/branches/rails2.1.2/public/dispatch.cgi b/public/dispatch.cgi
similarity index 100%
rename from branches/rails2.1.2/public/dispatch.cgi
rename to public/dispatch.cgi
diff --git a/branches/rails2.1.2/public/dispatch.fcgi b/public/dispatch.fcgi
similarity index 100%
rename from branches/rails2.1.2/public/dispatch.fcgi
rename to public/dispatch.fcgi
diff --git a/branches/rails2.1.2/public/dispatch.rb b/public/dispatch.rb
similarity index 100%
rename from branches/rails2.1.2/public/dispatch.rb
rename to public/dispatch.rb
diff --git a/branches/rails2.1.2/public/favicon.ico b/public/favicon.ico
similarity index 100%
rename from branches/rails2.1.2/public/favicon.ico
rename to public/favicon.ico
diff --git a/branches/rails2.1.2/public/images/CoolWater/box.jpg b/public/images/CoolWater/box.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/box.jpg
rename to public/images/CoolWater/box.jpg
diff --git a/branches/rails2.1.2/public/images/CoolWater/bullet.gif b/public/images/CoolWater/bullet.gif
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/bullet.gif
rename to public/images/CoolWater/bullet.gif
diff --git a/branches/rails2.1.2/public/images/CoolWater/button-bg.jpg b/public/images/CoolWater/button-bg.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/button-bg.jpg
rename to public/images/CoolWater/button-bg.jpg
diff --git a/branches/rails2.1.2/public/images/CoolWater/content.jpg b/public/images/CoolWater/content.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/content.jpg
rename to public/images/CoolWater/content.jpg
diff --git a/branches/rails2.1.2/public/images/CoolWater/footer.jpg b/public/images/CoolWater/footer.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/footer.jpg
rename to public/images/CoolWater/footer.jpg
diff --git a/branches/rails2.1.2/public/images/CoolWater/header.jpg b/public/images/CoolWater/header.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/header.jpg
rename to public/images/CoolWater/header.jpg
diff --git a/branches/rails2.1.2/public/images/CoolWater/menu.jpg b/public/images/CoolWater/menu.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/menu.jpg
rename to public/images/CoolWater/menu.jpg
diff --git a/branches/rails2.1.2/public/images/CoolWater/quote.jpg b/public/images/CoolWater/quote.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/quote.jpg
rename to public/images/CoolWater/quote.jpg
diff --git a/branches/rails2.1.2/public/images/CoolWater/sep.jpg b/public/images/CoolWater/sep.jpg
similarity index 100%
rename from branches/rails2.1.2/public/images/CoolWater/sep.jpg
rename to public/images/CoolWater/sep.jpg
diff --git a/branches/rails2.1.2/public/images/borg/arrow.png b/public/images/borg/arrow.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/arrow.png
rename to public/images/borg/arrow.png
diff --git a/branches/rails2.1.2/public/images/borg/arrow_grey.png b/public/images/borg/arrow_grey.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/arrow_grey.png
rename to public/images/borg/arrow_grey.png
diff --git a/branches/rails2.1.2/public/images/borg/bg-diagonals-dark.png b/public/images/borg/bg-diagonals-dark.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/bg-diagonals-dark.png
rename to public/images/borg/bg-diagonals-dark.png
diff --git a/branches/rails2.1.2/public/images/borg/bg-diagonals-light.png b/public/images/borg/bg-diagonals-light.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/bg-diagonals-light.png
rename to public/images/borg/bg-diagonals-light.png
diff --git a/branches/rails2.1.2/public/images/borg/comment.png b/public/images/borg/comment.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/comment.png
rename to public/images/borg/comment.png
diff --git a/branches/rails2.1.2/public/images/borg/edit.png b/public/images/borg/edit.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/edit.png
rename to public/images/borg/edit.png
diff --git a/branches/rails2.1.2/public/images/borg/edit_add.png b/public/images/borg/edit_add.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/edit_add.png
rename to public/images/borg/edit_add.png
diff --git a/branches/rails2.1.2/public/images/borg/edit_remove.png b/public/images/borg/edit_remove.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/edit_remove.png
rename to public/images/borg/edit_remove.png
diff --git a/branches/rails2.1.2/public/images/borg/emptypixel.gif b/public/images/borg/emptypixel.gif
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/emptypixel.gif
rename to public/images/borg/emptypixel.gif
diff --git a/branches/rails2.1.2/public/images/borg/feed.png b/public/images/borg/feed.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/feed.png
rename to public/images/borg/feed.png
diff --git a/branches/rails2.1.2/public/images/borg/header_background.png b/public/images/borg/header_background.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/header_background.png
rename to public/images/borg/header_background.png
diff --git a/branches/rails2.1.2/public/images/borg/header_background.psd b/public/images/borg/header_background.psd
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/header_background.psd
rename to public/images/borg/header_background.psd
diff --git a/branches/rails2.1.2/public/images/borg/header_background_dark.png b/public/images/borg/header_background_dark.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/header_background_dark.png
rename to public/images/borg/header_background_dark.png
diff --git a/branches/rails2.1.2/public/images/borg/header_background_nohighlight.png b/public/images/borg/header_background_nohighlight.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/header_background_nohighlight.png
rename to public/images/borg/header_background_nohighlight.png
diff --git a/branches/rails2.1.2/public/images/borg/languages.png b/public/images/borg/languages.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/languages.png
rename to public/images/borg/languages.png
diff --git a/branches/rails2.1.2/public/images/borg/logo.png b/public/images/borg/logo.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/logo.png
rename to public/images/borg/logo.png
diff --git a/branches/rails2.1.2/public/images/borg/openid.png b/public/images/borg/openid.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/openid.png
rename to public/images/borg/openid.png
diff --git a/branches/rails2.1.2/public/images/borg/openid2.png b/public/images/borg/openid2.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/openid2.png
rename to public/images/borg/openid2.png
diff --git a/branches/rails2.1.2/public/images/borg/openidnet_logo.gif b/public/images/borg/openidnet_logo.gif
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/openidnet_logo.gif
rename to public/images/borg/openidnet_logo.gif
diff --git a/branches/rails2.1.2/public/images/borg/readmore.png b/public/images/borg/readmore.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/readmore.png
rename to public/images/borg/readmore.png
diff --git a/branches/rails2.1.2/public/images/borg/tags.png b/public/images/borg/tags.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/tags.png
rename to public/images/borg/tags.png
diff --git a/branches/rails2.1.2/public/images/borg/warning.png b/public/images/borg/warning.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/warning.png
rename to public/images/borg/warning.png
diff --git a/branches/rails2.1.2/public/images/borg/welcome.png b/public/images/borg/welcome.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/welcome.png
rename to public/images/borg/welcome.png
diff --git a/branches/rails2.1.2/public/images/borg/youarehere.png b/public/images/borg/youarehere.png
similarity index 100%
rename from branches/rails2.1.2/public/images/borg/youarehere.png
rename to public/images/borg/youarehere.png
diff --git a/branches/rails2.1.2/public/javascripts/application.js b/public/javascripts/application.js
similarity index 100%
rename from branches/rails2.1.2/public/javascripts/application.js
rename to public/javascripts/application.js
diff --git a/branches/rails2.1.2/public/javascripts/controls.js b/public/javascripts/controls.js
similarity index 100%
rename from branches/rails2.1.2/public/javascripts/controls.js
rename to public/javascripts/controls.js
diff --git a/branches/rails2.1.2/public/javascripts/dragdrop.js b/public/javascripts/dragdrop.js
similarity index 100%
rename from branches/rails2.1.2/public/javascripts/dragdrop.js
rename to public/javascripts/dragdrop.js
diff --git a/branches/rails2.1.2/public/javascripts/effects.js b/public/javascripts/effects.js
similarity index 100%
rename from branches/rails2.1.2/public/javascripts/effects.js
rename to public/javascripts/effects.js
diff --git a/branches/rails2.1.2/public/javascripts/prototype.js b/public/javascripts/prototype.js
similarity index 100%
rename from branches/rails2.1.2/public/javascripts/prototype.js
rename to public/javascripts/prototype.js
diff --git a/branches/rails2.1.2/public/robots.txt b/public/robots.txt
similarity index 100%
rename from branches/rails2.1.2/public/robots.txt
rename to public/robots.txt
diff --git a/branches/rails2.1.2/public/stylesheets/CoolWater.css b/public/stylesheets/CoolWater.css
similarity index 100%
rename from branches/rails2.1.2/public/stylesheets/CoolWater.css
rename to public/stylesheets/CoolWater.css
diff --git a/branches/rails2.1.2/public/stylesheets/cloud.css b/public/stylesheets/cloud.css
similarity index 100%
rename from branches/rails2.1.2/public/stylesheets/cloud.css
rename to public/stylesheets/cloud.css
diff --git a/branches/rails2.1.2/script/about b/script/about
similarity index 100%
rename from branches/rails2.1.2/script/about
rename to script/about
diff --git a/branches/rails2.1.2/script/console b/script/console
similarity index 100%
rename from branches/rails2.1.2/script/console
rename to script/console
diff --git a/branches/rails2.1.2/script/dbconsole b/script/dbconsole
similarity index 100%
rename from branches/rails2.1.2/script/dbconsole
rename to script/dbconsole
diff --git a/branches/rails2.1.2/script/destroy b/script/destroy
similarity index 100%
rename from branches/rails2.1.2/script/destroy
rename to script/destroy
diff --git a/branches/rails2.1.2/script/generate b/script/generate
similarity index 100%
rename from branches/rails2.1.2/script/generate
rename to script/generate
diff --git a/branches/rails2.1.2/script/performance/benchmarker b/script/performance/benchmarker
similarity index 100%
rename from branches/rails2.1.2/script/performance/benchmarker
rename to script/performance/benchmarker
diff --git a/branches/rails2.1.2/script/performance/profiler b/script/performance/profiler
similarity index 100%
rename from branches/rails2.1.2/script/performance/profiler
rename to script/performance/profiler
diff --git a/branches/rails2.1.2/script/performance/request b/script/performance/request
similarity index 100%
rename from branches/rails2.1.2/script/performance/request
rename to script/performance/request
diff --git a/branches/rails2.1.2/script/plugin b/script/plugin
similarity index 100%
rename from branches/rails2.1.2/script/plugin
rename to script/plugin
diff --git a/branches/rails2.1.2/script/process/inspector b/script/process/inspector
similarity index 100%
rename from branches/rails2.1.2/script/process/inspector
rename to script/process/inspector
diff --git a/branches/rails2.1.2/script/process/reaper b/script/process/reaper
similarity index 100%
rename from branches/rails2.1.2/script/process/reaper
rename to script/process/reaper
diff --git a/branches/rails2.1.2/script/process/spawner b/script/process/spawner
similarity index 100%
rename from branches/rails2.1.2/script/process/spawner
rename to script/process/spawner
diff --git a/branches/rails2.1.2/script/runner b/script/runner
similarity index 100%
rename from branches/rails2.1.2/script/runner
rename to script/runner
diff --git a/branches/rails2.1.2/script/server b/script/server
similarity index 100%
rename from branches/rails2.1.2/script/server
rename to script/server
diff --git a/branches/rails2.1.2/test/test_helper.rb b/test/test_helper.rb
similarity index 100%
rename from branches/rails2.1.2/test/test_helper.rb
rename to test/test_helper.rb
diff --git a/tmp/dummy.txt b/tmp/dummy.txt
new file mode 100644
index 0000000..e69de29
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/CHANGELOG b/vendor/plugins/open_id_authentication/CHANGELOG
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/CHANGELOG
rename to vendor/plugins/open_id_authentication/CHANGELOG
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/README b/vendor/plugins/open_id_authentication/README
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/README
rename to vendor/plugins/open_id_authentication/README
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/Rakefile b/vendor/plugins/open_id_authentication/Rakefile
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/Rakefile
rename to vendor/plugins/open_id_authentication/Rakefile
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/open_id_authentication_tables_generator.rb b/vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/open_id_authentication_tables_generator.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/open_id_authentication_tables_generator.rb
rename to vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/open_id_authentication_tables_generator.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/templates/migration.rb b/vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/templates/migration.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/templates/migration.rb
rename to vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/templates/migration.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/templates/migration.rb b/vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/templates/migration.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/templates/migration.rb
rename to vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/templates/migration.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/upgrade_open_id_authentication_tables_generator.rb b/vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/upgrade_open_id_authentication_tables_generator.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/upgrade_open_id_authentication_tables_generator.rb
rename to vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/upgrade_open_id_authentication_tables_generator.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/init.rb b/vendor/plugins/open_id_authentication/init.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/init.rb
rename to vendor/plugins/open_id_authentication/init.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
rename to vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb
rename to vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication/db_store.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication/db_store.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication/db_store.rb
rename to vendor/plugins/open_id_authentication/lib/open_id_authentication/db_store.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
rename to vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake b/vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake
rename to vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/test/normalize_test.rb b/vendor/plugins/open_id_authentication/test/normalize_test.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/test/normalize_test.rb
rename to vendor/plugins/open_id_authentication/test/normalize_test.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb b/vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb
rename to vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/test/status_test.rb b/vendor/plugins/open_id_authentication/test/status_test.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/test/status_test.rb
rename to vendor/plugins/open_id_authentication/test/status_test.rb
diff --git a/branches/rails2.1.2/vendor/plugins/open_id_authentication/test/test_helper.rb b/vendor/plugins/open_id_authentication/test/test_helper.rb
similarity index 100%
rename from branches/rails2.1.2/vendor/plugins/open_id_authentication/test/test_helper.rb
rename to vendor/plugins/open_id_authentication/test/test_helper.rb