diff --git a/ukijs.rb b/ukijs.rb
index ed06f59..920af1f 100644
--- a/ukijs.rb
+++ b/ukijs.rb
@@ -76,6 +76,10 @@ def process_src_paths(content)
     haml :exampleList, :locals => { :exampleList => exampleList }
   end
   
+  get %r{/examples/[^/]+/?$} do
+    redirect request.path.sub('/examples/', '/examples/core-examples/')
+  end
+  
   get '/examples/*' do
     redirect request.path + '/' unless request.path.match(%{/$}) # force trailing slash
     
diff --git a/views/index.haml b/views/index.haml
index 3e61957..3f705a8 100644
--- a/views/index.haml
+++ b/views/index.haml
@@ -28,13 +28,13 @@
         %ul
           %li Play with simple <a href="http://jsbin.com/iqite/edit">twitter widget</a> code 
           %li Draft <a href="/docs/">API docs</a> for uki-core
-          %li Google wave <a href="/examples/wave/" target="_blank">layout</a> in <a href="http://github.com/voloko/ukijs.org/blob/master/examples/wave/wave.js" target="_blank">100 lines</a> of uki code
+          %li Google wave <a href="/examples/core-examples/wave/" target="_blank">layout</a> in <a href="http://github.com/voloko/ukijs.org/blob/master/examples/core-examples/wave/wave.js" target="_blank">100 lines</a> of uki code
       %p.slogan
         Uki is a <em>fast</em> and <em>simple</em> JavaScript user interface toolkit for desktop-like web applications.<br />
         It comes with a rich view-component library ranging from 
-        <a href="/examples/slider/">Slider</a> to 
-        <a href="/examples/list/">List</a> and 
-        <a href="/examples/splitPane/">SplitPane</a>.
+        <a href="/examples/core-examples/slider/">Slider</a> to 
+        <a href="/examples/core-examples/list/">List</a> and 
+        <a href="/examples/core-examples/splitPane/">SplitPane</a>.
       %p.download
         %span.title Download:
         %span.variant