diff --git a/examples/Lua-cURL/browser.lua b/examples/cURLv2/browser.lua
similarity index 99%
rename from examples/Lua-cURL/browser.lua
rename to examples/cURLv2/browser.lua
index 9442f2f..a73e151 100644
--- a/examples/Lua-cURL/browser.lua
+++ b/examples/cURLv2/browser.lua
@@ -4,7 +4,7 @@
 -- RCS ID: $Id: browser.lua,v 0.1 2011/03/11 23:55:20 kai Exp $
 -----------------------------------------------------------------------------
 
-local cURL   = require("lcurl.cURL")
+local cURL   = require("cURL")
 local string = require("string")
 local table  = require("table")
 local base   = _G
diff --git a/examples/Lua-cURL/file.lua b/examples/cURLv2/file.lua
similarity index 61%
rename from examples/Lua-cURL/file.lua
rename to examples/cURLv2/file.lua
index 8193b69..64c23a8 100644
--- a/examples/Lua-cURL/file.lua
+++ b/examples/cURLv2/file.lua
@@ -1,4 +1,4 @@
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 -- open output file
 f = io.open("example_homepage", "w")
@@ -7,9 +7,9 @@ c = cURL.easy_init()
 -- setup url
 c:setopt_url("http://www.example.com/")
 -- perform, invokes callbacks
-c:perform({writefunction = function(str) 
-				f:write(str)
-			     end})
+c:perform{writefunction = function(str)
+	f:write(str)
+end}
 
 -- close output file
 f:close()
diff --git a/examples/Lua-cURL/multi.lua b/examples/cURLv2/multi.lua
similarity index 67%
rename from examples/Lua-cURL/multi.lua
rename to examples/cURLv2/multi.lua
index 663635f..8052e93 100644
--- a/examples/Lua-cURL/multi.lua
+++ b/examples/cURLv2/multi.lua
@@ -1,15 +1,15 @@
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 -- setup easy 
-c = cURL.easy_init()
+c1 = cURL.easy_init()
 c2 = cURL.easy_init()
 
 -- setup url
-c:setopt_url("http://www.lua.org/")
+c1:setopt_url("http://www.lua.org/")
 c2:setopt_url("http://luajit.org/")
 
 m = cURL.multi_init()
-m:add_handle(c)
+m:add_handle(c1)
 m:add_handle(c2)
 
 local f1 = io.open("lua.html","a+")
@@ -17,6 +17,6 @@ local f2 = io.open("luajit.html","a+")
 
 for data, type, easy in m:perform() do
 --    if (type == "header") then print(data) end
-    if (type == "data" and c == easy) then f1:write(data) end
+    if (type == "data" and c1 == easy) then f1:write(data) end
     if (type == "data" and c2 == easy) then f2:write(data) end
 end
\ No newline at end of file
diff --git a/examples/Lua-cURL/post_stream.lua b/examples/cURLv2/post_stream.lua
similarity index 96%
rename from examples/Lua-cURL/post_stream.lua
rename to examples/cURLv2/post_stream.lua
index 1528392..94bbe05 100644
--- a/examples/Lua-cURL/post_stream.lua
+++ b/examples/cURLv2/post_stream.lua
@@ -1,4 +1,4 @@
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 -- returns size and reader
 local function make_stream(ch, n, m)
diff --git a/examples/Lua-cURL/rss.lua b/examples/cURLv2/rss.lua
similarity index 92%
rename from examples/Lua-cURL/rss.lua
rename to examples/cURLv2/rss.lua
index c25c0c5..e21d864 100644
--- a/examples/Lua-cURL/rss.lua
+++ b/examples/cURLv2/rss.lua
@@ -1,6 +1,6 @@
 -- use LuaExpat and Lua-CuRL together for On-The-Fly XML parsing
 local lxp = require("lxp")
-local cURL = require("lcurl.cURL")
+local cURL = require("cURL")
 
 tags  = {}
 items = {}
@@ -14,12 +14,13 @@ function callback.StartElement(parser, tagname)
    end
 end
 
-function callback.CharacterData(parser, str) 
+function callback.CharacterData(parser, str)
    if (tags[#tags -1] == "item") then
       --we are parsing a item, get rid of trailing whitespace
       items[#items][tags[#tags]] = string.gsub(str, "%s*$", "")
    end
 end
+
 function callback.EndElement(parser, tagname)
    --assuming well formed xml
    tags[#tags] = nil
diff --git a/examples/easy.obj.lua b/examples/lcurl/easy.obj.lua
similarity index 100%
rename from examples/easy.obj.lua
rename to examples/lcurl/easy.obj.lua
diff --git a/examples/file.lua b/examples/lcurl/file.lua
similarity index 100%
rename from examples/file.lua
rename to examples/lcurl/file.lua
diff --git a/examples/ftpupload.lua b/examples/lcurl/ftpupload.lua
similarity index 100%
rename from examples/ftpupload.lua
rename to examples/lcurl/ftpupload.lua
diff --git a/examples/multi.lua b/examples/lcurl/multi.lua
similarity index 100%
rename from examples/multi.lua
rename to examples/lcurl/multi.lua
diff --git a/examples/multi_iterator.lua b/examples/lcurl/multi_iterator.lua
similarity index 100%
rename from examples/multi_iterator.lua
rename to examples/lcurl/multi_iterator.lua
diff --git a/examples/pause.lua b/examples/lcurl/pause.lua
similarity index 100%
rename from examples/pause.lua
rename to examples/lcurl/pause.lua
diff --git a/examples/post.lua b/examples/lcurl/post.lua
similarity index 100%
rename from examples/post.lua
rename to examples/lcurl/post.lua
diff --git a/examples/post_stream.lua b/examples/lcurl/post_stream.lua
similarity index 100%
rename from examples/post_stream.lua
rename to examples/lcurl/post_stream.lua
diff --git a/examples/share.lua b/examples/lcurl/share.lua
similarity index 100%
rename from examples/share.lua
rename to examples/lcurl/share.lua