Merge branch 'luarocks-3'

67 files changed, 2403 insertions, 2267 deletions

diff --git a/src/bin/luarocks b/src/bin/luarocks
index be6c2b81..88a1d1ca 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -1,7 +1,7 @@
 #!/usr/bin/env lua
 
 -- this should be loaded first.
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 local loader = require("luarocks.loader")
 local command_line = require("luarocks.command_line")
@@ -9,25 +9,25 @@ local command_line = require("luarocks.command_line")
 program_description = "LuaRocks main command-line interface"
 
 commands = {
-   help = "luarocks.help",
-   pack = "luarocks.pack",
-   unpack = "luarocks.unpack",
-   build = "luarocks.build",
-   install = "luarocks.install",
-   search = "luarocks.search",
-   list = "luarocks.list",
-   remove = "luarocks.remove",
-   make = "luarocks.make",
-   download = "luarocks.download",
-   path = "luarocks.path_cmd",
-   show = "luarocks.show",
-   new_version = "luarocks.new_version",
-   lint = "luarocks.lint",
-   write_rockspec = "luarocks.write_rockspec",
-   purge = "luarocks.purge",
-   doc = "luarocks.doc",
-   upload = "luarocks.upload",
-   config = "luarocks.config_cmd",
+   help = "luarocks.cmd.help",
+   pack = "luarocks.cmd.pack",
+   unpack = "luarocks.cmd.unpack",
+   build = "luarocks.cmd.build",
+   install = "luarocks.cmd.install",
+   search = "luarocks.cmd.search",
+   list = "luarocks.cmd.list",
+   remove = "luarocks.cmd.remove",
+   make = "luarocks.cmd.make",
+   download = "luarocks.cmd.download",
+   path = "luarocks.cmd.path",
+   show = "luarocks.cmd.show",
+   new_version = "luarocks.cmd.new_version",
+   lint = "luarocks.cmd.lint",
+   write_rockspec = "luarocks.cmd.write_rockspec",
+   purge = "luarocks.cmd.purge",
+   doc = "luarocks.cmd.doc",
+   upload = "luarocks.cmd.upload",
+   config = "luarocks.cmd.config",
 }
 
 command_line.run_command(...)
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin
index 2890d1f1..5db24640 100755
--- a/src/bin/luarocks-admin
+++ b/src/bin/luarocks-admin
@@ -1,7 +1,7 @@
 #!/usr/bin/env lua
 
 -- this should be loaded first.
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 local loader = require("luarocks.loader")
 local command_line = require("luarocks.command_line")
@@ -9,11 +9,11 @@ local command_line = require("luarocks.command_line")
 program_description = "LuaRocks repository administration interface"
 
 commands = {
-   help = "luarocks.help",
-   make_manifest = "luarocks.make_manifest",
-   add = "luarocks.add",
-   remove = "luarocks.admin_remove",
-   refresh_cache = "luarocks.refresh_cache",
+   help = "luarocks.cmd.help",
+   make_manifest = "luarocks.admin.cmd.make_manifest",
+   add = "luarocks.admin.cmd.add",
+   remove = "luarocks.admin.cmd.remove",
+   refresh_cache = "luarocks.admin.cmd.refresh_cache",
 }
 
 command_line.run_command(...)
diff --git a/src/luarocks/cache.lua b/src/luarocks/admin/cache.lua
index 4a95f70e..0daa0fc0 100644
--- a/src/luarocks/cache.lua
+++ b/src/luarocks/admin/cache.lua
@@ -2,10 +2,9 @@
 --- Module handling the LuaRocks local cache.
 -- Adds a rock or rockspec to a rocks server.
 local cache = {}
-package.loaded["luarocks.cache"] = cache
 
 local fs = require("luarocks.fs")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
diff --git a/src/luarocks/add.lua b/src/luarocks/admin/cmd/add.lua
index f37d334d..daf46c1d 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/admin/cmd/add.lua
@@ -2,17 +2,15 @@
 --- Module implementing the luarocks-admin "add" command.
 -- Adds a rock or rockspec to a rocks server.
 local add = {}
-package.loaded["luarocks.add"] = add
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
-local manif = require("luarocks.manif")
+local writer = require("luarocks.manif.writer")
 local index = require("luarocks.index")
 local fs = require("luarocks.fs")
-local cache = require("luarocks.cache")
+local cache = require("luarocks.admin.cache")
 
-util.add_run_function(add)
 add.help_summary = "Add a rock or rockspec to a rocks server."
 add.help_arguments = "[--server=<server>] [--no-refresh] {<rockspec>|<rock>...}"
 add.help = [[
@@ -24,6 +22,15 @@ The flag --no-refresh indicates the local cache should not be refreshed
 prior to generation of the updated manifest.
 ]]
 
+local function zip_manifests()
+   for ver in util.lua_versions() do
+      local file = "manifest-"..ver
+      local zip = file..".zip"
+      fs.delete(dir.path(fs.current_dir(), zip))
+      fs.zip(zip, file)
+   end
+end
+
 local function add_files_to_server(refresh, rockfiles, server, upload_server)
    assert(type(refresh) == "boolean" or not refresh)
    assert(type(rockfiles) == "table")
@@ -68,9 +75,9 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
    if not ok then return nil, err end
 
    util.printout("Updating manifest...")
-   manif.make_manifest(local_cache, "one", true)
+   writer.make_manifest(local_cache, "one", true)
    
-   manif.zip_manifests()
+   zip_manifests()
    
    util.printout("Updating index.html...")
    index.make_index(local_cache)
diff --git a/src/luarocks/make_manifest.lua b/src/luarocks/admin/cmd/make_manifest.lua
index c39c2939..57851942 100644
--- a/src/luarocks/make_manifest.lua
+++ b/src/luarocks/admin/cmd/make_manifest.lua
@@ -2,17 +2,15 @@
 --- Module implementing the luarocks-admin "make_manifest" command.
 -- Compile a manifest file for a repository.
 local make_manifest = {}
-package.loaded["luarocks.make_manifest"] = make_manifest
 
-local manif = require("luarocks.manif")
+local writer = require("luarocks.manif.writer")
 local index = require("luarocks.index")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local deps = require("luarocks.deps")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 
-util.add_run_function(make_manifest)
 make_manifest.help_summary = "Compile a manifest file for a repository."
 
 make_manifest.help = [[
@@ -37,7 +35,7 @@ function make_manifest.command(flags, repo)
       util.warning("This looks like a local rocks tree, but you did not pass --local-tree.")
    end
    
-   local ok, err = manif.make_manifest(repo, deps.get_deps_mode(flags), not flags["local-tree"])
+   local ok, err = writer.make_manifest(repo, deps.get_deps_mode(flags), not flags["local-tree"])
    if ok and not flags["local-tree"] then
       util.printout("Generating index.html for "..repo)
       index.make_index(repo)
diff --git a/src/luarocks/refresh_cache.lua b/src/luarocks/admin/cmd/refresh_cache.lua
index bbfd1f4d..947dbfb0 100644
--- a/src/luarocks/refresh_cache.lua
+++ b/src/luarocks/admin/cmd/refresh_cache.lua
@@ -1,13 +1,10 @@
 
 --- Module implementing the luarocks-admin "refresh_cache" command.
 local refresh_cache = {}
-package.loaded["luarocks.refresh_cache"] = refresh_cache
 
-local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
-local cache = require("luarocks.cache")
+local cfg = require("luarocks.core.cfg")
+local cache = require("luarocks.admin.cache")
 
-util.add_run_function(refresh_cache)
 refresh_cache.help_summary = "Refresh local cache of a remote rocks server."
 refresh_cache.help_arguments = "[--from=<server>]"
 refresh_cache.help = [[
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin/cmd/remove.lua
index 621f1317..763a166f 100644
--- a/src/luarocks/admin_remove.lua
+++ b/src/luarocks/admin/cmd/remove.lua
@@ -2,17 +2,15 @@
 --- Module implementing the luarocks-admin "remove" command.
 -- Removes a rock or rockspec from a rocks server.
 local admin_remove = {}
-package.loaded["luarocks.admin_remove"] = admin_remove
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
-local manif = require("luarocks.manif")
+local writer = require("luarocks.manif.writer")
 local index = require("luarocks.index")
 local fs = require("luarocks.fs")
-local cache = require("luarocks.cache")
+local cache = require("luarocks.admin.cache")
 
-util.add_run_function(admin_remove)
 admin_remove.help_summary = "Remove a rock or rockspec from a rocks server."
 admin_remove.help_arguments = "[--server=<server>] [--no-refresh] {<rockspec>|<rock>...}"
 admin_remove.help = [[
@@ -65,7 +63,7 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
    if not ok then return nil, err end
 
    util.printout("Updating manifest...")
-   manif.make_manifest(local_cache, "one", true)
+   writer.make_manifest(local_cache, "one", true)
    util.printout("Updating index.html...")
    index.make_index(local_cache)
 
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 96b232ff..ceaa20dd 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -1,45 +1,15 @@
 
---- Module implementing the LuaRocks "build" command.
--- Builds a rock, compiling its C parts if any.
 local build = {}
-package.loaded["luarocks.build"] = build
 
-local pack = require("luarocks.pack")
 local path = require("luarocks.path")
 local util = require("luarocks.util")
-local repos = require("luarocks.repos")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local deps = require("luarocks.deps")
-local manif = require("luarocks.manif")
-local remove = require("luarocks.remove")
-local cfg = require("luarocks.cfg")
-
-util.add_run_function(build)
-build.help_summary = "Build/compile a rock."
-build.help_arguments = "[--pack-binary-rock] [--keep] {<rockspec>|<rock>|<name> [<version>]}"
-build.help = [[
-Build and install a rock, compiling its C parts if any.
-Argument may be a rockspec file, a source rock file
-or the name of a rock to be fetched from a repository.
-
---pack-binary-rock  Do not install rock. Instead, produce a .rock file
-                    with the contents of compilation in the current
-                    directory.
-
---keep              Do not remove previously installed versions of the
-                    rock after building a new one. This behavior can
-                    be made permanent by setting keep_other_versions=true
-                    in the configuration file.
-
---branch=<name>     Override the `source.branch` field in the loaded
-                    rockspec. Allows to specify a different branch to 
-                    fetch. Particularly for SCM rocks.
-
---only-deps         Installs only the dependencies of the rock.
-
-]]..util.deps_mode_help()
+local cfg = require("luarocks.core.cfg")
+local repos = require("luarocks.repos")
+local writer = require("luarocks.manif.writer")
 
 --- Install files to a given location.
 -- Takes a table where the array part is a list of filenames to be copied.
@@ -148,6 +118,31 @@ local function install_default_docs(name, version)
    end
 end
 
+local function check_macosx_deployment_target(rockspec)
+   local target = rockspec.build.macosx_deployment_target
+   local function minor(version) 
+      return tonumber(version and version:match("^[^.]+%.([^.]+)"))
+   end
+   local function patch_variable(var, target)
+      if rockspec.variables[var]:match("MACOSX_DEPLOYMENT_TARGET") then
+         rockspec.variables[var] = (rockspec.variables[var]):gsub("MACOSX_DEPLOYMENT_TARGET=[^ ]*", "MACOSX_DEPLOYMENT_TARGET="..target)
+      else
+         rockspec.variables[var] = "env MACOSX_DEPLOYMENT_TARGET="..target.." "..rockspec.variables[var]
+      end
+   end
+   if cfg.platforms.macosx and rockspec:format_is_at_least("3.0") and target then
+      local version = util.popen_read("sw_vers -productVersion")
+      local versionminor = minor(version)
+      local targetminor = minor(target)
+      if targetminor > versionminor then
+         return nil, ("This rock requires Mac OSX 10.%d, and you are running 10.%d."):format(targetminor, versionminor)
+      end
+      patch_variable("CC", target)
+      patch_variable("LD", target)
+   end
+   return true
+end
+
 --- Build and install a rock given a rockspec.
 -- @param rockspec_file string: local or remote filename of a rockspec.
 -- @param need_to_fetch boolean: true if sources need to be fetched,
@@ -245,6 +240,11 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       end
    end
    
+   ok, err = check_macosx_deployment_target(rockspec)
+   if not ok then
+      return nil, err
+   end
+   
    if build_spec.type ~= "none" then
 
       -- Temporary compatibility
@@ -314,7 +314,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       fs.pop_dir()
    end
 
-   ok, err = manif.make_rock_manifest(name, version)
+   ok, err = writer.make_rock_manifest(name, version)
    if err then return nil, err end
 
    ok, err = repos.deploy_files(name, version, repos.should_wrap_bin_scripts(rockspec), deps_mode)
@@ -333,83 +333,4 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    return name, version
 end
 
---- Build and install a rock.
--- @param rock_file string: local or remote filename of a rock.
--- @param need_to_fetch boolean: true if sources need to be fetched,
--- false if the rockspec was obtained from inside a source rock.
--- @param deps_mode: string: Which trees to check dependencies for:
--- "one" for the current default tree, "all" for all trees,
--- "order" for all trees with priority >= the current default, "none" for no trees.
--- @param build_only_deps boolean: true to build the listed dependencies only.
--- @return boolean or (nil, string, [string]): True if build was successful,
--- or false and an error message and an optional error code.
-function build.build_rock(rock_file, need_to_fetch, deps_mode, build_only_deps)
-   assert(type(rock_file) == "string")
-   assert(type(need_to_fetch) == "boolean")
-
-   local ok, err, errcode
-   local unpack_dir
-   unpack_dir, err, errcode = fetch.fetch_and_unpack_rock(rock_file)
-   if not unpack_dir then
-      return nil, err, errcode
-   end
-   local rockspec_file = path.rockspec_name_from_rock(rock_file)
-   ok, err = fs.change_dir(unpack_dir)
-   if not ok then return nil, err end
-   ok, err, errcode = build.build_rockspec(rockspec_file, need_to_fetch, false, deps_mode, build_only_deps)
-   fs.pop_dir()
-   return ok, err, errcode
-end
- 
-local function do_build(name, version, deps_mode, build_only_deps)
-   if name:match("%.rockspec$") then
-      return build.build_rockspec(name, true, false, deps_mode, build_only_deps)
-   elseif name:match("%.src%.rock$") then
-      return build.build_rock(name, false, deps_mode, build_only_deps)
-   elseif name:match("%.all%.rock$") then
-      local install = require("luarocks.install")
-      local install_fun = build_only_deps and install.install_binary_rock_deps or install.install_binary_rock
-      return install_fun(name, deps_mode)
-   elseif name:match("%.rock$") then
-      return build.build_rock(name, true, deps_mode, build_only_deps)
-   elseif not name:match(dir.separator) then
-      local search = require("luarocks.search")
-      return search.act_on_src_or_rockspec(do_build, name:lower(), version, nil, deps_mode, build_only_deps)
-   end
-   return nil, "Don't know what to do with "..name
-end
-
---- Driver function for "build" command.
--- @param name string: A local or remote rockspec or rock file.
--- If a package name is given, forwards the request to "search" and,
--- if returned a result, installs the matching rock.
--- @param version string: When passing a package name, a version number may
--- also be given.
--- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
--- error message otherwise. exitcode is optionally returned.
-function build.command(flags, name, version)
-   if type(name) ~= "string" then
-      return nil, "Argument missing. "..util.see_help("build")
-   end
-   assert(type(version) == "string" or not version)
-
-   if flags["pack-binary-rock"] then
-      return pack.pack_binary_rock(name, version, do_build, name, version, deps.get_deps_mode(flags))
-   else
-      local ok, err = fs.check_command_permissions(flags)
-      if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
-      ok, err = do_build(name, version, deps.get_deps_mode(flags), flags["only-deps"])
-      if not ok then return nil, err end
-      name, version = ok, err
-
-      if (not flags["only-deps"]) and (not flags["keep"]) and not cfg.keep_other_versions then
-         local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
-         if not ok then util.printerr(err) end
-      end
-
-      manif.check_dependencies(nil, deps.get_deps_mode(flags))
-      return name, version
-   end
-end
-
 return build
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index ccefaa3b..403a8aaf 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -7,7 +7,7 @@ local unpack = unpack or table.unpack
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 
 --- Run a command displaying its execution on standard output.
@@ -49,7 +49,7 @@ end
 -- nil and an error message otherwise.
 function builtin.run(rockspec)
    assert(type(rockspec) == "table")
-   local compile_object, compile_library, compile_wrapper_binary --TODO EXEWRAPPER
+   local compile_object, compile_library, compile_static_library, compile_wrapper_binary --TODO EXEWRAPPER
 
    local build = rockspec.build
    local variables = rockspec.variables
@@ -83,6 +83,15 @@ function builtin.run(rockspec)
          local ok = execute(variables.LD.." "..variables.LIBFLAG, "-o", library, unpack(extras))
          return ok
       end
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "rc", library, unpack(objects))
+         if ok then
+            ok = execute(variables.RANLIB, library)
+         end
+         return ok
+      end
+      ]]
       compile_wrapper_binary = function(fullname, name)
          --TODO EXEWRAPPER
          local fullbasename = fullname:gsub("%.lua$", ""):gsub("/", "\\")
@@ -129,6 +138,12 @@ function builtin.run(rockspec)
          end
          return ok
       end
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "-out:"..library, unpack(objects))
+         return ok
+      end
+      ]]
       compile_wrapper_binary = function(fullname, name)
          --TODO EXEWRAPPER
          local fullbasename = fullname:gsub("%.lua$", ""):gsub("/", "\\")
@@ -170,6 +185,13 @@ function builtin.run(rockspec)
          end
          return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, "-L"..variables.LUA_LIBDIR, unpack(extras))
       end
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "rc", library, unpack(objects))
+         if ok then
+            ok = execute(variables.RANLIB, library)
+         end
+         return ok
+      end
       compile_wrapper_binary = function(_, name) return true, name end
       --TODO EXEWRAPPER
    end
@@ -253,6 +275,17 @@ function builtin.run(rockspec)
          if not ok then
             return nil, "Failed compiling module "..module_name
          end
+         --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
+         module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.static_lib_extension)
+         if moddir ~= "" then
+            module_name = dir.path(moddir, module_name)
+         end
+         lib_modules[module_name] = dir.path(libdir, module_name)
+         ok = compile_static_library(module_name, objects, info.libraries, info.libdirs, name)
+         if not ok then
+            return nil, "Failed compiling static library "..module_name
+         end
+         ]]
       end
    end
    for _, mods in ipairs({{ tbl = lua_modules, perms = cfg.perm_read }, { tbl = lib_modules, perms = cfg.perm_exec }}) do
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index da5a31f1..8ee6b6b2 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -4,7 +4,7 @@ local cmake = {}
 
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 --- Driver function for the "cmake" build back-end.
 -- @param rockspec table: the loaded rockspec.
@@ -52,13 +52,26 @@ function cmake.run(rockspec)
       return nil, "Failed cmake."
    end
 
-   if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --config Release") then
-      return nil, "Failed building."
+   local do_build, do_install
+   if rockspec:format_is_at_least("3.0") then
+      do_build   = (build.build_pass   == nil) and true or build.build_pass
+      do_install = (build.install_pass == nil) and true or build.install_pass
+   else
+      do_build = true
+      do_install = true
    end
 
-   if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --target install --config Release") then
-      return nil, "Failed installing."
+   if do_build then
+      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --config Release") then
+         return nil, "Failed building."
+      end
    end
+   if do_install then
+      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --target install --config Release") then
+         return nil, "Failed installing."
+      end
+   end
+   
    return true
 end
 
diff --git a/src/luarocks/build/make.lua b/src/luarocks/build/make.lua
index 69e73c2e..ded015b7 100644
--- a/src/luarocks/build/make.lua
+++ b/src/luarocks/build/make.lua
@@ -6,7 +6,7 @@ local unpack = unpack or table.unpack
 
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 --- Call "make" with given target and variables
 -- @param make_cmd string: the make command to be used (typically
diff --git a/src/luarocks/cmd/build.lua b/src/luarocks/cmd/build.lua
new file mode 100644
index 00000000..a6b67b92
--- /dev/null
+++ b/src/luarocks/cmd/build.lua
@@ -0,0 +1,119 @@
+
+--- Module implementing the LuaRocks "build" command.
+-- Builds a rock, compiling its C parts if any.
+local cmd_build = {}
+
+local pack = require("luarocks.pack")
+local path = require("luarocks.path")
+local util = require("luarocks.util")
+local fetch = require("luarocks.fetch")
+local fs = require("luarocks.fs")
+local dir = require("luarocks.dir")
+local deps = require("luarocks.deps")
+local remove = require("luarocks.remove")
+local cfg = require("luarocks.core.cfg")
+local build = require("luarocks.build")
+local writer = require("luarocks.manif.writer")
+
+cmd_build.help_summary = "build/compile a rock."
+cmd_build.help_arguments = "[--pack-binary-rock] [--keep] {<rockspec>|<rock>|<name> [<version>]}"
+cmd_build.help = [[
+Build and install a rock, compiling its C parts if any.
+Argument may be a rockspec file, a source rock file
+or the name of a rock to be fetched from a repository.
+
+--pack-binary-rock  Do not install rock. Instead, produce a .rock file
+                    with the contents of compilation in the current
+                    directory.
+
+--keep              Do not remove previously installed versions of the
+                    rock after building a new one. This behavior can
+                    be made permanent by setting keep_other_versions=true
+                    in the configuration file.
+
+--branch=<name>     Override the `source.branch` field in the loaded
+                    rockspec. Allows to specify a different branch to 
+                    fetch. Particularly for SCM rocks.
+
+--only-deps         Installs only the dependencies of the rock.
+
+]]..util.deps_mode_help()
+
+--- Build and install a rock.
+-- @param rock_file string: local or remote filename of a rock.
+-- @param need_to_fetch boolean: true if sources need to be fetched,
+-- false if the rockspec was obtained from inside a source rock.
+-- @param deps_mode: string: Which trees to check dependencies for:
+-- "one" for the current default tree, "all" for all trees,
+-- "order" for all trees with priority >= the current default, "none" for no trees.
+-- @param build_only_deps boolean: true to build the listed dependencies only.
+-- @return boolean or (nil, string, [string]): True if build was successful,
+-- or false and an error message and an optional error code.
+local function build_rock(rock_file, need_to_fetch, deps_mode, build_only_deps)
+   assert(type(rock_file) == "string")
+   assert(type(need_to_fetch) == "boolean")
+
+   local ok, err, errcode
+   local unpack_dir
+   unpack_dir, err, errcode = fetch.fetch_and_unpack_rock(rock_file)
+   if not unpack_dir then
+      return nil, err, errcode
+   end
+   local rockspec_file = path.rockspec_name_from_rock(rock_file)
+   ok, err = fs.change_dir(unpack_dir)
+   if not ok then return nil, err end
+   ok, err, errcode = build.build_rockspec(rockspec_file, need_to_fetch, false, deps_mode, build_only_deps)
+   fs.pop_dir()
+   return ok, err, errcode
+end
+ 
+local function do_build(name, version, deps_mode, build_only_deps)
+   if name:match("%.rockspec$") then
+      return build.build_rockspec(name, true, false, deps_mode, build_only_deps)
+   elseif name:match("%.src%.rock$") then
+      return build_rock(name, false, deps_mode, build_only_deps)
+   elseif name:match("%.all%.rock$") then
+      return build_rock(name, true, deps_mode, build_only_deps)
+   elseif name:match("%.rock$") then
+      return build_rock(name, true, deps_mode, build_only_deps)
+   elseif not name:match(dir.separator) then
+      local search = require("luarocks.search")
+      return search.act_on_src_or_rockspec(do_build, name:lower(), version, nil, deps_mode, build_only_deps)
+   end
+   return nil, "Don't know what to do with "..name
+end
+
+--- Driver function for "build" command.
+-- @param name string: A local or remote rockspec or rock file.
+-- If a package name is given, forwards the request to "search" and,
+-- if returned a result, installs the matching rock.
+-- @param version string: When passing a package name, a version number may
+-- also be given.
+-- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
+-- error message otherwise. exitcode is optionally returned.
+function cmd_build.command(flags, name, version)
+   if type(name) ~= "string" then
+      return nil, "Argument missing. "..util.see_help("build")
+   end
+   assert(type(version) == "string" or not version)
+
+   if flags["pack-binary-rock"] then
+      return pack.pack_binary_rock(name, version, do_build, name, version, deps.get_deps_mode(flags))
+   else
+      local ok, err = fs.check_command_permissions(flags)
+      if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
+      ok, err = do_build(name, version, deps.get_deps_mode(flags), flags["only-deps"])
+      if not ok then return nil, err end
+      name, version = ok, err
+
+      if (not flags["only-deps"]) and (not flags["keep"]) and not cfg.keep_other_versions then
+         local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
+         if not ok then util.printerr(err) end
+      end
+
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
+      return name, version
+   end
+end
+
+return cmd_build
diff --git a/src/luarocks/config_cmd.lua b/src/luarocks/cmd/config.lua
index fe3cc637..b68f7898 100644
--- a/src/luarocks/config_cmd.lua
+++ b/src/luarocks/cmd/config.lua
@@ -2,11 +2,10 @@
 -- Queries information about the LuaRocks configuration.
 local config_cmd = {}
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
 
-util.add_run_function(config_cmd)
 config_cmd.help_summary = "Query information about the LuaRocks configuration."
 config_cmd.help_arguments = "<flag>"
 config_cmd.help = [[
diff --git a/src/luarocks/doc.lua b/src/luarocks/cmd/doc.lua
index 423ebe02..5d521276 100644
--- a/src/luarocks/doc.lua
+++ b/src/luarocks/cmd/doc.lua
@@ -2,7 +2,6 @@
 --- Module implementing the LuaRocks "doc" command.
 -- Shows documentation for an installed rock.
 local doc = {}
-package.loaded["luarocks.doc"] = doc
 
 local util = require("luarocks.util")
 local search = require("luarocks.search")
@@ -12,7 +11,6 @@ local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local download = require("luarocks.download")
 
-util.add_run_function(doc)
 doc.help_summary = "Show documentation for an installed rock."
 
 doc.help = [[
diff --git a/src/luarocks/cmd/download.lua b/src/luarocks/cmd/download.lua
new file mode 100644
index 00000000..9c119f6e
--- /dev/null
+++ b/src/luarocks/cmd/download.lua
@@ -0,0 +1,45 @@
+
+--- Module implementing the luarocks "download" command.
+-- Download a rock from the repository.
+local cmd_download = {}
+
+local util = require("luarocks.util")
+local download = require("luarocks.download")
+
+cmd_download.help_summary = "Download a specific rock file from a rocks server."
+cmd_download.help_arguments = "[--all] [--arch=<arch> | --source | --rockspec] [<name> [<version>]]"
+cmd_download.help = [[
+--all          Download all files if there are multiple matches.
+--source       Download .src.rock if available.
+--rockspec     Download .rockspec if available.
+--arch=<arch>  Download rock for a specific architecture.
+]]
+
+--- Driver function for the "download" command.
+-- @param name string: a rock name.
+-- @param version string or nil: if the name of a package is given, a
+-- version may also be passed.
+-- @return boolean or (nil, string): true if successful or nil followed
+-- by an error message.
+function cmd_download.command(flags, name, version)
+   assert(type(version) == "string" or not version)
+   if type(name) ~= "string" and not flags["all"] then
+      return nil, "Argument missing. "..util.see_help("download")
+   end
+   if not name then name, version = "", "" end
+
+   local arch
+
+   if flags["source"] then
+      arch = "src"
+   elseif flags["rockspec"] then
+      arch = "rockspec"
+   elseif flags["arch"] then
+      arch = flags["arch"]
+   end
+   
+   local dl, err = download.download(arch, name:lower(), version, flags["all"])
+   return dl and true, err
+end
+
+return cmd_download
diff --git a/src/luarocks/help.lua b/src/luarocks/cmd/help.lua
index 10eb2287..b986534c 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/cmd/help.lua
@@ -7,12 +7,11 @@
 local help = {}
 
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 
 local program = util.this_program("luarocks")
 
-util.add_run_function(help)
 help.help_summary = "Help on commands. Type '"..program.." help <command>' for more."
 
 help.help_arguments = "[<command>]"
@@ -48,7 +47,7 @@ function help.command(flags, command)
       print_section("NAME")
       util.printout("\t"..program..[[ - ]]..program_description)
       print_section("SYNOPSIS")
-      util.printout("\t"..program..[[ [--server=<server> | --only-server=<server>] [--tree=<tree>] [VAR=VALUE]... <command> [<argument>] ]])
+      util.printout("\t"..program..[[ [<flags...>] [VAR=VALUE]... <command> [<argument>] ]])
       print_section("GENERAL OPTIONS")
       util.printout([[
         These apply to all commands, as appropriate:
diff --git a/src/luarocks/install.lua b/src/luarocks/cmd/install.lua
index e28c24f0..8b4a154b 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/cmd/install.lua
@@ -1,7 +1,6 @@
 --- Module implementing the LuaRocks "install" command.
 -- Installs binary rocks.
 local install = {}
-package.loaded["luarocks.install"] = install
 
 local path = require("luarocks.path")
 local repos = require("luarocks.repos")
@@ -9,11 +8,11 @@ local fetch = require("luarocks.fetch")
 local util = require("luarocks.util")
 local fs = require("luarocks.fs")
 local deps = require("luarocks.deps")
-local manif = require("luarocks.manif")
+local writer = require("luarocks.manif.writer")
 local remove = require("luarocks.remove")
-local cfg = require("luarocks.cfg")
+local search = require("luarocks.search")
+local cfg = require("luarocks.core.cfg")
 
-util.add_run_function(install)
 install.help_summary = "Install a rock."
 
 install.help_arguments = "{<rock>|<name> [<version>]}"
@@ -75,7 +74,7 @@ function install.install_binary_rock(rock_file, deps_mode)
 
    -- For compatibility with .rock files built with LuaRocks 1
    if not fs.exists(path.rock_manifest_file(name, version)) then
-      ok, err = manif.make_rock_manifest(name, version)
+      ok, err = writer.make_rock_manifest(name, version)
       if err then return nil, err end
    end
 
@@ -156,7 +155,7 @@ function install.command(flags, name, version)
    if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
 
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
-      local build = require("luarocks.build")
+      local build = require("luarocks.cmd.build")
       return build.command(flags, name)
    elseif name:match("%.rock$") then
       if flags["only-deps"] then
@@ -172,10 +171,9 @@ function install.command(flags, name, version)
          if not ok then util.printerr(err) end
       end
 
-      manif.check_dependencies(nil, deps.get_deps_mode(flags))
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
       return name, version
    else
-      local search = require("luarocks.search")
       local url, err = search.find_suitable_rock(search.make_query(name:lower(), version))
       if not url then
          return nil, err
diff --git a/src/luarocks/lint.lua b/src/luarocks/cmd/lint.lua
index 0fd81a20..c9ea45ea 100644
--- a/src/luarocks/lint.lua
+++ b/src/luarocks/cmd/lint.lua
@@ -2,13 +2,11 @@
 --- Module implementing the LuaRocks "lint" command.
 -- Utility function that checks syntax of the rockspec.
 local lint = {}
-package.loaded["luarocks.lint"] = lint
 
 local util = require("luarocks.util")
 local download = require("luarocks.download")
 local fetch = require("luarocks.fetch")
 
-util.add_run_function(lint)
 lint.help_summary = "Check syntax of a rockspec."
 lint.help_arguments = "<rockspec>"
 lint.help = [[
diff --git a/src/luarocks/list.lua b/src/luarocks/cmd/list.lua
index c65e058f..9dff22ac 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/cmd/list.lua
@@ -2,15 +2,13 @@
 --- Module implementing the LuaRocks "list" command.
 -- Lists currently installed rocks.
 local list = {}
-package.loaded["luarocks.list"] = list
 
 local search = require("luarocks.search")
-local deps = require("luarocks.deps")
-local cfg = require("luarocks.cfg")
+local vers = require("luarocks.vers")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
 
-util.add_run_function(list)
 list.help_summary = "List currently installed rocks."
 list.help_arguments = "[--porcelain] <filter>"
 list.help = [[
@@ -30,7 +28,7 @@ local function check_outdated(trees, query)
    local outdated = {}
    for name, versions in util.sortedpairs(results_installed) do
       versions = util.keys(versions)
-      table.sort(versions, deps.compare_versions)
+      table.sort(versions, vers.compare_versions)
       local latest_installed = versions[1]
 
       local query_available = search.make_query(name:lower())
@@ -39,11 +37,11 @@ local function check_outdated(trees, query)
       
       if results_available[name] then
          local available_versions = util.keys(results_available[name])
-         table.sort(available_versions, deps.compare_versions)
+         table.sort(available_versions, vers.compare_versions)
          local latest_available = available_versions[1]
          local latest_available_repo = results_available[name][latest_available][1].repo
          
-         if deps.compare_versions(latest_available, latest_installed) then
+         if vers.compare_versions(latest_available, latest_installed) then
             table.insert(outdated, { name = name, installed = latest_installed, available = latest_available, repo = latest_available_repo })
          end
       end
diff --git a/src/luarocks/make.lua b/src/luarocks/cmd/make.lua
index e59dee37..bfdddb37 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/cmd/make.lua
@@ -4,19 +4,17 @@
 -- it does not fetch sources, etc., assuming everything is 
 -- available in the current directory.
 local make = {}
-package.loaded["luarocks.make"] = make
 
 local build = require("luarocks.build")
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local fetch = require("luarocks.fetch")
 local pack = require("luarocks.pack")
 local remove = require("luarocks.remove")
 local deps = require("luarocks.deps")
-local manif = require("luarocks.manif")
+local writer = require("luarocks.manif.writer")
 
-util.add_run_function(make)
 make.help_summary = "Compile package in current directory using a rockspec."
 make.help_arguments = "[--pack-binary-rock] [<rockspec>]"
 make.help = [[
@@ -87,7 +85,7 @@ function make.command(flags, rockspec)
          if not ok then util.printerr(err) end
       end
 
-      manif.check_dependencies(nil, deps.get_deps_mode(flags))
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
       return name, version
    end
 end
diff --git a/src/luarocks/new_version.lua b/src/luarocks/cmd/new_version.lua
index 91f7607c..b13dbb97 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/cmd/new_version.lua
@@ -10,7 +10,6 @@ local persist = require("luarocks.persist")
 local fs = require("luarocks.fs")
 local type_check = require("luarocks.type_check")
 
-util.add_run_function(new_version)
 new_version.help_summary = "Auto-write a rockspec for a new version of a rock."
 new_version.help_arguments = "[--tag=<tag>] [<package>|<rockspec>] [<new_version>] [<new_url>]"
 new_version.help = [[
diff --git a/src/luarocks/cmd/pack.lua b/src/luarocks/cmd/pack.lua
new file mode 100644
index 00000000..e43e5b3f
--- /dev/null
+++ b/src/luarocks/cmd/pack.lua
@@ -0,0 +1,45 @@
+
+--- Module implementing the LuaRocks "pack" command.
+-- Creates a rock, packing sources or binaries.
+local cmd_pack = {}
+
+local util = require("luarocks.util")
+local pack = require("luarocks.pack")
+
+cmd_pack.help_summary = "Create a rock, packing sources or binaries."
+cmd_pack.help_arguments = "{<rockspec>|<name> [<version>]}"
+cmd_pack.help = [[
+Argument may be a rockspec file, for creating a source rock,
+or the name of an installed package, for creating a binary rock.
+In the latter case, the app version may be given as a second
+argument.
+]]
+
+--- Driver function for the "pack" command.
+-- @param arg string:  may be a rockspec file, for creating a source rock,
+-- or the name of an installed package, for creating a binary rock.
+-- @param version string or nil: if the name of a package is given, a
+-- version may also be passed.
+-- @return boolean or (nil, string): true if successful or nil followed
+-- by an error message.
+function cmd_pack.command(flags, arg, version)
+   assert(type(version) == "string" or not version)
+   if type(arg) ~= "string" then
+      return nil, "Argument missing. "..util.see_help("pack")
+   end
+
+   local file, err
+   if arg:match(".*%.rockspec") then
+      file, err = pack.pack_source_rock(arg)
+   else
+      file, err = pack.pack_installed_rock(arg:lower(), version, flags["tree"])
+   end
+   if err then
+      return nil, err
+   else
+      util.printout("Packed: "..file)
+      return true
+   end
+end
+
+return cmd_pack
diff --git a/src/luarocks/path_cmd.lua b/src/luarocks/cmd/path.lua
index eba85d46..516a0c47 100644
--- a/src/luarocks/path_cmd.lua
+++ b/src/luarocks/cmd/path.lua
@@ -4,9 +4,8 @@
 local path_cmd = {}
 
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
-util.add_run_function(path_cmd)
 path_cmd.help_summary = "Return the currently configured package path."
 path_cmd.help_arguments = ""
 path_cmd.help = [[
diff --git a/src/luarocks/purge.lua b/src/luarocks/cmd/purge.lua
index 17724e84..bbce9f8c 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/cmd/purge.lua
@@ -2,19 +2,17 @@
 --- Module implementing the LuaRocks "purge" command.
 -- Remove all rocks from a given tree.
 local purge = {}
-package.loaded["luarocks.purge"] = purge
 
 local util = require("luarocks.util")
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
 local search = require("luarocks.search")
-local deps = require("luarocks.deps")
+local vers = require("luarocks.vers")
 local repos = require("luarocks.repos")
-local manif = require("luarocks.manif")
-local cfg = require("luarocks.cfg")
+local writer = require("luarocks.manif.writer")
+local cfg = require("luarocks.core.cfg")
 local remove = require("luarocks.remove")
 
-util.add_run_function(purge)
 purge.help_summary = "Remove all installed rocks from a tree."
 purge.help_arguments = "--tree=<tree> [--old-versions]"
 purge.help = [[
@@ -50,13 +48,13 @@ function purge.command(flags)
 
    search.manifest_search(results, path.rocks_dir(tree), query)
 
-   local sort = function(a,b) return deps.compare_versions(b,a) end
+   local sort = function(a,b) return vers.compare_versions(b,a) end
    if flags["old-versions"] then
-      sort = deps.compare_versions
+      sort = vers.compare_versions
    end
 
    for package, versions in util.sortedpairs(results) do
-      for version, repositories in util.sortedpairs(versions, sort) do
+      for version, _ in util.sortedpairs(versions, sort) do
          if flags["old-versions"] then
             util.printout("Keeping "..package.." "..version.."...")
             local ok, err = remove.remove_other_versions(package, version, flags["force"], flags["force-fast"])
@@ -73,7 +71,7 @@ function purge.command(flags)
          end
       end
    end
-   return manif.make_manifest(cfg.rocks_dir, "one")
+   return writer.make_manifest(cfg.rocks_dir, "one")
 end
 
 return purge
diff --git a/src/luarocks/cmd/remove.lua b/src/luarocks/cmd/remove.lua
new file mode 100644
index 00000000..b8148ba7
--- /dev/null
+++ b/src/luarocks/cmd/remove.lua
@@ -0,0 +1,67 @@
+
+--- Module implementing the LuaRocks "remove" command.
+-- Uninstalls rocks.
+local cmd_remove = {}
+
+local remove = require("luarocks.remove")
+local util = require("luarocks.util")
+local cfg = require("luarocks.core.cfg")
+local fs = require("luarocks.fs")
+local search = require("luarocks.search")
+local path = require("luarocks.path")
+local deps = require("luarocks.deps")
+local writer = require("luarocks.manif.writer")
+
+cmd_remove.help_summary = "Uninstall a rock."
+cmd_remove.help_arguments = "[--force|--force-fast] <name> [<version>]"
+cmd_remove.help = [[
+Argument is the name of a rock to be uninstalled.
+If a version is not given, try to remove all versions at once.
+Will only perform the removal if it does not break dependencies.
+To override this check and force the removal, use --force.
+To perform a forced removal without reporting dependency issues,
+use --force-fast.
+
+]]..util.deps_mode_help()
+
+--- Driver function for the "remove" command.
+-- @param name string: name of a rock. If a version is given, refer to
+-- a specific version; otherwise, try to remove all versions.
+-- @param version string: When passing a package name, a version number
+-- may also be given.
+-- @return boolean or (nil, string, exitcode): True if removal was
+-- successful, nil and an error message otherwise. exitcode is optionally returned.
+function cmd_remove.command(flags, name, version)
+   if type(name) ~= "string" then
+      return nil, "Argument missing. "..util.see_help("remove")
+   end
+   
+   local deps_mode = flags["deps-mode"] or cfg.deps_mode
+   
+   local ok, err = fs.check_command_permissions(flags)
+   if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
+   
+   local rock_type = name:match("%.(rock)$") or name:match("%.(rockspec)$")
+   local filename = name
+   if rock_type then
+      name, version = path.parse_name(filename)
+      if not name then return nil, "Invalid "..rock_type.." filename: "..filename end
+   end
+
+   local results = {}
+   name = name:lower()
+   search.manifest_search(results, cfg.rocks_dir, search.make_query(name, version))
+   if not results[name] then
+      return nil, "Could not find rock '"..name..(version and " "..version or "").."' in "..path.rocks_tree_to_string(cfg.root_dir)
+   end
+
+   local ok, err = remove.remove_search_results(results, name, deps_mode, flags["force"], flags["force-fast"])
+   if not ok then
+      return nil, err
+   end
+
+   writer.check_dependencies(nil, deps.get_deps_mode(flags))
+   return true
+end
+
+return cmd_remove
diff --git a/src/luarocks/cmd/search.lua b/src/luarocks/cmd/search.lua
new file mode 100644
index 00000000..c4e4058d
--- /dev/null
+++ b/src/luarocks/cmd/search.lua
@@ -0,0 +1,74 @@
+
+--- Module implementing the LuaRocks "search" command.
+-- Queries LuaRocks servers.
+local cmd_search = {}
+
+local cfg = require("luarocks.core.cfg")
+local util = require("luarocks.util")
+local search = require("luarocks.search")
+
+cmd_search.help_summary = "Query the LuaRocks servers."
+cmd_search.help_arguments = "[--source] [--binary] { <name> [<version>] | --all }"
+cmd_search.help = [[
+--source  Return only rockspecs and source rocks,
+          to be used with the "build" command.
+--binary  Return only pure Lua and binary rocks (rocks that can be used
+          with the "install" command without requiring a C toolchain).
+--all     List all contents of the server that are suitable to
+          this platform, do not filter by name.
+]]
+
+--- Splits a list of search results into two lists, one for "source" results
+-- to be used with the "build" command, and one for "binary" results to be
+-- used with the "install" command.
+-- @param results table: A search results table.
+-- @return (table, table): Two tables, one for source and one for binary
+-- results.
+local function split_source_and_binary_results(results)
+   local sources, binaries = {}, {}
+   for name, versions in pairs(results) do
+      for version, repositories in pairs(versions) do
+         for _, repo in ipairs(repositories) do
+            local where = sources
+            if repo.arch == "all" or repo.arch == cfg.arch then
+               where = binaries
+            end
+            search.store_result(where, name, version, repo.arch, repo.repo)
+         end
+      end
+   end
+   return sources, binaries
+end
+
+--- Driver function for "search" command.
+-- @param name string: A substring of a rock name to search.
+-- @param version string or nil: a version may also be passed.
+-- @return boolean or (nil, string): True if build was successful; nil and an
+-- error message otherwise.
+function cmd_search.command(flags, name, version)
+   if flags["all"] then
+      name, version = "", nil
+   end
+
+   if type(name) ~= "string" and not flags["all"] then
+      return nil, "Enter name and version or use --all. "..util.see_help("search")
+   end
+   
+   local query = search.make_query(name:lower(), version)
+   query.exact_name = false
+   local results, err = search.search_repos(query)
+   local porcelain = flags["porcelain"]
+   util.title("Search results:", porcelain, "=")
+   local sources, binaries = split_source_and_binary_results(results)
+   if next(sources) and not flags["binary"] then
+      util.title("Rockspecs and source rocks:", porcelain)
+      search.print_results(sources, porcelain)
+   end
+   if next(binaries) and not flags["source"] then    
+      util.title("Binary and pure-Lua rocks:", porcelain)
+      search.print_results(binaries, porcelain)
+   end
+   return true
+end
+
+return cmd_search
diff --git a/src/luarocks/show.lua b/src/luarocks/cmd/show.lua
index ac6273e0..16c8d34e 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/cmd/show.lua
@@ -1,18 +1,16 @@
 --- Module implementing the LuaRocks "show" command.
 -- Shows information about an installed rock.
 local show = {}
-package.loaded["luarocks.show"] = show
 
 local search = require("luarocks.search")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
-local deps = require("luarocks.deps")
+local vers = require("luarocks.vers")
 local fetch = require("luarocks.fetch")
 local manif = require("luarocks.manif")
 local repos = require("luarocks.repos")
 
-util.add_run_function(show)
 show.help_summary = "Show information about an installed rock."
 
 show.help = [[
@@ -103,6 +101,8 @@ function show.command(flags, name, version)
    if flags["rock-tree"] then util.printout(path.rocks_tree_to_string(repo))
    elseif flags["rock-dir"] then util.printout(directory)
    elseif flags["home"] then util.printout(descript.homepage)
+   elseif flags["issues"] then util.printout(descript.issues_url)
+   elseif flags["labels"] then util.printout(descript.labels and table.concat(descript.labels, "\n"))
    elseif flags["modules"] then util.printout(keys_as_string(minfo.modules, "\n"))
    elseif flags["deps"] then util.printout(keys_as_string(minfo.dependencies))
    elseif flags["rockspec"] then util.printout(rockspec_file)
@@ -121,6 +121,12 @@ function show.command(flags, name, version)
       if descript.homepage then
          util.printout("Homepage: ", descript.homepage)
       end
+      if descript.issues_url then
+         util.printout("Issues: ", descript.issues_url)
+      end
+      if descript.labels then
+         util.printout("Labels: ", table.concat(descript.labels, ", "))
+      end
       util.printout("Installed in: ", path.rocks_tree_to_string(repo))
 
       if next(minfo.commands) then
@@ -141,7 +147,7 @@ function show.command(flags, name, version)
          util.printout("Depends on:")
          for _, dep in ipairs(rockspec.dependencies) do
             direct_deps[dep.name] = true
-            util.printout("\t"..deps.show_dep(dep).." "..installed_rock_label(dep.name, flags["tree"]))
+            util.printout("\t"..vers.show_dep(dep).." "..installed_rock_label(dep.name, flags["tree"]))
          end
       end
       local has_indirect_deps
diff --git a/src/luarocks/unpack.lua b/src/luarocks/cmd/unpack.lua
index 0922f9b9..c50701b0 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/cmd/unpack.lua
@@ -2,16 +2,14 @@
 --- Module implementing the LuaRocks "unpack" command.
 -- Unpack the contents of a rock.
 local unpack = {}
-package.loaded["luarocks.unpack"] = unpack
 
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local build = require("luarocks.build")
 local dir = require("luarocks.dir")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
-util.add_run_function(unpack)
 unpack.help_summary = "Unpack the contents of a rock."
 unpack.help_arguments = "[--force] {<rock>|<name> [<version>]}"
 unpack.help = [[
diff --git a/src/luarocks/upload.lua b/src/luarocks/cmd/upload.lua
index 7c0c416c..baee47ab 100644
--- a/src/luarocks/upload.lua
+++ b/src/luarocks/cmd/upload.lua
@@ -4,10 +4,9 @@ local upload = {}
 local util = require("luarocks.util")
 local fetch = require("luarocks.fetch")
 local pack = require("luarocks.pack")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local Api = require("luarocks.upload.api")
 
-util.add_run_function(upload)
 upload.help_summary = "Upload a rockspec to the public rocks repository."
 upload.help_arguments = "[--skip-pack] [--api-key=<key>] [--force] <rockspec>"
 upload.help = [[
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/cmd/write_rockspec.lua
index 33edeb1b..73010f08 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/cmd/write_rockspec.lua
@@ -1,8 +1,7 @@
 
 local write_rockspec = {}
-package.loaded["luarocks.write_rockspec"] = write_rockspec
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
@@ -10,8 +9,8 @@ local path = require("luarocks.path")
 local persist = require("luarocks.persist")
 local type_check = require("luarocks.type_check")
 local util = require("luarocks.util")
+local vers = require("luarocks.vers")
 
-util.add_run_function(write_rockspec)
 write_rockspec.help_summary = "Write a template for a rockspec file."
 write_rockspec.help_arguments = "[--output=<file> ...] [<name>] [<version>] [<url>|<path>]"
 write_rockspec.help = [[
@@ -223,6 +222,7 @@ local function rockspec_cleanup(rockspec)
    rockspec.source.protocol = nil
    rockspec.variables = nil
    rockspec.name = nil
+   rockspec.format_is_at_least = nil
 end
 
 function write_rockspec.command(flags, name, version, url_or_dir)
@@ -285,6 +285,7 @@ function write_rockspec.command(flags, name, version, url_or_dir)
    }
    path.configure_paths(rockspec)
    rockspec.source.protocol = protocol
+   rockspec.format_is_at_least = vers.format_is_at_least
    
    configure_lua_version(rockspec, flags["lua-version"])
    
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index ac5ccd35..6a1cc519 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -5,7 +5,7 @@ local command_line = {}
 local unpack = unpack or table.unpack
 
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local path = require("luarocks.path")
 local dir = require("luarocks.dir")
 local deps = require("luarocks.deps")
diff --git a/src/luarocks/cfg.lua b/src/luarocks/core/cfg.lua
index 858a87fe..250f503e 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -1,3 +1,4 @@
+
 --- Configuration for LuaRocks.
 -- Tries to load the user's configuration file and
 -- defines defaults for unset values. See the
@@ -12,11 +13,7 @@
 local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION =
       rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION
 
---module("luarocks.cfg")
 local cfg = {}
-package.loaded["luarocks.cfg"] = cfg
-
-local util = require("luarocks.util")
 
 cfg.lua_version = _VERSION:match(" (5%.[123])$") or "5.1"
 local version_suffix = cfg.lua_version:gsub("%.", "_")
@@ -31,15 +28,18 @@ if not ok then
    site_config = {}
 end
 
+local util = require("luarocks.core.util")
+local persist = require("luarocks.core.persist")
+local require = nil
+--------------------------------------------------------------------------------
+
 cfg.program_version = "scm"
-cfg.program_series = "2.2"
+cfg.program_series = "3.0"
 cfg.major_version = (cfg.program_version:match("([^.]%.[^.])")) or cfg.program_series
 cfg.variables = {}
 cfg.rocks_trees = {}
 cfg.platforms = {}
 
-local persist = require("luarocks.persist")
-
 cfg.errorcodes = setmetatable({
    OK = 0,
    UNSPECIFIED = 1,
@@ -75,8 +75,8 @@ end
 -- so that this detection does not run every time. When it is
 -- performed, we use the Unix way to identify the system,
 -- even on Windows (assuming UnxUtils or Cygwin).
-local system = site_config.LUAROCKS_UNAME_S or io.popen("uname -s"):read("*l")
-local proc = site_config.LUAROCKS_UNAME_M or io.popen("uname -m"):read("*l")
+local system = site_config.LUAROCKS_UNAME_S or util.popen_read("uname -s")
+local proc = site_config.LUAROCKS_UNAME_M or util.popen_read("uname -m")
 if proc:match("i[%d]86") then
    cfg.target_cpu = "x86"
 elseif proc:match("amd64") or proc:match("x86_64") then
@@ -370,6 +370,8 @@ local defaults = {
       MAKE = "make",
       CC = "cc",
       LD = "ld",
+      AR = "ar",
+      RANLIB = "ranlib",
 
       CVS = "cvs",
       GIT = "git",
@@ -426,7 +428,8 @@ local defaults = {
       include = "include"
    },
 
-   rocks_provided = {}
+   rocks_provided = {},
+   rocks_provided_3_0 = {},
 }
 
 if cfg.platforms.windows then
@@ -438,6 +441,7 @@ if cfg.platforms.windows then
    defaults.arch = "win32-"..cfg.target_cpu 
    defaults.lib_extension = "dll"
    defaults.external_lib_extension = "dll"
+   defaults.static_lib_extension = "lib"
    defaults.obj_extension = "obj"
    defaults.external_deps_dirs = { "c:/external/" }
    defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR and site_config.LUA_BINDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/bin"
@@ -451,6 +455,7 @@ if cfg.platforms.windows then
    defaults.variables.WRAPPER = full_prefix.."\\rclauncher.c"
    defaults.variables.LD = "link"
    defaults.variables.MT = "mt"
+   defaults.variables.AR = "lib"
    defaults.variables.LUALIB = "lua"..cfg.lua_version..".lib"
    defaults.variables.CFLAGS = "/nologo /MD /O2"
    defaults.variables.LIBFLAG = "/nologo /dll"
@@ -490,11 +495,14 @@ end
 
 if cfg.platforms.mingw32 then
    defaults.obj_extension = "o"
+   defaults.static_lib_extension = "a"
    defaults.cmake_generator = "MinGW Makefiles"
    defaults.variables.MAKE = "mingw32-make"
    defaults.variables.CC = "mingw32-gcc"
    defaults.variables.RC = "windres"
    defaults.variables.LD = "mingw32-gcc"
+   defaults.variables.AR = "ar"
+   defaults.variables.RANLIB = "ranlib"
    defaults.variables.CFLAGS = "-O2"
    defaults.variables.LIBFLAG = "-shared"
    defaults.makefile = "Makefile"
@@ -515,6 +523,7 @@ end
 
 if cfg.platforms.unix then
    defaults.lib_extension = "so"
+   defaults.static_lib_extension = "a"
    defaults.external_lib_extension = "so"
    defaults.obj_extension = "o"
    defaults.external_deps_dirs = { "/usr/local", "/usr" }
@@ -589,7 +598,7 @@ if cfg.platforms.macosx then
    defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
    defaults.variables.STAT = "/usr/bin/stat"
    defaults.variables.STATFLAG = "-f '%A'"
-   local version = io.popen("sw_vers -productVersion"):read("*l")
+   local version = util.popen_read("sw_vers -productVersion")
    version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
    if version >= 10 then
       version = 8
@@ -648,8 +657,8 @@ end
 if package.loaded.jit then
    -- LuaJIT
    local lj_version = package.loaded.jit.version:match("LuaJIT (.*)"):gsub("%-","")
-   --defaults.rocks_provided["luajit"] = lj_version.."-1"
    defaults.rocks_provided["luabitop"] = lj_version.."-1"
+   defaults.rocks_provided_3_0["luajit"] = lj_version.."-1"
 end
 
 -- Use defaults:
@@ -666,6 +675,7 @@ for _, entry in ipairs({"variables", "rocks_provided"}) do
       end
    end
 end
+setmetatable(defaults.rocks_provided_3_0, { __index = cfg.rocks_provided })
 
 -- For values not set in the config file, use values from the 'defaults' table.
 local cfg_mt = {
diff --git a/src/luarocks/core/dir.lua b/src/luarocks/core/dir.lua
new file mode 100644
index 00000000..05b2c72d
--- /dev/null
+++ b/src/luarocks/core/dir.lua
@@ -0,0 +1,43 @@
+
+local dir = {}
+
+local require = nil
+--------------------------------------------------------------------------------
+
+dir.separator = "/"
+
+--- Describe a path in a cross-platform way.
+-- Use this function to avoid platform-specific directory
+-- separators in other modules. Removes trailing slashes from
+-- each component given, to avoid repeated separators.
+-- Separators inside strings are kept, to handle URLs containing
+-- protocols.
+-- @param ... strings representing directories
+-- @return string: a string with a platform-specific representation
+-- of the path.
+function dir.path(...)
+   local t = {...}
+   while t[1] == "" do
+      table.remove(t, 1)
+   end
+   return (table.concat(t, "/"):gsub("([^:])/+", "%1/"):gsub("^/+", "/"):gsub("/*$", ""))
+end
+
+--- Split protocol and path from an URL or local pathname.
+-- URLs should be in the "protocol://path" format.
+-- For local pathnames, "file" is returned as the protocol.
+-- @param url string: an URL or a local pathname.
+-- @return string, string: the protocol, and the pathname without the protocol.
+function dir.split_url(url)
+   assert(type(url) == "string")
+   
+   local protocol, pathname = url:match("^([^:]*)://(.*)")
+   if not protocol then
+      protocol = "file"
+      pathname = url
+   end
+   return protocol, pathname
+end
+
+return dir
+
diff --git a/src/luarocks/manif_core.lua b/src/luarocks/core/manif.lua
index 82e7ea4d..549cfb4c 100644
--- a/src/luarocks/manif_core.lua
+++ b/src/luarocks/core/manif.lua
@@ -1,15 +1,13 @@
 
 --- Core functions for querying manifest files.
--- This module requires no specific 'fs' functionality.
-local manif_core = {}
-package.loaded["luarocks.manif_core"] = manif_core
+local manif = {}
 
-local persist = require("luarocks.persist")
-local type_check = require("luarocks.type_check")
-local cfg = require("luarocks.cfg")
-local dir = require("luarocks.dir")
-local util = require("luarocks.util")
-local path = require("luarocks.path")
+local persist = require("luarocks.core.persist")
+local type_check = require("luarocks.core.type_check")
+local cfg = require("luarocks.core.cfg")
+local dir = require("luarocks.core.dir")
+local require = nil
+--------------------------------------------------------------------------------
 
 -- Table with repository identifiers as keys and tables mapping
 -- Lua versions to cached loaded manifests as values.
@@ -19,7 +17,7 @@ local manifest_cache = {}
 -- @param repo_url string: The repository identifier.
 -- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
 -- @param manifest table: the manifest to be cached.
-function manif_core.cache_manifest(repo_url, lua_version, manifest)
+function manif.cache_manifest(repo_url, lua_version, manifest)
    lua_version = lua_version or cfg.lua_version
    manifest_cache[repo_url] = manifest_cache[repo_url] or {}
    manifest_cache[repo_url][lua_version] = manifest
@@ -29,7 +27,7 @@ end
 -- @param repo_url string: The repository identifier.
 -- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
 -- @return table or nil: loaded manifest or nil if cache is empty.
-function manif_core.get_cached_manifest(repo_url, lua_version)
+function manif.get_cached_manifest(repo_url, lua_version)
    lua_version = lua_version or cfg.lua_version
    return manifest_cache[repo_url] and manifest_cache[repo_url][lua_version]
 end
@@ -42,7 +40,7 @@ end
 -- @param quick boolean: If given, skips type checking.
 -- @return table or (nil, string, string): the manifest or nil,
 -- error message and error code ("open", "load", "run" or "type").
-function manif_core.manifest_loader(file, repo_url, lua_version, quick)
+function manif.manifest_loader(file, repo_url, lua_version, quick)
    local manifest, err, errcode = persist.load_into_table(file)
    if not manifest then
       return nil, "Failed loading manifest for "..repo_url..": "..err, errcode
@@ -55,7 +53,7 @@ function manif_core.manifest_loader(file, repo_url, lua_version, quick)
       end
    end
 
-   manif_core.cache_manifest(repo_url, lua_version, manifest)
+   manif.cache_manifest(repo_url, lua_version, manifest)
    return manifest
 end
 
@@ -65,42 +63,16 @@ end
 -- @param repo_url string: URL or pathname for the repository.
 -- @return table or (nil, string, string): A table representing the manifest,
 -- or nil followed by an error message and an error code, see manifest_loader.
-function manif_core.load_local_manifest(repo_url)
+function manif.load_local_manifest(repo_url)
    assert(type(repo_url) == "string")
 
-   local cached_manifest = manif_core.get_cached_manifest(repo_url)
+   local cached_manifest = manif.get_cached_manifest(repo_url)
    if cached_manifest then
       return cached_manifest
    end
 
    local pathname = dir.path(repo_url, "manifest")
-   return manif_core.manifest_loader(pathname, repo_url, nil, true)
+   return manif.manifest_loader(pathname, repo_url, nil, true)
 end
 
---- Get all versions of a package listed in a manifest file.
--- @param name string: a package name.
--- @param deps_mode string: "one", to use only the currently
--- configured tree; "order" to select trees based on order
--- (use the current tree and all trees below it on the list)
--- or "all", to use all trees.
--- @return table: An array of strings listing installed
--- versions of a package.
-function manif_core.get_versions(name, deps_mode)
-   assert(type(name) == "string")
-   assert(type(deps_mode) == "string")
-
-   local version_set = {}
-   path.map_trees(deps_mode, function(tree)
-      local manifest = manif_core.load_local_manifest(path.rocks_dir(tree))
-
-      if manifest and manifest.repository[name] then
-         for version in pairs(manifest.repository[name]) do
-            version_set[version] = true
-         end
-      end
-   end)
-
-   return util.keys(version_set)
-end
-
-return manif_core
+return manif
diff --git a/src/luarocks/core/path.lua b/src/luarocks/core/path.lua
new file mode 100644
index 00000000..ed85aeac
--- /dev/null
+++ b/src/luarocks/core/path.lua
@@ -0,0 +1,114 @@
+
+--- Core LuaRocks-specific path handling functions.
+local path = {}
+
+local cfg = require("luarocks.core.cfg")
+local dir = require("luarocks.core.dir")
+local require = nil
+--------------------------------------------------------------------------------
+
+function path.rocks_dir(tree)
+   if type(tree) == "string" then
+      return dir.path(tree, cfg.rocks_subdir)
+   else
+      assert(type(tree) == "table")
+      return tree.rocks_dir or dir.path(tree.root, cfg.rocks_subdir)
+   end
+end
+
+--- Produce a versioned version of a filename.
+-- @param file string: filename (must start with prefix)
+-- @param prefix string: Path prefix for file
+-- @param name string: Rock name
+-- @param version string: Rock version
+-- @return string: a pathname with the same directory parts and a versioned basename.
+function path.versioned_name(file, prefix, name, version)
+   assert(type(file) == "string")
+   assert(type(name) == "string")
+   assert(type(version) == "string")
+
+   local rest = file:sub(#prefix+1):gsub("^/*", "")
+   local name_version = (name.."_"..version):gsub("%-", "_"):gsub("%.", "_")
+   return dir.path(prefix, name_version.."-"..rest)
+end
+
+--- Convert a pathname to a module identifier.
+-- In Unix, for example, a path "foo/bar/baz.lua" is converted to
+-- "foo.bar.baz"; "bla/init.lua" returns "bla"; "foo.so" returns "foo".
+-- @param file string: Pathname of module
+-- @return string: The module identifier, or nil if given path is
+-- not a conformant module path (the function does not check if the
+-- path actually exists).
+function path.path_to_module(file)
+   assert(type(file) == "string")
+
+   local name = file:match("(.*)%."..cfg.lua_extension.."$")
+   if name then
+      name = name:gsub(dir.separator, ".")
+      local init = name:match("(.*)%.init$")
+      if init then
+         name = init
+      end
+   else
+      name = file:match("(.*)%."..cfg.lib_extension.."$")
+      if name then
+         name = name:gsub(dir.separator, ".")
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
+      else
+         name = file:match("(.*)%."..cfg.static_lib_extension.."$")
+         if name then
+            name = name:gsub(dir.separator, ".")
+         end
+      ]]
+      end
+   end
+   if not name then name = file end
+   name = name:gsub("^%.+", ""):gsub("%.+$", "")
+   return name
+end
+
+function path.deploy_lua_dir(tree)
+   if type(tree) == "string" then
+      return dir.path(tree, cfg.lua_modules_path)
+   else
+      assert(type(tree) == "table")
+      return tree.lua_dir or dir.path(tree.root, cfg.lua_modules_path)
+   end
+end
+
+function path.deploy_lib_dir(tree)
+   if type(tree) == "string" then
+      return dir.path(tree, cfg.lib_modules_path)
+   else
+      assert(type(tree) == "table")
+      return tree.lib_dir or dir.path(tree.root, cfg.lib_modules_path)
+   end
+end
+
+local is_src_extension = { [".lua"] = true, [".tl"] = true, [".tld"] = true, [".moon"] = true }
+
+--- Return the pathname of the file that would be loaded for a module, indexed.
+-- @param file_name string: module file name as in manifest (eg. "socket/core.so")
+-- @param name string: name of the package (eg. "luasocket")
+-- @param version string: version number (eg. "2.0.2-1")
+-- @param tree string: repository path (eg. "/usr/local")
+-- @param i number: the index, 1 if version is the current default, > 1 otherwise.
+-- This is done this way for use by select_module in luarocks.loader.
+-- @return string: filename of the module (eg. "/usr/local/lib/lua/5.1/socket/core.so")
+function path.which_i(file_name, name, version, tree, i)
+   local deploy_dir
+   local extension = file_name:match("%.[a-z]+$")
+   if is_src_extension[extension] then
+      deploy_dir = path.deploy_lua_dir(tree)
+      file_name = dir.path(deploy_dir, file_name)
+   else
+      deploy_dir = path.deploy_lib_dir(tree)
+      file_name = dir.path(deploy_dir, file_name)
+   end
+   if i > 1 then
+      file_name = path.versioned_name(file_name, deploy_dir, name, version)
+   end
+   return file_name
+end
+
+return path
diff --git a/src/luarocks/core/persist.lua b/src/luarocks/core/persist.lua
new file mode 100644
index 00000000..48979184
--- /dev/null
+++ b/src/luarocks/core/persist.lua
@@ -0,0 +1,81 @@
+
+local persist = {}
+
+local require = nil
+--------------------------------------------------------------------------------
+
+--- Load and run a Lua file in an environment.
+-- @param filename string: the name of the file.
+-- @param env table: the environment table.
+-- @return (true, any) or (nil, string, string): true and the return value
+-- of the file, or nil, an error message and an error code ("open", "load"
+-- or "run") in case of errors.
+local function run_file(filename, env)
+   local fd, err = io.open(filename)
+   if not fd then
+      return nil, err, "open"
+   end
+   local str, err = fd:read("*a")
+   fd:close()
+   if not str then
+      return nil, err, "open"
+   end
+   str = str:gsub("^#![^\n]*\n", "")
+   local chunk, ran
+   if _VERSION == "Lua 5.1" then -- Lua 5.1
+      chunk, err = loadstring(str, filename)
+      if chunk then
+         setfenv(chunk, env)
+         ran, err = pcall(chunk)
+      end
+   else -- Lua 5.2
+      chunk, err = load(str, filename, "t", env)
+      if chunk then
+         ran, err = pcall(chunk)
+      end
+   end
+   if not chunk then
+      return nil, "Error loading file: "..err, "load"
+   end
+   if not ran then
+      return nil, "Error running file: "..err, "run"
+   end
+   return true, err
+end
+
+--- Load a Lua file containing assignments, storing them in a table.
+-- The global environment is not propagated to the loaded file.
+-- @param filename string: the name of the file.
+-- @param tbl table or nil: if given, this table is used to store
+-- loaded values.
+-- @return (table, table) or (nil, string, string): a table with the file's assignments
+-- as fields and set of undefined globals accessed in file,
+-- or nil, an error message and an error code ("open"; couldn't open the file,
+-- "load"; compile-time error, or "run"; run-time error)
+-- in case of errors.
+function persist.load_into_table(filename, tbl)
+   assert(type(filename) == "string")
+   assert(type(tbl) == "table" or not tbl)
+
+   local result = tbl or {}
+   local globals = {}
+   local globals_mt = {
+      __index = function(t, k)
+         globals[k] = true
+      end
+   }
+   local save_mt = getmetatable(result)
+   setmetatable(result, globals_mt)
+   
+   local ok, err, errcode = run_file(filename, result)
+   
+   setmetatable(result, save_mt)
+
+   if not ok then
+      return nil, err, errcode
+   end
+   return result, globals
+end
+
+return persist
+
diff --git a/src/luarocks/core/type_check.lua b/src/luarocks/core/type_check.lua
new file mode 100644
index 00000000..343b7154
--- /dev/null
+++ b/src/luarocks/core/type_check.lua
@@ -0,0 +1,229 @@
+
+local type_check = {}
+
+local cfg = require("luarocks.core.cfg")
+local vers = require("luarocks.core.vers")
+local require = nil
+--------------------------------------------------------------------------------
+
+type_check.string_1 = { _type = "string" }
+type_check.number_1 = { _type = "number" }
+type_check.mandatory_string_1 = { _type = "string", _mandatory = true }
+
+local number_1 = type_check.number_1
+local string_1 = type_check.string_1
+local mandatory_string_1 = type_check.mandatory_string_1
+
+local manifest_types = {
+   repository = {
+      _mandatory = true,
+      -- packages
+      _any = {
+         -- versions
+         _any = {
+            -- items
+            _any = {
+               arch = mandatory_string_1,
+               modules = { _any = string_1 },
+               commands = { _any = string_1 },
+               dependencies = { _any = string_1 },
+               -- TODO: to be extended with more metadata.
+            }
+         }
+      }
+   },
+   modules = {
+      _mandatory = true,
+      -- modules
+      _any = {
+         -- providers
+         _any = string_1
+      }
+   },
+   commands = {
+      _mandatory = true,
+      -- modules
+      _any = {
+         -- commands
+         _any = string_1
+      }
+   },
+   dependencies = {
+      -- each module
+      _any = {
+         -- each version
+         _any = {
+            -- each dependency
+            _any = {
+               name = string_1,
+               constraints = {
+                  _any = {
+                     no_upgrade = { _type = "boolean" },
+                     op = string_1,
+                     version = {
+                        string = string_1,
+                        _any = number_1,
+                     }
+                  }
+               }
+            }
+         }
+      }
+   }
+}
+
+local function check_version(version, typetbl, context)
+   local typetbl_version = typetbl._version or "1.0"
+   if vers.compare_versions(typetbl_version, version) then
+      if context == "" then
+         return nil, "Invalid rockspec_format version number in rockspec? Please fix rockspec accordingly."
+      else
+         return nil, context.." is not supported in rockspec format "..version.." (requires version "..typetbl_version.."), please fix the rockspec_format field accordingly."
+      end
+   end
+   return true
+end
+
+--- Type check an object.
+-- The object is compared against an archetypical value
+-- matching the expected type -- the actual values don't matter,
+-- only their types. Tables are type checked recursively.
+-- @param version string: The version of the item.
+-- @param item any: The object being checked.
+-- @param typetbl any: The type-checking table for the object.
+-- @param context string: A string indicating the "context" where the
+-- error occurred (the full table path), for error messages.
+-- @return boolean or (nil, string): true if type checking
+-- succeeded, or nil and an error message if it failed.
+-- @see type_check_table
+local function type_check_item(version, item, typetbl, context)
+   assert(type(version) == "string")
+   
+   local ok, err = check_version(version, typetbl, context)
+   if not ok then
+      return nil, err
+   end
+   
+   local item_type = type(item) or "nil"
+   local expected_type = typetbl._type or "table"
+   
+   if expected_type == "number" then
+      if not tonumber(item) then
+         return nil, "Type mismatch on field "..context..": expected a number"
+      end
+   elseif expected_type == "string" then
+      if item_type ~= "string" then
+         return nil, "Type mismatch on field "..context..": expected a string, got "..item_type
+      end
+      if typetbl._pattern then
+         if not item:match("^"..typetbl._pattern.."$") then
+            return nil, "Type mismatch on field "..context..": invalid value "..item.." does not match '"..typetbl._pattern.."'"
+         end
+      end
+   elseif expected_type == "table" then
+      if item_type ~= expected_type then
+         return nil, "Type mismatch on field "..context..": expected a table"
+      else
+         return type_check.type_check_table(version, item, typetbl, context)
+      end
+   elseif item_type ~= expected_type then
+      return nil, "Type mismatch on field "..context..": expected "..expected_type
+   end
+   return true
+end
+
+local function mkfield(context, field)
+   if context == "" then
+      return tostring(field)
+   elseif type(field) == "string" then
+      return context.."."..field
+   else
+      return context.."["..tostring(field).."]"
+   end
+end
+
+--- Type check the contents of a table.
+-- The table's contents are compared against a reference table,
+-- which contains the recognized fields, with archetypical values
+-- matching the expected types -- the actual values of items in the
+-- reference table don't matter, only their types (ie, for field x
+-- in tbl that is correctly typed, type(tbl.x) == type(types.x)).
+-- If the reference table contains a field called MORE, then
+-- unknown fields in the checked table are accepted.
+-- If it contains a field called ANY, then its type will be 
+-- used to check any unknown fields. If a field is prefixed
+-- with MUST_, it is mandatory; its absence from the table is
+-- a type error.
+-- Tables are type checked recursively.
+-- @param version string: The version of tbl.
+-- @param tbl table: The table to be type checked.
+-- @param typetbl table: The type-checking table, containing
+-- values for recognized fields in the checked table.
+-- @param context string: A string indicating the "context" where the
+-- error occurred (such as the name of the table the item is a part of),
+-- to be used by error messages.
+-- @return boolean or (nil, string): true if type checking
+-- succeeded, or nil and an error message if it failed.
+function type_check.type_check_table(version, tbl, typetbl, context)
+   assert(type(version) == "string")
+   assert(type(tbl) == "table")
+   assert(type(typetbl) == "table")
+   
+   local ok, err = check_version(version, typetbl, context)
+   if not ok then
+      return nil, err
+   end
+   
+   for k, v in pairs(tbl) do
+      local t = typetbl[k] or typetbl._any
+      if t then 
+         local ok, err = type_check_item(version, v, t, mkfield(context, k))
+         if not ok then return nil, err end
+      elseif typetbl._more then
+         -- Accept unknown field
+      else
+         if not cfg.accept_unknown_fields then
+            return nil, "Unknown field "..k
+         end
+      end
+   end
+   for k, v in pairs(typetbl) do
+      if k:sub(1,1) ~= "_" and v._mandatory then
+         if not tbl[k] then
+            return nil, "Mandatory field "..mkfield(context, k).." is missing."
+         end
+      end
+   end
+   return true
+end
+
+function type_check.check_undeclared_globals(globals, typetbl)
+   local undeclared = {}
+   for glob, _ in pairs(globals) do
+      if not (typetbl[glob] or typetbl["MUST_"..glob]) then
+         table.insert(undeclared, glob)
+      end
+   end
+   if #undeclared == 1 then
+      return nil, "Unknown variable: "..undeclared[1]
+   elseif #undeclared > 1 then
+      return nil, "Unknown variables: "..table.concat(undeclared, ", ")
+   end
+   return true
+end
+
+--- Type check a manifest table.
+-- Verify the correctness of elements from a 
+-- manifest table, reporting on unknown fields and type
+-- mismatches.
+-- @return boolean or (nil, string): true if type checking
+-- succeeded, or nil and an error message if it failed.
+function type_check.type_check_manifest(manifest, globals)
+   assert(type(manifest) == "table")
+   local ok, err = type_check.check_undeclared_globals(globals, manifest_types)
+   if not ok then return nil, err end
+   return type_check.type_check_table("1.0", manifest, manifest_types, "")
+end
+
+return type_check
+
diff --git a/src/luarocks/core/util.lua b/src/luarocks/core/util.lua
new file mode 100644
index 00000000..85b59af6
--- /dev/null
+++ b/src/luarocks/core/util.lua
@@ -0,0 +1,272 @@
+
+local util = {}
+
+local require = nil
+--------------------------------------------------------------------------------
+
+--- Run a process and read a its output.
+-- Equivalent to io.popen(cmd):read("*l"), except that it 
+-- closes the fd right away.
+-- @param cmd string: The command to execute
+-- @param spec string: "*l" by default, to read a single line.
+-- May be used to read more, passing, for instance, "*a".
+-- @return string: the output of the program.
+function util.popen_read(cmd, spec)
+   local fd = io.popen(cmd)
+   local out = fd:read(spec or "*l")
+   fd:close()
+   return out
+end
+
+--- Create a new shallow copy of a table: a new table with
+-- the same keys and values. Keys point to the same objects as
+-- the original table (ie, does not copy recursively).
+-- @param tbl table: the input table
+-- @return table: a new table with the same contents.
+function util.make_shallow_copy(tbl)
+   local copy = {}
+   for k,v in pairs(tbl) do
+      copy[k] = v
+   end
+   return copy
+end
+
+---
+-- Formats tables with cycles recursively to any depth.
+-- References to other tables are shown as values.
+-- Self references are indicated.
+-- The string returned is "Lua code", which can be procesed
+-- (in the case in which indent is composed by spaces or "--").
+-- Userdata and function keys and values are shown as strings,
+-- which logically are exactly not equivalent to the original code.
+-- This routine can serve for pretty formating tables with
+-- proper indentations, apart from printing them:
+-- io.write(table.show(t, "t"))   -- a typical use
+-- Written by Julio Manuel Fernandez-Diaz,
+-- Heavily based on "Saving tables with cycles", PIL2, p. 113.
+-- @param t table: is the table.
+-- @param name string: is the name of the table (optional)
+-- @param indent string: is a first indentation (optional).
+-- @return string: the pretty-printed table
+function util.show_table(t, name, indent)
+   local cart     -- a container
+   local autoref  -- for self references
+
+   local function is_empty_table(t) return next(t) == nil end
+   
+   local function basic_serialize (o)
+      local so = tostring(o)
+      if type(o) == "function" then
+         local info = debug.getinfo(o, "S")
+         -- info.name is nil because o is not a calling level
+         if info.what == "C" then
+            return ("%q"):format(so .. ", C function")
+         else 
+            -- the information is defined through lines
+            return ("%q"):format(so .. ", defined in (" .. info.linedefined .. "-" .. info.lastlinedefined .. ")" .. info.source)
+         end
+      elseif type(o) == "number" then
+         return so
+      else
+         return ("%q"):format(so)
+      end
+   end
+   
+   local function add_to_cart (value, name, indent, saved, field)
+      indent = indent or ""
+      saved = saved or {}
+      field = field or name
+      
+      cart = cart .. indent .. field
+      
+      if type(value) ~= "table" then
+         cart = cart .. " = " .. basic_serialize(value) .. ";\n"
+      else
+         if saved[value] then
+            cart = cart .. " = {}; -- " .. saved[value] .. " (self reference)\n"
+            autoref = autoref ..  name .. " = " .. saved[value] .. ";\n"
+         else
+            saved[value] = name
+            --if tablecount(value) == 0 then
+            if is_empty_table(value) then
+               cart = cart .. " = {};\n"
+            else
+               cart = cart .. " = {\n"
+               for k, v in pairs(value) do
+                  k = basic_serialize(k)
+                  local fname = ("%s[%s]"):format(name, k)
+                  field = ("[%s]"):format(k)
+                  -- three spaces between levels
+                  add_to_cart(v, fname, indent .. "   ", saved, field)
+               end
+               cart = cart .. indent .. "};\n"
+            end
+         end
+      end
+   end
+   
+   name = name or "__unnamed__"
+   if type(t) ~= "table" then
+      return name .. " = " .. basic_serialize(t)
+   end
+   cart, autoref = "", ""
+   add_to_cart(t, name, indent)
+   return cart .. autoref
+end
+
+--- Merges contents of src on top of dst's contents.
+-- @param dst Destination table, which will receive src's contents.
+-- @param src Table which provides new contents to dst.
+-- @see platform_overrides
+function util.deep_merge(dst, src)
+   for k, v in pairs(src) do
+      if type(v) == "table" then
+         if not dst[k] then
+            dst[k] = {}
+         end
+         if type(dst[k]) == "table" then
+            util.deep_merge(dst[k], v)
+         else
+            dst[k] = v
+         end
+      else
+         dst[k] = v
+      end
+   end
+end
+
+--- Remove repeated entries from a path-style string.
+-- Example: given ("a;b;c;a;b;d", ";"), returns "a;b;c;d".
+-- @param list string: A path string (from $PATH or package.path)
+-- @param sep string: The separator
+function util.remove_path_dupes(list, sep)
+   assert(type(list) == "string")
+   assert(type(sep) == "string")
+   local parts = util.split_string(list, sep)
+   local final, entries = {}, {}
+   for _, part in ipairs(parts) do
+      part = part:gsub("//", "/")
+      if not entries[part] then
+         table.insert(final, part)
+         entries[part] = true
+      end
+   end
+   return table.concat(final, sep)
+end
+
+-- from http://lua-users.org/wiki/SplitJoin
+-- by Philippe Lhoste
+function util.split_string(str, delim, maxNb)
+   -- Eliminate bad cases...
+   if string.find(str, delim) == nil then
+      return { str }
+   end
+   if maxNb == nil or maxNb < 1 then
+      maxNb = 0    -- No limit
+   end
+   local result = {}
+   local pat = "(.-)" .. delim .. "()"
+   local nb = 0
+   local lastPos
+   for part, pos in string.gmatch(str, pat) do
+      nb = nb + 1
+      result[nb] = part
+      lastPos = pos
+      if nb == maxNb then break end
+   end
+   -- Handle the last field
+   if nb ~= maxNb then
+      result[nb + 1] = string.sub(str, lastPos)
+   end
+   return result
+end
+
+--- Return an array of keys of a table.
+-- @param tbl table: The input table.
+-- @return table: The array of keys.
+function util.keys(tbl)
+   local ks = {}
+   for k,_ in pairs(tbl) do
+      table.insert(ks, k)
+   end
+   return ks
+end
+
+--- Print a line to standard error
+function util.printerr(...)
+   io.stderr:write(table.concat({...},"\t"))
+   io.stderr:write("\n")
+end
+
+--- Simple sort function used as a default for util.sortedpairs.
+local function default_sort(a, b)
+   local ta = type(a)
+   local tb = type(b)
+   if ta == "number" and tb == "number" then
+      return a < b
+   elseif ta == "number" then
+      return true
+   elseif tb == "number" then
+      return false
+   else
+      return tostring(a) < tostring(b)
+   end
+end
+
+--- A table iterator generator that returns elements sorted by key,
+-- to be used in "for" loops.
+-- @param tbl table: The table to be iterated.
+-- @param sort_function function or table or nil: An optional comparison function
+-- to be used by table.sort when sorting keys, or an array listing an explicit order
+-- for keys. If a value itself is an array, it is taken so that the first element
+-- is a string representing the field name, and the second element is a priority table
+-- for that key, which is returned by the iterator as the third value after the key
+-- and the value.
+-- @return function: the iterator function.
+function util.sortedpairs(tbl, sort_function)
+   sort_function = sort_function or default_sort
+   local keys = util.keys(tbl)
+   local sub_orders = {}
+
+   if type(sort_function) == "function" then
+      table.sort(keys, sort_function)
+   else
+      local order = sort_function
+      local ordered_keys = {}
+      local all_keys = keys
+      keys = {}
+
+      for _, order_entry in ipairs(order) do
+         local key, sub_order
+         if type(order_entry) == "table" then
+            key = order_entry[1]
+            sub_order = order_entry[2]
+         else
+            key = order_entry
+         end
+
+         if tbl[key] then
+            ordered_keys[key] = true
+            sub_orders[key] = sub_order
+            table.insert(keys, key)
+         end
+      end
+
+      table.sort(all_keys, default_sort)
+      for _, key in ipairs(all_keys) do
+         if not ordered_keys[key] then
+            table.insert(keys, key)
+         end
+      end
+   end
+
+   local i = 1
+   return function()
+      local key = keys[i]
+      i = i + 1
+      return key, tbl[key], sub_orders[key]
+   end
+end
+
+return util
+
diff --git a/src/luarocks/core/vers.lua b/src/luarocks/core/vers.lua
new file mode 100644
index 00000000..2a765b9b
--- /dev/null
+++ b/src/luarocks/core/vers.lua
@@ -0,0 +1,191 @@
+
+local vers = {}
+
+local util = require("luarocks.core.util")
+local require = nil
+--------------------------------------------------------------------------------
+
+local deltas = {
+   scm =    1100,
+   cvs =    1000,
+   rc =    -1000,
+   pre =   -10000,
+   beta =  -100000,
+   alpha = -1000000
+}
+
+local version_mt = {
+   --- Equality comparison for versions.
+   -- All version numbers must be equal.
+   -- If both versions have revision numbers, they must be equal;
+   -- otherwise the revision number is ignored.
+   -- @param v1 table: version table to compare.
+   -- @param v2 table: version table to compare.
+   -- @return boolean: true if they are considered equivalent.
+   __eq = function(v1, v2)
+      if #v1 ~= #v2 then
+         return false
+      end
+      for i = 1, #v1 do
+         if v1[i] ~= v2[i] then
+            return false
+         end
+      end
+      if v1.revision and v2.revision then
+         return (v1.revision == v2.revision)
+      end
+      return true
+   end,
+   --- Size comparison for versions.
+   -- All version numbers are compared.
+   -- If both versions have revision numbers, they are compared;
+   -- otherwise the revision number is ignored.
+   -- @param v1 table: version table to compare.
+   -- @param v2 table: version table to compare.
+   -- @return boolean: true if v1 is considered lower than v2.
+   __lt = function(v1, v2)
+      for i = 1, math.max(#v1, #v2) do
+         local v1i, v2i = v1[i] or 0, v2[i] or 0
+         if v1i ~= v2i then
+            return (v1i < v2i)
+         end
+      end
+      if v1.revision and v2.revision then
+         return (v1.revision < v2.revision)
+      end
+      return false
+   end
+}
+
+local version_cache = {}
+setmetatable(version_cache, {
+   __mode = "kv"
+})
+
+--- Parse a version string, converting to table format.
+-- A version table contains all components of the version string
+-- converted to numeric format, stored in the array part of the table.
+-- If the version contains a revision, it is stored numerically
+-- in the 'revision' field. The original string representation of
+-- the string is preserved in the 'string' field.
+-- Returned version tables use a metatable
+-- allowing later comparison through relational operators.
+-- @param vstring string: A version number in string format.
+-- @return table or nil: A version table or nil
+-- if the input string contains invalid characters.
+function vers.parse_version(vstring)
+   if not vstring then return nil end
+   assert(type(vstring) == "string")
+
+   local cached = version_cache[vstring]
+   if cached then
+      return cached
+   end
+
+   local version = {}
+   local i = 1
+
+   local function add_token(number)
+      version[i] = version[i] and version[i] + number/100000 or number
+      i = i + 1
+   end
+   
+   -- trim leading and trailing spaces
+   vstring = vstring:match("^%s*(.*)%s*$")
+   version.string = vstring
+   -- store revision separately if any
+   local main, revision = vstring:match("(.*)%-(%d+)$")
+   if revision then
+      vstring = main
+      version.revision = tonumber(revision)
+   end
+   while #vstring > 0 do
+      -- extract a number
+      local token, rest = vstring:match("^(%d+)[%.%-%_]*(.*)")
+      if token then
+         add_token(tonumber(token))
+      else
+         -- extract a word
+         token, rest = vstring:match("^(%a+)[%.%-%_]*(.*)")
+         if not token then
+            util.printerr("Warning: version number '"..vstring.."' could not be parsed.")
+            version[i] = 0
+            break
+         end
+         version[i] = deltas[token] or (token:byte() / 1000)
+      end
+      vstring = rest
+   end
+   setmetatable(version, version_mt)
+   version_cache[vstring] = version
+   return version
+end
+
+--- Utility function to compare version numbers given as strings.
+-- @param a string: one version.
+-- @param b string: another version.
+-- @return boolean: True if a > b.
+function vers.compare_versions(a, b)
+   return vers.parse_version(a) > vers.parse_version(b)
+end
+
+--- A more lenient check for equivalence between versions.
+-- This returns true if the requested components of a version
+-- match and ignore the ones that were not given. For example,
+-- when requesting "2", then "2", "2.1", "2.3.5-9"... all match.
+-- When requesting "2.1", then "2.1", "2.1.3" match, but "2.2"
+-- doesn't.
+-- @param version string or table: Version to be tested; may be
+-- in string format or already parsed into a table.
+-- @param requested string or table: Version requested; may be
+-- in string format or already parsed into a table.
+-- @return boolean: True if the tested version matches the requested
+-- version, false otherwise.
+local function partial_match(version, requested)
+   assert(type(version) == "string" or type(version) == "table")
+   assert(type(requested) == "string" or type(version) == "table")
+
+   if type(version) ~= "table" then version = vers.parse_version(version) end
+   if type(requested) ~= "table" then requested = vers.parse_version(requested) end
+   if not version or not requested then return false end
+   
+   for i, ri in ipairs(requested) do
+      local vi = version[i] or 0
+      if ri ~= vi then return false end
+   end
+   if requested.revision then
+      return requested.revision == version.revision
+   end
+   return true
+end
+
+--- Check if a version satisfies a set of constraints.
+-- @param version table: A version in table format
+-- @param constraints table: An array of constraints in table format.
+-- @return boolean: True if version satisfies all constraints,
+-- false otherwise.
+function vers.match_constraints(version, constraints)
+   assert(type(version) == "table")
+   assert(type(constraints) == "table")
+   local ok = true
+   setmetatable(version, version_mt)
+   for _, constr in pairs(constraints) do
+      if type(constr.version) == "string" then
+         constr.version = vers.parse_version(constr.version)
+      end
+      local constr_version, constr_op = constr.version, constr.op
+      setmetatable(constr_version, version_mt)
+      if     constr_op == "==" then ok = version == constr_version
+      elseif constr_op == "~=" then ok = version ~= constr_version
+      elseif constr_op == ">"  then ok = version >  constr_version
+      elseif constr_op == "<"  then ok = version <  constr_version
+      elseif constr_op == ">=" then ok = version >= constr_version
+      elseif constr_op == "<=" then ok = version <= constr_version
+      elseif constr_op == "~>" then ok = partial_match(version, constr_version)
+      end
+      if not ok then break end
+   end
+   return ok
+end
+
+return vers
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index dcebec9b..015e2527 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -1,344 +1,40 @@
 
---- Dependency handling functions.
--- Dependencies are represented in LuaRocks through strings with
--- a package name followed by a comma-separated list of constraints.
--- Each constraint consists of an operator and a version number.
--- In this string format, version numbers are represented as
--- naturally as possible, like they are used by upstream projects
--- (e.g. "2.0beta3"). Internally, LuaRocks converts them to a purely
--- numeric representation, allowing comparison following some
--- "common sense" heuristics. The precise specification of the
--- comparison criteria is the source code of this module, but the
--- test/test_deps.lua file included with LuaRocks provides some
--- insights on what these criteria are.
+--- High-level dependency related functions.
 local deps = {}
-package.loaded["luarocks.deps"] = deps
 
-local cfg = require("luarocks.cfg")
-local manif_core = require("luarocks.manif_core")
+local cfg = require("luarocks.core.cfg")
+local manif = require("luarocks.manif")
 local path = require("luarocks.path")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
-
-local operators = {
-   ["=="] = "==",
-   ["~="] = "~=",
-   [">"] = ">",
-   ["<"] = "<",
-   [">="] = ">=",
-   ["<="] = "<=",
-   ["~>"] = "~>",
-   -- plus some convenience translations
-   [""] = "==",
-   ["="] = "==",
-   ["!="] = "~="
-}
-
-local deltas = {
-   scm =    1100,
-   cvs =    1000,
-   rc =    -1000,
-   pre =   -10000,
-   beta =  -100000,
-   alpha = -1000000
-}
-
-local version_mt = {
-   --- Equality comparison for versions.
-   -- All version numbers must be equal.
-   -- If both versions have revision numbers, they must be equal;
-   -- otherwise the revision number is ignored.
-   -- @param v1 table: version table to compare.
-   -- @param v2 table: version table to compare.
-   -- @return boolean: true if they are considered equivalent.
-   __eq = function(v1, v2)
-      if #v1 ~= #v2 then
-         return false
-      end
-      for i = 1, #v1 do
-         if v1[i] ~= v2[i] then
-            return false
-         end
-      end
-      if v1.revision and v2.revision then
-         return (v1.revision == v2.revision)
-      end
-      return true
-   end,
-   --- Size comparison for versions.
-   -- All version numbers are compared.
-   -- If both versions have revision numbers, they are compared;
-   -- otherwise the revision number is ignored.
-   -- @param v1 table: version table to compare.
-   -- @param v2 table: version table to compare.
-   -- @return boolean: true if v1 is considered lower than v2.
-   __lt = function(v1, v2)
-      for i = 1, math.max(#v1, #v2) do
-         local v1i, v2i = v1[i] or 0, v2[i] or 0
-         if v1i ~= v2i then
-            return (v1i < v2i)
-         end
-      end
-      if v1.revision and v2.revision then
-         return (v1.revision < v2.revision)
-      end
-      return false
-   end
-}
-
-local version_cache = {}
-setmetatable(version_cache, {
-   __mode = "kv"
-})
-
---- Parse a version string, converting to table format.
--- A version table contains all components of the version string
--- converted to numeric format, stored in the array part of the table.
--- If the version contains a revision, it is stored numerically
--- in the 'revision' field. The original string representation of
--- the string is preserved in the 'string' field.
--- Returned version tables use a metatable
--- allowing later comparison through relational operators.
--- @param vstring string: A version number in string format.
--- @return table or nil: A version table or nil
--- if the input string contains invalid characters.
-function deps.parse_version(vstring)
-   if not vstring then return nil end
-   assert(type(vstring) == "string")
-
-   local cached = version_cache[vstring]
-   if cached then
-      return cached
-   end
-
-   local version = {}
-   local i = 1
-
-   local function add_token(number)
-      version[i] = version[i] and version[i] + number/100000 or number
-      i = i + 1
-   end
-   
-   -- trim leading and trailing spaces
-   vstring = vstring:match("^%s*(.*)%s*$")
-   version.string = vstring
-   -- store revision separately if any
-   local main, revision = vstring:match("(.*)%-(%d+)$")
-   if revision then
-      vstring = main
-      version.revision = tonumber(revision)
-   end
-   while #vstring > 0 do
-      -- extract a number
-      local token, rest = vstring:match("^(%d+)[%.%-%_]*(.*)")
-      if token then
-         add_token(tonumber(token))
-      else
-         -- extract a word
-         token, rest = vstring:match("^(%a+)[%.%-%_]*(.*)")
-         if not token then
-            util.printerr("Warning: version number '"..vstring.."' could not be parsed.")
-            version[i] = 0
-            break
-         end
-         version[i] = deltas[token] or (token:byte() / 1000)
-      end
-      vstring = rest
-   end
-   setmetatable(version, version_mt)
-   version_cache[vstring] = version
-   return version
-end
-
---- Utility function to compare version numbers given as strings.
--- @param a string: one version.
--- @param b string: another version.
--- @return boolean: True if a > b.
-function deps.compare_versions(a, b)
-   return deps.parse_version(a) > deps.parse_version(b)
-end
-
---- Consumes a constraint from a string, converting it to table format.
--- For example, a string ">= 1.0, > 2.0" is converted to a table in the
--- format {op = ">=", version={1,0}} and the rest, "> 2.0", is returned
--- back to the caller.
--- @param input string: A list of constraints in string format.
--- @return (table, string) or nil: A table representing the same
--- constraints and the string with the unused input, or nil if the
--- input string is invalid.
-local function parse_constraint(input)
-   assert(type(input) == "string")
-
-   local no_upgrade, op, version, rest = input:match("^(@?)([<>=~!]*)%s*([%w%.%_%-]+)[%s,]*(.*)")
-   local _op = operators[op]
-   version = deps.parse_version(version)
-   if not _op then
-      return nil, "Encountered bad constraint operator: '"..tostring(op).."' in '"..input.."'"
-   end
-   if not version then 
-      return nil, "Could not parse version from constraint: '"..input.."'"
-   end
-   return { op = _op, version = version, no_upgrade = no_upgrade=="@" and true or nil }, rest
-end
-
---- Convert a list of constraints from string to table format.
--- For example, a string ">= 1.0, < 2.0" is converted to a table in the format
--- {{op = ">=", version={1,0}}, {op = "<", version={2,0}}}.
--- Version tables use a metatable allowing later comparison through
--- relational operators.
--- @param input string: A list of constraints in string format.
--- @return table or nil: A table representing the same constraints,
--- or nil if the input string is invalid.
-function deps.parse_constraints(input)
-   assert(type(input) == "string")
-
-   local constraints, constraint, oinput = {}, nil, input
-   while #input > 0 do
-      constraint, input = parse_constraint(input)
-      if constraint then
-         table.insert(constraints, constraint)
-      else
-         return nil, "Failed to parse constraint '"..tostring(oinput).."' with error: ".. input
-      end
-   end
-   return constraints
-end
-
---- Convert a dependency from string to table format.
--- For example, a string "foo >= 1.0, < 2.0"
--- is converted to a table in the format
--- {name = "foo", constraints = {{op = ">=", version={1,0}},
--- {op = "<", version={2,0}}}}. Version tables use a metatable
--- allowing later comparison through relational operators.
--- @param dep string: A dependency in string format
--- as entered in rockspec files.
--- @return table or nil: A table representing the same dependency relation,
--- or nil if the input string is invalid.
-function deps.parse_dep(dep)
-   assert(type(dep) == "string")
-
-   local name, rest = dep:match("^%s*([a-zA-Z0-9][a-zA-Z0-9%.%-%_]*)%s*(.*)")
-   if not name then return nil, "failed to extract dependency name from '"..tostring(dep).."'" end
-   local constraints, err = deps.parse_constraints(rest)
-   if not constraints then return nil, err end
-   return { name = name, constraints = constraints }
-end
-
---- Convert a version table to a string.
--- @param v table: The version table
--- @param internal boolean or nil: Whether to display versions in their
--- internal representation format or how they were specified.
--- @return string: The dependency information pretty-printed as a string.
-function deps.show_version(v, internal)
-   assert(type(v) == "table")
-   assert(type(internal) == "boolean" or not internal)
-
-   return (internal
-           and table.concat(v, ":")..(v.revision and tostring(v.revision) or "")
-           or v.string)
-end
-
---- Convert a dependency in table format to a string.
--- @param dep table: The dependency in table format
--- @param internal boolean or nil: Whether to display versions in their
--- internal representation format or how they were specified.
--- @return string: The dependency information pretty-printed as a string.
-function deps.show_dep(dep, internal)
-   assert(type(dep) == "table")
-   assert(type(internal) == "boolean" or not internal)
-
-   if #dep.constraints > 0 then
-      local pretty = {}
-      for _, c in ipairs(dep.constraints) do
-         table.insert(pretty, c.op .. " " .. deps.show_version(c.version, internal))
-      end
-      return dep.name.." "..table.concat(pretty, ", ")
-   else
-      return dep.name
-   end
-end
-
---- A more lenient check for equivalence between versions.
--- This returns true if the requested components of a version
--- match and ignore the ones that were not given. For example,
--- when requesting "2", then "2", "2.1", "2.3.5-9"... all match.
--- When requesting "2.1", then "2.1", "2.1.3" match, but "2.2"
--- doesn't.
--- @param version string or table: Version to be tested; may be
--- in string format or already parsed into a table.
--- @param requested string or table: Version requested; may be
--- in string format or already parsed into a table.
--- @return boolean: True if the tested version matches the requested
--- version, false otherwise.
-local function partial_match(version, requested)
-   assert(type(version) == "string" or type(version) == "table")
-   assert(type(requested) == "string" or type(version) == "table")
-
-   if type(version) ~= "table" then version = deps.parse_version(version) end
-   if type(requested) ~= "table" then requested = deps.parse_version(requested) end
-   if not version or not requested then return false end
-   
-   for i, ri in ipairs(requested) do
-      local vi = version[i] or 0
-      if ri ~= vi then return false end
-   end
-   if requested.revision then
-      return requested.revision == version.revision
-   end
-   return true
-end
-
---- Check if a version satisfies a set of constraints.
--- @param version table: A version in table format
--- @param constraints table: An array of constraints in table format.
--- @return boolean: True if version satisfies all constraints,
--- false otherwise.
-function deps.match_constraints(version, constraints)
-   assert(type(version) == "table")
-   assert(type(constraints) == "table")
-   local ok = true
-   setmetatable(version, version_mt)
-   for _, constr in pairs(constraints) do
-      if type(constr.version) == "string" then
-         constr.version = deps.parse_version(constr.version)
-      end
-      local constr_version, constr_op = constr.version, constr.op
-      setmetatable(constr_version, version_mt)
-      if     constr_op == "==" then ok = version == constr_version
-      elseif constr_op == "~=" then ok = version ~= constr_version
-      elseif constr_op == ">"  then ok = version >  constr_version
-      elseif constr_op == "<"  then ok = version <  constr_version
-      elseif constr_op == ">=" then ok = version >= constr_version
-      elseif constr_op == "<=" then ok = version <= constr_version
-      elseif constr_op == "~>" then ok = partial_match(version, constr_version)
-      end
-      if not ok then break end
-   end
-   return ok
-end
+local vers = require("luarocks.vers")
 
 --- Attempt to match a dependency to an installed rock.
 -- @param dep table: A dependency parsed in table format.
 -- @param blacklist table: Versions that can't be accepted. Table where keys
 -- are program versions and values are 'true'.
+-- @param rocks_provided table: A table of auto-dependencies provided 
+-- by this Lua implementation for the given dependency.
 -- @return string or nil: latest installed version of the rock matching the dependency
 -- or nil if it could not be matched.
-local function match_dep(dep, blacklist, deps_mode)
+local function match_dep(dep, blacklist, deps_mode, rocks_provided)
    assert(type(dep) == "table")
-
+   assert(type(rocks_provided) == "table")
+  
    local versions
-   if cfg.rocks_provided[dep.name] then
-      -- provided rocks have higher priority than manifest's rocks
-      versions = { cfg.rocks_provided[dep.name] }
+   local provided = rocks_provided[dep.name]
+   if provided then
+      -- Provided rocks have higher priority than manifest's rocks.
+      versions = { provided }
    else
-      versions = manif_core.get_versions(dep.name, deps_mode)
+      versions = manif.get_versions(dep.name, deps_mode)
    end
 
    local latest_version
    for _, vstring in ipairs(versions) do
       if not blacklist or not blacklist[vstring] then
-         local version = deps.parse_version(vstring)
-         if deps.match_constraints(version, dep.constraints) then
+         local version = vers.parse_version(vstring)
+         if vers.match_constraints(version, dep.constraints) then
             if not latest_version or version > latest_version then
                latest_version = version
             end
@@ -366,9 +62,9 @@ function deps.match_deps(rockspec, blacklist, deps_mode)
    local matched, missing, no_upgrade = {}, {}, {}
    
    for _, dep in ipairs(rockspec.dependencies) do
-      local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode)
+      local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode, rockspec.rocks_provided)
       if found then
-         if not cfg.rocks_provided[dep.name] then
+         if not rockspec.rocks_provided[dep.name] then
             matched[dep] = {name = dep.name, version = found}
          end
       else
@@ -393,10 +89,10 @@ local function values_set(tbl)
    return set
 end
 
-local function rock_status(name, deps_mode)
+local function rock_status(name, deps_mode, rocks_provided)
    local search = require("luarocks.search")
-   local installed = match_dep(search.make_query(name), nil, deps_mode)
-   local installation_type = cfg.rocks_provided[name] and "provided by VM" or "installed"
+   local installed = match_dep(search.make_query(name), nil, deps_mode, rocks_provided)
+   local installation_type = rocks_provided[name] and "provided by VM" or "installed"
    return installed and installed.." "..installation_type or "not installed"
 end
 
@@ -405,19 +101,21 @@ end
 -- @param version string: package version.
 -- @param dependencies table: array of dependencies.
 -- @param deps_mode string: Which trees to check dependencies for:
+-- @param rocks_provided table: A table of auto-dependencies provided 
+-- by this Lua implementation for the given dependency.
 -- "one" for the current default tree, "all" for all trees,
 -- "order" for all trees with priority >= the current default, "none" for no trees.
-function deps.report_missing_dependencies(name, version, dependencies, deps_mode)
+function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided)
    local first_missing_dep = true
 
    for _, dep in ipairs(dependencies) do
-      if not match_dep(dep, nil, deps_mode) then
+      if not match_dep(dep, nil, deps_mode, rocks_provided) then
          if first_missing_dep then
             util.printout(("Missing dependencies for %s %s:"):format(name, version))
             first_missing_dep = false
          end
 
-         util.printout(("   %s (%s)"):format(deps.show_dep(dep), rock_status(dep.name, deps_mode)))
+         util.printout(("   %s (%s)"):format(vers.show_dep(dep), rock_status(dep.name, deps_mode, rocks_provided)))
       end
    end
 end
@@ -432,7 +130,7 @@ end
 function deps.fulfill_dependencies(rockspec, deps_mode)
 
    local search = require("luarocks.search")
-   local install = require("luarocks.install")
+   local install = require("luarocks.cmd.install")
 
    if rockspec.supported_platforms then
       if not deps.platforms_set then
@@ -440,7 +138,8 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
       end
       local supported = nil
       for _, plat in pairs(rockspec.supported_platforms) do
-         local neg, plat = plat:match("^(!?)(.*)")
+         local neg
+         neg, plat = plat:match("^(!?)(.*)")
          if neg == "!" then
             if deps.platforms_set[plat] then
                return nil, "This rockspec for "..rockspec.package.." does not support "..plat.." platforms."
@@ -461,23 +160,23 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
       end
    end
 
-   deps.report_missing_dependencies(rockspec.name, rockspec.version, rockspec.dependencies, deps_mode)
+   deps.report_missing_dependencies(rockspec.name, rockspec.version, rockspec.dependencies, deps_mode, rockspec.rocks_provided)
 
    local first_missing_dep = true
 
    for _, dep in ipairs(rockspec.dependencies) do
-      if not match_dep(dep, nil, deps_mode) then
+      if not match_dep(dep, nil, deps_mode, rockspec.rocks_provided) then
          if first_missing_dep then
             util.printout()
             first_missing_dep = false
          end
 
          util.printout(("%s %s depends on %s (%s)"):format(
-            rockspec.name, rockspec.version, deps.show_dep(dep), rock_status(dep.name, deps_mode)))
+            rockspec.name, rockspec.version, vers.show_dep(dep), rock_status(dep.name, deps_mode, rockspec.rocks_provided)))
 
          if dep.constraints[1] and dep.constraints[1].no_upgrade then
             util.printerr("This version of "..rockspec.name.." is designed for use with")
-            util.printerr(deps.show_dep(dep)..", but is configured to avoid upgrading it")
+            util.printerr(vers.show_dep(dep)..", but is configured to avoid upgrading it")
             util.printerr("automatically. Please upgrade "..dep.name.." with")
             util.printerr("   luarocks install "..dep.name)
             util.printerr("or choose an older version of "..rockspec.name.." with")
@@ -487,7 +186,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
 
          local url, search_err = search.find_suitable_rock(dep)
          if not url then
-            return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..search_err
+            return nil, "Could not satisfy dependency "..vers.show_dep(dep)..": "..search_err
          end
          util.printout("Installing "..url)
          local ok, install_err, errcode = install.command({deps_mode = deps_mode}, url)
@@ -717,7 +416,10 @@ function deps.scan_deps(results, manifest, name, version, deps_mode)
       end
       dependencies_name[version] = rockspec.dependencies
    else
-      rockspec = { dependencies = deplist }
+      rockspec = {
+         dependencies = deplist,
+         rocks_provided = setmetatable({}, { __index = cfg.rocks_provided_3_0 })
+      }
    end
    local matched = deps.match_deps(rockspec, nil, deps_mode)
    results[name] = version
@@ -745,8 +447,4 @@ function deps.get_deps_mode(flags)
    end
 end
 
-function deps.deps_mode_to_flag(deps_mode)
-   return "--deps-mode="..deps_mode
-end
-
 return deps
diff --git a/src/luarocks/dir.lua b/src/luarocks/dir.lua
index f72ebd6c..71477804 100644
--- a/src/luarocks/dir.lua
+++ b/src/luarocks/dir.lua
@@ -1,9 +1,7 @@
 
 --- Generic utilities for handling pathnames.
 local dir = {}
-package.loaded["luarocks.dir"] = dir
-
-dir.separator = "/"
+setmetatable(dir, { __index = require("luarocks.core.dir") })
 
 --- Strip the path off a path+filename.
 -- @param pathname string: A path+name, such as "/a/b/c"
@@ -26,39 +24,6 @@ function dir.dir_name(pathname)
    return (pathname:gsub("/*$", ""):match("(.*)[/]+[^/]*")) or ""
 end
 
---- Describe a path in a cross-platform way.
--- Use this function to avoid platform-specific directory
--- separators in other modules. Removes trailing slashes from
--- each component given, to avoid repeated separators.
--- Separators inside strings are kept, to handle URLs containing
--- protocols.
--- @param ... strings representing directories
--- @return string: a string with a platform-specific representation
--- of the path.
-function dir.path(...)
-   local t = {...}
-   while t[1] == "" do
-      table.remove(t, 1)
-   end
-   return (table.concat(t, "/"):gsub("([^:])/+", "%1/"):gsub("^/+", "/"):gsub("/*$", ""))
-end
-
---- Split protocol and path from an URL or local pathname.
--- URLs should be in the "protocol://path" format.
--- For local pathnames, "file" is returned as the protocol.
--- @param url string: an URL or a local pathname.
--- @return string, string: the protocol, and the pathname without the protocol.
-function dir.split_url(url)
-   assert(type(url) == "string")
-   
-   local protocol, pathname = url:match("^([^:]*)://(.*)")
-   if not protocol then
-      protocol = "file"
-      pathname = url
-   end
-   return protocol, pathname
-end
-
 --- Normalize a url or local path.
 -- URLs should be in the "protocol://path" format. System independent
 -- forward slashes are used, removing trailing and double slashes
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index e434cdbb..ec9996b2 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -1,27 +1,11 @@
-
---- Module implementing the luarocks "download" command.
--- Download a rock from the repository.
 local download = {}
-package.loaded["luarocks.download"] = download
 
-local util = require("luarocks.util")
 local path = require("luarocks.path")
 local fetch = require("luarocks.fetch")
 local search = require("luarocks.search")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
-local cfg = require("luarocks.cfg")
-
-util.add_run_function(download)
-download.help_summary = "Download a specific rock file from a rocks server."
-download.help_arguments = "[--all] [--arch=<arch> | --source | --rockspec] [<name> [<version>]]"
-
-download.help = [[
---all          Download all files if there are multiple matches.
---source       Download .src.rock if available.
---rockspec     Download .rockspec if available.
---arch=<arch>  Download rock for a specific architecture.
-]]
+local cfg = require("luarocks.core.cfg")
 
 local function get_file(filename)
    local protocol, pathname = dir.split_url(filename)
@@ -79,31 +63,4 @@ function download.download(arch, name, version, all)
       (search_err and ": "..search_err or ".")
 end
 
---- Driver function for the "download" command.
--- @param name string: a rock name.
--- @param version string or nil: if the name of a package is given, a
--- version may also be passed.
--- @return boolean or (nil, string): true if successful or nil followed
--- by an error message.
-function download.command(flags, name, version)
-   assert(type(version) == "string" or not version)
-   if type(name) ~= "string" and not flags["all"] then
-      return nil, "Argument missing. "..util.see_help("download")
-   end
-   if not name then name, version = "", "" end
-
-   local arch
-
-   if flags["source"] then
-      arch = "src"
-   elseif flags["rockspec"] then
-      arch = "rockspec"
-   elseif flags["arch"] then
-      arch = flags["arch"]
-   end
-   
-   local dl, err = download.download(arch, name:lower(), version, flags["all"])
-   return dl and true, err
-end
-
 return download
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 76f366cd..2cad3df2 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -1,16 +1,15 @@
 
 --- Functions related to fetching and loading local and remote files.
 local fetch = {}
-package.loaded["luarocks.fetch"] = fetch
 
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local type_check = require("luarocks.type_check")
 local path = require("luarocks.path")
-local deps = require("luarocks.deps")
+local vers = require("luarocks.vers")
 local persist = require("luarocks.persist")
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 function fetch.is_basic_protocol(protocol, remote)
    return protocol == "http" or protocol == "https" or protocol == "ftp" or (not remote and protocol == "file")
@@ -198,7 +197,7 @@ function fetch.load_local_rockspec(filename, quick)
    local globals = err
 
    if rockspec.rockspec_format then
-      if deps.compare_versions(rockspec.rockspec_format, type_check.rockspec_format) then
+      if vers.compare_versions(rockspec.rockspec_format, type_check.rockspec_format) then
          return nil, "Rockspec format "..rockspec.rockspec_format.." is not supported, please upgrade LuaRocks."
       end
    end
@@ -209,6 +208,8 @@ function fetch.load_local_rockspec(filename, quick)
          return nil, filename..": "..err
       end
    end
+   
+   rockspec.format_is_at_least = vers.format_is_at_least
 
    util.platform_overrides(rockspec.build)
    util.platform_overrides(rockspec.dependencies)
@@ -244,13 +245,22 @@ function fetch.load_local_rockspec(filename, quick)
    rockspec.local_filename = filename
    local filebase = rockspec.source.file or rockspec.source.url
    local base = fetch.url_to_base_dir(filebase)
+   rockspec.source.dir_set = rockspec.source.dir ~= nil
    rockspec.source.dir = rockspec.source.dir
                       or rockspec.source.module
-                      or ((filebase:match("%.lua$") or filebase:match("%.c$")) and ".")
+                      or ( (filebase:match("%.lua$") or filebase:match("%.c$"))
+                           and (rockspec:format_is_at_least("3.0")
+                                and (fetch.is_basic_protocol(protocol) and "." or base)
+                                or  ".") )
                       or base
+
+   rockspec.rocks_provided = (rockspec:format_is_at_least("3.0")
+                              and cfg.rocks_provided_3_0
+                              or  cfg.rocks_provided)
+
    if rockspec.dependencies then
       for i = 1, #rockspec.dependencies do
-         local parsed, err = deps.parse_dep(rockspec.dependencies[i])
+         local parsed, err = vers.parse_dep(rockspec.dependencies[i])
          if not parsed then
             return nil, "Parse error processing dependency '"..rockspec.dependencies[i].."': "..tostring(err)
          end
@@ -347,7 +357,29 @@ function fetch.get_sources(rockspec, extract, dest_dir)
       ok, err = fs.unpack_archive(rockspec.source.file)
       if not ok then return nil, err end
       if not fs.exists(rockspec.source.dir) then
-         return nil, "Directory "..rockspec.source.dir.." not found inside archive "..rockspec.source.file, "source.dir", source_file, store_dir
+
+         -- If rockspec.source.dir can't be found, see if we only have one
+         -- directory in store_dir.  If that's the case, assume it's what
+         -- we're looking for.
+         -- We only do this if the rockspec source.dir was not set, and only
+         -- with rockspecs newer than 3.0.
+         local dir_count, found_dir = 0
+
+         if not rockspec.source.dir_set and rockspec:format_is_at_least("3.0") then
+            local files = fs.list_dir()
+            for _, f in ipairs(files) do
+               if fs.is_dir(f) then
+                  dir_count = dir_count + 1
+                  found_dir = f
+               end
+            end
+         end
+
+         if dir_count == 1 then
+            rockspec.source.dir = found_dir
+         else
+            return nil, "Directory "..rockspec.source.dir.." not found inside archive "..rockspec.source.file, "source.dir", source_file, store_dir
+         end
       end
       fs.pop_dir()
    end
diff --git a/src/luarocks/fetch/git.lua b/src/luarocks/fetch/git.lua
index f61d89e9..edc11762 100644
--- a/src/luarocks/fetch/git.lua
+++ b/src/luarocks/fetch/git.lua
@@ -6,20 +6,48 @@ local unpack = unpack or table.unpack
 
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
+local vers = require("luarocks.vers")
 local util = require("luarocks.util")
 
+local cached_git_version
+
+--- Get git version.
+-- @param git_cmd string: name of git command.
+-- @return table: git version as returned by luarocks.vers.parse_version.
+local function git_version(git_cmd)
+   if not cached_git_version then
+      local version_line = io.popen(fs.Q(git_cmd)..' --version'):read()
+      local version_string = version_line:match('%d-%.%d+%.?%d*')
+      cached_git_version = vers.parse_version(version_string)
+   end
+
+   return cached_git_version
+end
+
+--- Check if git satisfies version requirement.
+-- @param git_cmd string: name of git command.
+-- @param version string: required version.
+-- @return boolean: true if git matches version or is newer, false otherwise.
+local function git_is_at_least(git_cmd, version)
+   return git_version(git_cmd) >= vers.parse_version(version)
+end
+
 --- Git >= 1.7.10 can clone a branch **or tag**, < 1.7.10 by branch only. We
 -- need to know this in order to build the appropriate command; if we can't
 -- clone by tag then we'll have to issue a subsequent command to check out the
 -- given tag.
+-- @param git_cmd string: name of git command.
 -- @return boolean: Whether Git can clone by tag.
 local function git_can_clone_by_tag(git_cmd)
-   local version_string = io.popen(fs.Q(git_cmd)..' --version'):read()
-   local major, minor, tiny = version_string:match('(%d-)%.(%d+)%.?(%d*)')
-   major, minor, tiny = tonumber(major), tonumber(minor), tonumber(tiny) or 0
-   local value = major > 1 or (major == 1 and (minor > 7 or (minor == 7 and tiny >= 10)))
-   git_can_clone_by_tag = function() return value end
-   return value
+   return git_is_at_least(git_cmd, "1.7.10")
+end
+
+--- Git >= 1.8.4 can fetch submodules shallowly, saving bandwidth and time for
+-- submodules with large history.
+-- @param git_cmd string: name of git command.
+-- @return boolean: Whether Git can fetch submodules shallowly.
+local function git_supports_shallow_submodules(git_cmd)
+   return git_is_at_least(git_cmd, "1.8.4")
 end
 
 --- Download sources for building a rock, using git.
@@ -76,12 +104,25 @@ function git.get_sources(rockspec, extract, dest_dir, depth)
    ok, err = fs.change_dir(module)
    if not ok then return nil, err end
    if tag_or_branch and not git_can_clone_by_tag() then
-      local checkout_command = {fs.Q(git_cmd), "checkout", tag_or_branch}
-      if not fs.execute(unpack(checkout_command)) then
+      if not fs.execute(fs.Q(git_cmd), "checkout", tag_or_branch) then
          return nil, 'Failed to check out the "' .. tag_or_branch ..'" tag or branch.'
       end
    end
 
+   -- Fetching git submodules is supported only when rockspec format is >= 3.0.
+   if rockspec:format_is_at_least("3.0") then
+      command = {fs.Q(git_cmd), "submodule", "update", "--init", "--recursive"}
+
+      if git_supports_shallow_submodules(git_cmd) then
+         -- Fetch only the last commit of each submodule.
+         table.insert(command, 5, "--depth=1")
+      end
+
+      if not fs.execute(unpack(command)) then
+         return nil, 'Failed to fetch submodules.'
+      end
+   end
+
    fs.delete(dir.path(store_dir, module, ".git"))
    fs.delete(dir.path(store_dir, module, ".gitignore"))
    fs.pop_dir()
diff --git a/src/luarocks/fs.lua b/src/luarocks/fs.lua
index 54cc7d73..7322e552 100644
--- a/src/luarocks/fs.lua
+++ b/src/luarocks/fs.lua
@@ -8,9 +8,10 @@
 local pairs = pairs
 
 local fs = {}
+-- To avoid a loop when loading the other fs modules.
 package.loaded["luarocks.fs"] = fs
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 local pack = table.pack or function(...) return { n = select("#", ...), ... } end
 local unpack = table.unpack or unpack
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 841b7243..54da4afd 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -6,7 +6,7 @@ local fs_lua = {}
 
 local fs = require("luarocks.fs")
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
@@ -489,10 +489,10 @@ end
 
 if unzip_ok then
 --- Uncompress files from a .zip archive.
--- @param zipfile string: pathname of .zip archive to be extracted.
+-- @param filename string: pathname of .zip archive to be extracted.
 -- @return boolean: true on success, false on failure.
-function fs_lua.unzip(zipfile)
-   local zipfile, err = luazip.open(zipfile)
+function fs_lua.unzip(filename)
+   local zipfile, err = luazip.open(filename)
    if not zipfile then return nil, err end
    local files = zipfile:files()
    local file = files()
diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index 60d1d9ff..16dc9cf2 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -4,7 +4,7 @@ local tools = {}
 
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 local vars = cfg.variables
 
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 5c51bad5..89e3ec73 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -4,7 +4,7 @@ local unix = {}
 
 local fs = require("luarocks.fs")
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index f72001cb..b2ace3b1 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -4,7 +4,7 @@ local tools = {}
 
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 local vars = cfg.variables
 
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 55d69f9f..19c603dc 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -5,7 +5,7 @@ local win32 = {}
 
 local fs = require("luarocks.fs")
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 4adc78d1..7f6b853e 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -6,7 +6,7 @@ local tools = {}
 
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 
 local vars = cfg.variables
 
diff --git a/src/luarocks/index.lua b/src/luarocks/index.lua
index e1f563ef..80371151 100644
--- a/src/luarocks/index.lua
+++ b/src/luarocks/index.lua
@@ -1,11 +1,10 @@
 
 --- Module which builds the index.html page to be used in rocks servers.
 local index = {}
-package.loaded["luarocks.index"] = index
 
 local util = require("luarocks.util")
 local fs = require("luarocks.fs")
-local deps = require("luarocks.deps")
+local vers = require("luarocks.vers")
 local persist = require("luarocks.persist")
 local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
@@ -135,7 +134,7 @@ function index.make_index(repo)
    for package, version_list in util.sortedpairs(manifest.repository) do
       local latest_rockspec = nil
       local output = index_package_begin
-      for version, data in util.sortedpairs(version_list, deps.compare_versions) do
+      for version, data in util.sortedpairs(version_list, vers.compare_versions) do
          local versions = {}
          output = output..version..':&nbsp;'
          table.sort(data, function(a,b) return a.arch < b.arch end)
diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua
index 874bc10c..c8259689 100644
--- a/src/luarocks/loader.lua
+++ b/src/luarocks/loader.lua
@@ -6,21 +6,24 @@
 -- used to load previous modules, so that the loader chooses versions
 -- that are declared to be compatible with the ones loaded earlier.
 local loaders = package.loaders or package.searchers
-local package, require, ipairs, table, type, next, tostring, error =
-      package, require, ipairs, table, type, next, tostring, error
+local require, ipairs, table, type, next, tostring, error =
+      require, ipairs, table, type, next, tostring, error
 local unpack = unpack or table.unpack
 
---module("luarocks.loader")
 local loader = {}
-package.loaded["luarocks.loader"] = loader
 
-local cfg = require("luarocks.cfg")
+local is_clean = not package.loaded["luarocks.core.cfg"]
+
+-- This loader module depends only on core modules.
+local cfg = require("luarocks.core.cfg")
 cfg.init_package_paths()
 
-local path = require("luarocks.path")
-local manif_core = require("luarocks.manif_core")
-local deps = require("luarocks.deps")
-local util = require("luarocks.util")
+local path = require("luarocks.core.path")
+local manif = require("luarocks.core.manif")
+local vers = require("luarocks.core.vers")
+local util = require("luarocks.core.util")
+local require = nil
+--------------------------------------------------------------------------------
 
 -- Workaround for wrappers produced by older versions of LuaRocks
 local temporary_global = false
@@ -55,7 +58,7 @@ local function load_rocks_trees()
    local any_ok = false
    local trees = {}
    for _, tree in ipairs(cfg.rocks_trees) do
-      local manifest, err = manif_core.load_local_manifest(path.rocks_dir(tree))
+      local manifest, err = manif.load_local_manifest(path.rocks_dir(tree))
       if manifest then
          any_ok = true
          table.insert(trees, {tree=tree, manifest=manifest})
@@ -109,8 +112,8 @@ function loader.add_context(name, version)
          for _, tree in ipairs(loader.rocks_trees) do
             local entries = tree.manifest.repository[pkg]
             if entries then
-               for version, pkgs in util.sortedpairs(entries, deps.compare_versions) do
-                  if (not constraints) or deps.match_constraints(deps.parse_version(version), constraints) then
+               for ver, pkgs in util.sortedpairs(entries, vers.compare_versions) do
+                  if (not constraints) or vers.match_constraints(vers.parse_version(ver), constraints) then
                      loader.add_context(pkg, version)
                   end
                end
@@ -142,7 +145,7 @@ end
 -- @return table or (nil, string): The module table as returned by some other loader,
 -- or nil followed by an error message if no other loader managed to load the module.
 local function call_other_loaders(module, name, version, module_name)
-   for i, a_loader in ipairs(loaders) do
+   for _, a_loader in ipairs(loaders) do
       if a_loader ~= loader.luarocks_loader then
          local results = { a_loader(module_name) }
          if type(results[1]) == "function" then
@@ -187,7 +190,7 @@ local function select_module(module, filter_file_name)
             if loader.context[name] == version then
                return name, version, file_name
             end
-            version = deps.parse_version(version)
+            version = vers.parse_version(version)
             table.insert(providers, {name = name, version = version, module_name = file_name, tree = tree})
          end
       end
@@ -246,4 +249,12 @@ end
 
 table.insert(loaders, 1, loader.luarocks_loader)
 
+if is_clean then
+   for modname, _ in pairs(package.loaded) do
+      if modname:match("^luarocks%.") then
+         package.loaded[modname] = nil
+      end
+   end
+end
+
 return loader
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 88a13f10..7f3085db 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -3,41 +3,18 @@
 -- They are loaded into manifest tables, which are then used for
 -- performing searches, matching dependencies, etc.
 local manif = {}
-package.loaded["luarocks.manif"] = manif
+setmetatable(manif, { __index = require("luarocks.core.manif") })
 
-local manif_core = require("luarocks.manif_core")
 local persist = require("luarocks.persist")
 local fetch = require("luarocks.fetch")
 local dir = require("luarocks.dir")
 local fs = require("luarocks.fs")
-local search = require("luarocks.search")
-local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local path = require("luarocks.path")
-local repos = require("luarocks.repos")
-local deps = require("luarocks.deps")
+local util = require("luarocks.util")
 
 manif.rock_manifest_cache = {}
 
---- Commit a table to disk in given local path.
--- @param where string: The directory where the table should be saved.
--- @param name string: The filename.
--- @param tbl table: The table to be saved.
--- @return boolean or (nil, string): true if successful, or nil and a
--- message in case of errors.
-local function save_table(where, name, tbl)
-   assert(type(where) == "string")
-   assert(type(name) == "string")
-   assert(type(tbl) == "table")
-
-   local filename = dir.path(where, name)
-   local ok, err = persist.save_from_table(filename..".tmp", tbl)
-   if ok then
-      ok, err = fs.replace_file(filename, filename..".tmp")
-   end
-   return ok, err
-end
-
 function manif.load_rock_manifest(name, version, root)
    assert(type(name) == "string")
    assert(type(version) == "string")
@@ -48,41 +25,13 @@ function manif.load_rock_manifest(name, version, root)
    end
    local pathname = path.rock_manifest_file(name, version, root)
    local rock_manifest = persist.load_into_table(pathname)
-   if not rock_manifest then return nil end
+   if not rock_manifest then
+      return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks tree?"
+   end
    manif.rock_manifest_cache[name_version] = rock_manifest
    return rock_manifest.rock_manifest
 end
 
-function manif.make_rock_manifest(name, version)
-   local install_dir = path.install_dir(name, version)
-   local tree = {}
-   for _, file in ipairs(fs.find(install_dir)) do
-      local full_path = dir.path(install_dir, file)
-      local walk = tree
-      local last
-      local last_name
-      for name in file:gmatch("[^/]+") do
-         local next = walk[name]
-         if not next then
-            next = {}
-            walk[name] = next
-         end
-         last = walk
-         last_name = name
-         walk = next
-      end
-      if fs.is_file(full_path) then
-         local sum, err = fs.get_md5(full_path)
-         if not sum then
-            return nil, "Failed producing checksum: "..tostring(err)
-         end
-         last[last_name] = sum
-      end
-   end
-   local rock_manifest = { rock_manifest=tree }
-   manif.rock_manifest_cache[name.."/"..version] = rock_manifest
-   save_table(install_dir, "rock_manifest", rock_manifest )
-end
 
 local function fetch_manifest_from(repo_url, filename)
    local url = dir.path(repo_url, filename)
@@ -111,7 +60,7 @@ function manif.load_manifest(repo_url, lua_version)
    assert(type(lua_version) == "string" or not lua_version)
    lua_version = lua_version or cfg.lua_version
 
-   local cached_manifest = manif_core.get_cached_manifest(repo_url, lua_version)
+   local cached_manifest = manif.get_cached_manifest(repo_url, lua_version)
    if cached_manifest then
       return cached_manifest
    end
@@ -158,386 +107,7 @@ function manif.load_manifest(repo_url, lua_version)
       end
       pathname = nozip
    end
-   return manif_core.manifest_loader(pathname, repo_url, lua_version)
-end
-
---- Update storage table to account for items provided by a package.
--- @param storage table: a table storing items in the following format:
--- keys are item names and values are arrays of packages providing each item,
--- where a package is specified as string `name/version`.
--- @param items table: a table mapping item names to paths.
--- @param name string: package name.
--- @param version string: package version.
-local function store_package_items(storage, name, version, items)
-   assert(type(storage) == "table")
-   assert(type(items) == "table")
-   assert(type(name) == "string")
-   assert(type(version) == "string")
-
-   local package_identifier = name.."/"..version
-
-   for item_name, path in pairs(items) do
-      if not storage[item_name] then
-         storage[item_name] = {}
-      end
-
-      table.insert(storage[item_name], package_identifier)
-   end
-end
-
---- Update storage table removing items provided by a package.
--- @param storage table: a table storing items in the following format:
--- keys are item names and values are arrays of packages providing each item,
--- where a package is specified as string `name/version`.
--- @param items table: a table mapping item names to paths.
--- @param name string: package name.
--- @param version string: package version.
-local function remove_package_items(storage, name, version, items)
-   assert(type(storage) == "table")
-   assert(type(items) == "table")
-   assert(type(name) == "string")
-   assert(type(version) == "string")
-
-   local package_identifier = name.."/"..version
-
-   for item_name, path in pairs(items) do
-      local all_identifiers = storage[item_name]
-
-      for i, identifier in ipairs(all_identifiers) do
-         if identifier == package_identifier then
-            table.remove(all_identifiers, i)
-            break
-         end
-      end
-
-      if #all_identifiers == 0 then
-         storage[item_name] = nil
-      end
-   end
-end
-
---- Sort function for ordering rock identifiers in a manifest's
--- modules table. Rocks are ordered alphabetically by name, and then
--- by version which greater first.
--- @param a string: Version to compare.
--- @param b string: Version to compare.
--- @return boolean: The comparison result, according to the
--- rule outlined above.
-local function sort_pkgs(a, b)
-   assert(type(a) == "string")
-   assert(type(b) == "string")
-
-   local na, va = a:match("(.*)/(.*)$")
-   local nb, vb = b:match("(.*)/(.*)$")
-
-   return (na == nb) and deps.compare_versions(va, vb) or na < nb
-end
-
---- Sort items of a package matching table by version number (higher versions first).
--- @param tbl table: the package matching table: keys should be strings
--- and values arrays of strings with packages names in "name/version" format.
-local function sort_package_matching_table(tbl)
-   assert(type(tbl) == "table")
-
-   if next(tbl) then
-      for item, pkgs in pairs(tbl) do
-         if #pkgs > 1 then
-            table.sort(pkgs, sort_pkgs)
-            -- Remove duplicates from the sorted array.
-            local prev = nil
-            local i = 1
-            while pkgs[i] do
-               local curr = pkgs[i]
-               if curr == prev then
-                  table.remove(pkgs, i)
-               else
-                  prev = curr
-                  i = i + 1
-               end
-            end
-         end
-      end
-   end
-end
-
---- Process the dependencies of a manifest table to determine its dependency
--- chains for loading modules. The manifest dependencies information is filled
--- and any dependency inconsistencies or missing dependencies are reported to
--- standard error.
--- @param manifest table: a manifest table.
--- @param deps_mode string: Dependency mode: "one" for the current default tree,
--- "all" for all trees, "order" for all trees with priority >= the current default,
--- "none" for no trees.
-local function update_dependencies(manifest, deps_mode)
-   assert(type(manifest) == "table")
-   assert(type(deps_mode) == "string")
-   
-   for pkg, versions in pairs(manifest.repository) do
-      for version, repositories in pairs(versions) do
-         for _, repo in ipairs(repositories) do
-            if repo.arch == "installed" then
-               repo.dependencies = {}
-               deps.scan_deps(repo.dependencies, manifest, pkg, version, deps_mode)
-               repo.dependencies[pkg] = nil
-            end
-         end
-      end
-   end
-end
-
---- Filter manifest table by Lua version, removing rockspecs whose Lua version
--- does not match.
--- @param manifest table: a manifest table.
--- @param lua_version string or nil: filter by Lua version
--- @param repodir string: directory of repository being scanned
--- @param cache table: temporary rockspec cache table
-local function filter_by_lua_version(manifest, lua_version, repodir, cache)
-   assert(type(manifest) == "table")
-   assert(type(repodir) == "string")
-   assert((not cache) or type(cache) == "table")
-   
-   cache = cache or {}
-   lua_version = deps.parse_version(lua_version)
-   for pkg, versions in pairs(manifest.repository) do
-      local to_remove = {}
-      for version, repositories in pairs(versions) do
-         for _, repo in ipairs(repositories) do
-            if repo.arch == "rockspec" then
-               local pathname = dir.path(repodir, pkg.."-"..version..".rockspec")
-               local rockspec, err = cache[pathname]
-               if not rockspec then
-                  rockspec, err = fetch.load_local_rockspec(pathname, true)
-               end
-               if rockspec then
-                  cache[pathname] = rockspec
-                  for _, dep in ipairs(rockspec.dependencies) do
-                     if dep.name == "lua" then 
-                        if not deps.match_constraints(lua_version, dep.constraints) then
-                           table.insert(to_remove, version)
-                        end
-                        break
-                     end
-                  end
-               else
-                  util.printerr("Error loading rockspec for "..pkg.." "..version..": "..err)
-               end
-            end
-         end
-      end
-      if next(to_remove) then
-         for _, incompat in ipairs(to_remove) do
-            versions[incompat] = nil
-         end
-         if not next(versions) then
-            manifest.repository[pkg] = nil
-         end
-      end
-   end
-end
-
---- Store search results in a manifest table.
--- @param results table: The search results as returned by search.disk_search.
--- @param manifest table: A manifest table (must contain repository, modules, commands tables).
--- It will be altered to include the search results.
--- @return boolean or (nil, string): true in case of success, or nil followed by an error message.
-local function store_results(results, manifest)
-   assert(type(results) == "table")
-   assert(type(manifest) == "table")
-
-   for name, versions in pairs(results) do
-      local pkgtable = manifest.repository[name] or {}
-      for version, entries in pairs(versions) do
-         local versiontable = {}
-         for _, entry in ipairs(entries) do
-            local entrytable = {}
-            entrytable.arch = entry.arch
-            if entry.arch == "installed" then
-               local rock_manifest = manif.load_rock_manifest(name, version)
-               if not rock_manifest then
-                  return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks 2 tree?"
-               end
-
-               entrytable.modules = repos.package_modules(name, version)
-               store_package_items(manifest.modules, name, version, entrytable.modules)
-               entrytable.commands = repos.package_commands(name, version)
-               store_package_items(manifest.commands, name, version, entrytable.commands)
-            end
-            table.insert(versiontable, entrytable)
-         end
-         pkgtable[version] = versiontable
-      end
-      manifest.repository[name] = pkgtable
-   end
-   sort_package_matching_table(manifest.modules)
-   sort_package_matching_table(manifest.commands)
-   return true
-end
-
---- Scan a LuaRocks repository and output a manifest file.
--- A file called 'manifest' will be written in the root of the given
--- repository directory.
--- @param repo A local repository directory.
--- @param deps_mode string: Dependency mode: "one" for the current default tree,
--- "all" for all trees, "order" for all trees with priority >= the current default,
--- "none" for the default dependency mode from the configuration.
--- @param remote boolean: 'true' if making a manifest for a rocks server.
--- @return boolean or (nil, string): True if manifest was generated,
--- or nil and an error message.
-function manif.make_manifest(repo, deps_mode, remote)
-   assert(type(repo) == "string")
-   assert(type(deps_mode) == "string")
-
-   if deps_mode == "none" then deps_mode = cfg.deps_mode end
-
-   if not fs.is_dir(repo) then
-      return nil, "Cannot access repository at "..repo
-   end
-
-   local query = search.make_query("")
-   query.exact_name = false
-   query.arch = "any"
-   local results = search.disk_search(repo, query)
-   local manifest = { repository = {}, modules = {}, commands = {} }
-
-   manif_core.cache_manifest(repo, nil, manifest)
-
-   local ok, err = store_results(results, manifest)
-   if not ok then return nil, err end
-
-   if remote then
-      local cache = {}
-      for luaver in util.lua_versions() do
-         local vmanifest = { repository = {}, modules = {}, commands = {} }
-         local ok, err = store_results(results, vmanifest)
-         filter_by_lua_version(vmanifest, luaver, repo, cache)
-         save_table(repo, "manifest-"..luaver, vmanifest)
-      end
-   else
-      update_dependencies(manifest, deps_mode)
-   end
-
-   return save_table(repo, "manifest", manifest)
-end
-
---- Update manifest file for a local repository
--- adding information about a version of a package installed in that repository.
--- @param name string: Name of a package from the repository.
--- @param version string: Version of a package from the repository.
--- @param repo string or nil: Pathname of a local repository. If not given,
--- the default local repository is used.
--- @param deps_mode string: Dependency mode: "one" for the current default tree,
--- "all" for all trees, "order" for all trees with priority >= the current default,
--- "none" for using the default dependency mode from the configuration.
--- @return boolean or (nil, string): True if manifest was updated successfully,
--- or nil and an error message.
-function manif.add_to_manifest(name, version, repo, deps_mode)
-   assert(type(name) == "string")
-   assert(type(version) == "string")
-   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
-   assert(type(deps_mode) == "string")
-
-   if deps_mode == "none" then deps_mode = cfg.deps_mode end
-
-   local manifest, err = manif_core.load_local_manifest(rocks_dir)
-   if not manifest then
-      util.printerr("No existing manifest. Attempting to rebuild...")
-      -- Manifest built by `manif.make_manifest` should already
-      -- include information about given name and version,
-      -- no need to update it.
-      return manif.make_manifest(rocks_dir, deps_mode)
-   end
-
-   local results = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}}
-
-   local ok, err = store_results(results, manifest)
-   if not ok then return nil, err end
-
-   update_dependencies(manifest, deps_mode)
-   return save_table(rocks_dir, "manifest", manifest)
-end
-
---- Update manifest file for a local repository
--- removing information about a version of a package.
--- @param name string: Name of a package removed from the repository.
--- @param version string: Version of a package removed from the repository.
--- @param repo string or nil: Pathname of a local repository. If not given,
--- the default local repository is used.
--- @param deps_mode string: Dependency mode: "one" for the current default tree,
--- "all" for all trees, "order" for all trees with priority >= the current default,
--- "none" for using the default dependency mode from the configuration.
--- @return boolean or (nil, string): True if manifest was updated successfully,
--- or nil and an error message.
-function manif.remove_from_manifest(name, version, repo, deps_mode)
-   assert(type(name) == "string")
-   assert(type(version) == "string")
-   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
-   assert(type(deps_mode) == "string")
-
-   if deps_mode == "none" then deps_mode = cfg.deps_mode end
-
-   local manifest, err = manif_core.load_local_manifest(rocks_dir)
-   if not manifest then
-      util.printerr("No existing manifest. Attempting to rebuild...")
-      -- Manifest built by `manif.make_manifest` should already
-      -- include up-to-date information, no need to update it.
-      return manif.make_manifest(rocks_dir, deps_mode)
-   end
-
-   local package_entry = manifest.repository[name]
-
-   local version_entry = package_entry[version][1]
-   remove_package_items(manifest.modules, name, version, version_entry.modules)
-   remove_package_items(manifest.commands, name, version, version_entry.commands)
-
-   package_entry[version] = nil
-   manifest.dependencies[name][version] = nil
-
-   if not next(package_entry) then
-      -- No more versions of this package.
-      manifest.repository[name] = nil
-      manifest.dependencies[name] = nil
-   end
-
-   update_dependencies(manifest, deps_mode)
-   return save_table(rocks_dir, "manifest", manifest)
-end
-
---- Report missing dependencies for all rocks installed in a repository.
--- @param repo string or nil: Pathname of a local repository. If not given,
--- the default local repository is used.
--- @param deps_mode string: Dependency mode: "one" for the current default tree,
--- "all" for all trees, "order" for all trees with priority >= the current default,
--- "none" for using the default dependency mode from the configuration.
-function manif.check_dependencies(repo, deps_mode)
-   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
-   assert(type(deps_mode) == "string")
-   if deps_mode == "none" then deps_mode = cfg.deps_mode end
-
-   local manifest = manif_core.load_local_manifest(rocks_dir)
-   if not manifest then
-      return
-   end
-
-   for name, versions in util.sortedpairs(manifest.repository) do
-      for version, version_entries in util.sortedpairs(versions, deps.compare_versions) do
-         for _, entry in ipairs(version_entries) do
-            if entry.arch == "installed" then
-               if manifest.dependencies[name] and manifest.dependencies[name][version] then
-                  deps.report_missing_dependencies(name, version, manifest.dependencies[name][version], deps_mode)
-               end
-            end
-         end
-      end
-   end
-end
-
-function manif.zip_manifests()
-   for ver in util.lua_versions() do
-      local file = "manifest-"..ver
-      local zip = file..".zip"
-      fs.delete(dir.path(fs.current_dir(), zip))
-      fs.zip(zip, file)
-   end
+   return manif.manifest_loader(pathname, repo_url, lua_version)
 end
 
 --- Get type and name of an item (a module or a command) provided by a file.
@@ -556,7 +126,7 @@ local function get_providers(item_type, item_name, repo)
    assert(type(item_type) == "string")
    assert(type(item_name) == "string")
    local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
-   local manifest = manif_core.load_local_manifest(rocks_dir)
+   local manifest = manif.load_local_manifest(rocks_dir)
    return manifest and manifest[item_type .. "s"][item_name]
 end
 
@@ -592,7 +162,7 @@ end
 -- and path to the providing file relatively to that subtree.
 function manif.get_providing_file(name, version, item_type, item_name, repo)
    local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
-   local manifest = manif_core.load_local_manifest(rocks_dir)
+   local manifest = manif.load_local_manifest(rocks_dir)
 
    local entry_table = manifest.repository[name][version][1]
    local file_path = entry_table[item_type .. "s"][item_name]
@@ -625,4 +195,30 @@ function manif.get_providing_file(name, version, item_type, item_name, repo)
    return type(subtree) == "string" and "lib" or "lua", file_path
 end
 
+--- Get all versions of a package listed in a manifest file.
+-- @param name string: a package name.
+-- @param deps_mode string: "one", to use only the currently
+-- configured tree; "order" to select trees based on order
+-- (use the current tree and all trees below it on the list)
+-- or "all", to use all trees.
+-- @return table: An array of strings listing installed
+-- versions of a package.
+function manif.get_versions(name, deps_mode)
+   assert(type(name) == "string")
+   assert(type(deps_mode) == "string")
+
+   local version_set = {}
+   path.map_trees(deps_mode, function(tree)
+      local manifest = manif.load_local_manifest(path.rocks_dir(tree))
+
+      if manifest and manifest.repository[name] then
+         for version in pairs(manifest.repository[name]) do
+            version_set[version] = true
+         end
+      end
+   end)
+
+   return util.keys(version_set)
+end
+
 return manif
diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua
new file mode 100644
index 00000000..2d17d328
--- /dev/null
+++ b/src/luarocks/manif/writer.lua
@@ -0,0 +1,437 @@
+
+local writer = {}
+
+local cfg = require("luarocks.core.cfg")
+local search = require("luarocks.search")
+local repos = require("luarocks.repos")
+local deps = require("luarocks.deps")
+local vers = require("luarocks.vers")
+local fs = require("luarocks.fs")
+local util = require("luarocks.util")
+local dir = require("luarocks.dir")
+local fetch = require("luarocks.fetch")
+local path = require("luarocks.path")
+local persist = require("luarocks.persist")
+local manif = require("luarocks.manif")
+
+--- Update storage table to account for items provided by a package.
+-- @param storage table: a table storing items in the following format:
+-- keys are item names and values are arrays of packages providing each item,
+-- where a package is specified as string `name/version`.
+-- @param items table: a table mapping item names to paths.
+-- @param name string: package name.
+-- @param version string: package version.
+local function store_package_items(storage, name, version, items)
+   assert(type(storage) == "table")
+   assert(type(items) == "table")
+   assert(type(name) == "string")
+   assert(type(version) == "string")
+
+   local package_identifier = name.."/"..version
+
+   for item_name, path in pairs(items) do
+      if not storage[item_name] then
+         storage[item_name] = {}
+      end
+
+      table.insert(storage[item_name], package_identifier)
+   end
+end
+
+--- Update storage table removing items provided by a package.
+-- @param storage table: a table storing items in the following format:
+-- keys are item names and values are arrays of packages providing each item,
+-- where a package is specified as string `name/version`.
+-- @param items table: a table mapping item names to paths.
+-- @param name string: package name.
+-- @param version string: package version.
+local function remove_package_items(storage, name, version, items)
+   assert(type(storage) == "table")
+   assert(type(items) == "table")
+   assert(type(name) == "string")
+   assert(type(version) == "string")
+
+   local package_identifier = name.."/"..version
+
+   for item_name, path in pairs(items) do
+      local all_identifiers = storage[item_name]
+
+      for i, identifier in ipairs(all_identifiers) do
+         if identifier == package_identifier then
+            table.remove(all_identifiers, i)
+            break
+         end
+      end
+
+      if #all_identifiers == 0 then
+         storage[item_name] = nil
+      end
+   end
+end
+
+--- Process the dependencies of a manifest table to determine its dependency
+-- chains for loading modules. The manifest dependencies information is filled
+-- and any dependency inconsistencies or missing dependencies are reported to
+-- standard error.
+-- @param manifest table: a manifest table.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for no trees.
+local function update_dependencies(manifest, deps_mode)
+   assert(type(manifest) == "table")
+   assert(type(deps_mode) == "string")
+   
+   for pkg, versions in pairs(manifest.repository) do
+      for version, repositories in pairs(versions) do
+         for _, repo in ipairs(repositories) do
+            if repo.arch == "installed" then
+               repo.dependencies = {}
+               deps.scan_deps(repo.dependencies, manifest, pkg, version, deps_mode)
+               repo.dependencies[pkg] = nil
+            end
+         end
+      end
+   end
+end
+
+
+
+--- Sort function for ordering rock identifiers in a manifest's
+-- modules table. Rocks are ordered alphabetically by name, and then
+-- by version which greater first.
+-- @param a string: Version to compare.
+-- @param b string: Version to compare.
+-- @return boolean: The comparison result, according to the
+-- rule outlined above.
+local function sort_pkgs(a, b)
+   assert(type(a) == "string")
+   assert(type(b) == "string")
+
+   local na, va = a:match("(.*)/(.*)$")
+   local nb, vb = b:match("(.*)/(.*)$")
+
+   return (na == nb) and vers.compare_versions(va, vb) or na < nb
+end
+
+--- Sort items of a package matching table by version number (higher versions first).
+-- @param tbl table: the package matching table: keys should be strings
+-- and values arrays of strings with packages names in "name/version" format.
+local function sort_package_matching_table(tbl)
+   assert(type(tbl) == "table")
+
+   if next(tbl) then
+      for item, pkgs in pairs(tbl) do
+         if #pkgs > 1 then
+            table.sort(pkgs, sort_pkgs)
+            -- Remove duplicates from the sorted array.
+            local prev = nil
+            local i = 1
+            while pkgs[i] do
+               local curr = pkgs[i]
+               if curr == prev then
+                  table.remove(pkgs, i)
+               else
+                  prev = curr
+                  i = i + 1
+               end
+            end
+         end
+      end
+   end
+end
+
+--- Filter manifest table by Lua version, removing rockspecs whose Lua version
+-- does not match.
+-- @param manifest table: a manifest table.
+-- @param lua_version string or nil: filter by Lua version
+-- @param repodir string: directory of repository being scanned
+-- @param cache table: temporary rockspec cache table
+local function filter_by_lua_version(manifest, lua_version, repodir, cache)
+   assert(type(manifest) == "table")
+   assert(type(repodir) == "string")
+   assert((not cache) or type(cache) == "table")
+   
+   cache = cache or {}
+   lua_version = vers.parse_version(lua_version)
+   for pkg, versions in pairs(manifest.repository) do
+      local to_remove = {}
+      for version, repositories in pairs(versions) do
+         for _, repo in ipairs(repositories) do
+            if repo.arch == "rockspec" then
+               local pathname = dir.path(repodir, pkg.."-"..version..".rockspec")
+               local rockspec, err = cache[pathname]
+               if not rockspec then
+                  rockspec, err = fetch.load_local_rockspec(pathname, true)
+               end
+               if rockspec then
+                  cache[pathname] = rockspec
+                  for _, dep in ipairs(rockspec.dependencies) do
+                     if dep.name == "lua" then 
+                        if not vers.match_constraints(lua_version, dep.constraints) then
+                           table.insert(to_remove, version)
+                        end
+                        break
+                     end
+                  end
+               else
+                  util.printerr("Error loading rockspec for "..pkg.." "..version..": "..err)
+               end
+            end
+         end
+      end
+      if next(to_remove) then
+         for _, incompat in ipairs(to_remove) do
+            versions[incompat] = nil
+         end
+         if not next(versions) then
+            manifest.repository[pkg] = nil
+         end
+      end
+   end
+end
+
+--- Store search results in a manifest table.
+-- @param results table: The search results as returned by search.disk_search.
+-- @param manifest table: A manifest table (must contain repository, modules, commands tables).
+-- It will be altered to include the search results.
+-- @return boolean or (nil, string): true in case of success, or nil followed by an error message.
+local function store_results(results, manifest)
+   assert(type(results) == "table")
+   assert(type(manifest) == "table")
+
+   for name, versions in pairs(results) do
+      local pkgtable = manifest.repository[name] or {}
+      for version, entries in pairs(versions) do
+         local versiontable = {}
+         for _, entry in ipairs(entries) do
+            local entrytable = {}
+            entrytable.arch = entry.arch
+            if entry.arch == "installed" then
+               local rock_manifest, err = manif.load_rock_manifest(name, version)
+               if not rock_manifest then return nil, err end
+
+               entrytable.modules = repos.package_modules(name, version)
+               store_package_items(manifest.modules, name, version, entrytable.modules)
+               entrytable.commands = repos.package_commands(name, version)
+               store_package_items(manifest.commands, name, version, entrytable.commands)
+            end
+            table.insert(versiontable, entrytable)
+         end
+         pkgtable[version] = versiontable
+      end
+      manifest.repository[name] = pkgtable
+   end
+   sort_package_matching_table(manifest.modules)
+   sort_package_matching_table(manifest.commands)
+   return true
+end
+
+--- Commit a table to disk in given local path.
+-- @param where string: The directory where the table should be saved.
+-- @param name string: The filename.
+-- @param tbl table: The table to be saved.
+-- @return boolean or (nil, string): true if successful, or nil and a
+-- message in case of errors.
+local function save_table(where, name, tbl)
+   assert(type(where) == "string")
+   assert(type(name) == "string")
+   assert(type(tbl) == "table")
+
+   local filename = dir.path(where, name)
+   local ok, err = persist.save_from_table(filename..".tmp", tbl)
+   if ok then
+      ok, err = fs.replace_file(filename, filename..".tmp")
+   end
+   return ok, err
+end
+
+function writer.make_rock_manifest(name, version)
+   local install_dir = path.install_dir(name, version)
+   local tree = {}
+   for _, file in ipairs(fs.find(install_dir)) do
+      local full_path = dir.path(install_dir, file)
+      local walk = tree
+      local last
+      local last_name
+      for filename in file:gmatch("[^/]+") do
+         local next = walk[filename]
+         if not next then
+            next = {}
+            walk[filename] = next
+         end
+         last = walk
+         last_name = filename
+         walk = next
+      end
+      if fs.is_file(full_path) then
+         local sum, err = fs.get_md5(full_path)
+         if not sum then
+            return nil, "Failed producing checksum: "..tostring(err)
+         end
+         last[last_name] = sum
+      end
+   end
+   local rock_manifest = { rock_manifest=tree }
+   manif.rock_manifest_cache[name.."/"..version] = rock_manifest
+   save_table(install_dir, "rock_manifest", rock_manifest )
+end
+
+--- Scan a LuaRocks repository and output a manifest file.
+-- A file called 'manifest' will be written in the root of the given
+-- repository directory.
+-- @param repo A local repository directory.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for the default dependency mode from the configuration.
+-- @param remote boolean: 'true' if making a manifest for a rocks server.
+-- @return boolean or (nil, string): True if manifest was generated,
+-- or nil and an error message.
+function writer.make_manifest(repo, deps_mode, remote)
+   assert(type(repo) == "string")
+   assert(type(deps_mode) == "string")
+
+   if deps_mode == "none" then deps_mode = cfg.deps_mode end
+
+   if not fs.is_dir(repo) then
+      return nil, "Cannot access repository at "..repo
+   end
+
+   local query = search.make_query("")
+   query.exact_name = false
+   query.arch = "any"
+   local results = search.disk_search(repo, query)
+   local manifest = { repository = {}, modules = {}, commands = {} }
+
+   manif.cache_manifest(repo, nil, manifest)
+
+   local ok, err = store_results(results, manifest)
+   if not ok then return nil, err end
+
+   if remote then
+      local cache = {}
+      for luaver in util.lua_versions() do
+         local vmanifest = { repository = {}, modules = {}, commands = {} }
+         local ok, err = store_results(results, vmanifest)
+         filter_by_lua_version(vmanifest, luaver, repo, cache)
+         save_table(repo, "manifest-"..luaver, vmanifest)
+      end
+   else
+      update_dependencies(manifest, deps_mode)
+   end
+
+   return save_table(repo, "manifest", manifest)
+end
+
+--- Update manifest file for a local repository
+-- adding information about a version of a package installed in that repository.
+-- @param name string: Name of a package from the repository.
+-- @param version string: Version of a package from the repository.
+-- @param repo string or nil: Pathname of a local repository. If not given,
+-- the default local repository is used.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for using the default dependency mode from the configuration.
+-- @return boolean or (nil, string): True if manifest was updated successfully,
+-- or nil and an error message.
+function writer.add_to_manifest(name, version, repo, deps_mode)
+   assert(type(name) == "string")
+   assert(type(version) == "string")
+   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
+   assert(type(deps_mode) == "string")
+
+   if deps_mode == "none" then deps_mode = cfg.deps_mode end
+
+   local manifest, err = manif.load_local_manifest(rocks_dir)
+   if not manifest then
+      util.printerr("No existing manifest. Attempting to rebuild...")
+      -- Manifest built by `writer.make_manifest` should already
+      -- include information about given name and version,
+      -- no need to update it.
+      return writer.make_manifest(rocks_dir, deps_mode)
+   end
+
+   local results = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}}
+
+   local ok, err = store_results(results, manifest)
+   if not ok then return nil, err end
+
+   update_dependencies(manifest, deps_mode)
+   return save_table(rocks_dir, "manifest", manifest)
+end
+
+--- Update manifest file for a local repository
+-- removing information about a version of a package.
+-- @param name string: Name of a package removed from the repository.
+-- @param version string: Version of a package removed from the repository.
+-- @param repo string or nil: Pathname of a local repository. If not given,
+-- the default local repository is used.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for using the default dependency mode from the configuration.
+-- @return boolean or (nil, string): True if manifest was updated successfully,
+-- or nil and an error message.
+function writer.remove_from_manifest(name, version, repo, deps_mode)
+   assert(type(name) == "string")
+   assert(type(version) == "string")
+   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
+   assert(type(deps_mode) == "string")
+
+   if deps_mode == "none" then deps_mode = cfg.deps_mode end
+
+   local manifest, err = manif.load_local_manifest(rocks_dir)
+   if not manifest then
+      util.printerr("No existing manifest. Attempting to rebuild...")
+      -- Manifest built by `writer.make_manifest` should already
+      -- include up-to-date information, no need to update it.
+      return writer.make_manifest(rocks_dir, deps_mode)
+   end
+
+   local package_entry = manifest.repository[name]
+
+   local version_entry = package_entry[version][1]
+   remove_package_items(manifest.modules, name, version, version_entry.modules)
+   remove_package_items(manifest.commands, name, version, version_entry.commands)
+
+   package_entry[version] = nil
+   manifest.dependencies[name][version] = nil
+
+   if not next(package_entry) then
+      -- No more versions of this package.
+      manifest.repository[name] = nil
+      manifest.dependencies[name] = nil
+   end
+
+   update_dependencies(manifest, deps_mode)
+   return save_table(rocks_dir, "manifest", manifest)
+end
+
+--- Report missing dependencies for all rocks installed in a repository.
+-- @param repo string or nil: Pathname of a local repository. If not given,
+-- the default local repository is used.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for using the default dependency mode from the configuration.
+function writer.check_dependencies(repo, deps_mode)
+   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
+   assert(type(deps_mode) == "string")
+   if deps_mode == "none" then deps_mode = cfg.deps_mode end
+
+   local manifest = manif.load_local_manifest(rocks_dir)
+   if not manifest then
+      return
+   end
+
+   for name, versions in util.sortedpairs(manifest.repository) do
+      for version, version_entries in util.sortedpairs(versions, vers.compare_versions) do
+         for _, entry in ipairs(version_entries) do
+            if entry.arch == "installed" then
+               if manifest.dependencies[name] and manifest.dependencies[name][version] then
+                  deps.report_missing_dependencies(name, version, manifest.dependencies[name][version], deps_mode, cfg.rocks_provided_3_0)
+               end
+            end
+         end
+      end
+   end
+end
+
+return writer
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index 35bbe838..b721a209 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -1,8 +1,6 @@
 
---- Module implementing the LuaRocks "pack" command.
--- Creates a rock, packing sources or binaries.
+-- Create rock files, packing sources or binaries.
 local pack = {}
-package.loaded["luarocks.pack"] = pack
 
 local unpack = unpack or table.unpack
 
@@ -10,22 +8,12 @@ local path = require("luarocks.path")
 local repos = require("luarocks.repos")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
 local search = require("luarocks.search")
 
-util.add_run_function(pack)
-pack.help_summary = "Create a rock, packing sources or binaries."
-pack.help_arguments = "{<rockspec>|<name> [<version>]}"
-pack.help = [[
-Argument may be a rockspec file, for creating a source rock,
-or the name of an installed package, for creating a binary rock.
-In the latter case, the app version may be given as a second
-argument.
-]]
-
 --- Create a source rock.
 -- Packages a rockspec and its required source files in a rock
 -- file with the .src.rock extension, which can later be built and
@@ -88,7 +76,7 @@ end
 -- @param tree string or nil: An optional tree to pick the package from.
 -- @return string or (nil, string): The filename of the resulting
 -- .src.rock file; or nil and an error message.
-local function do_pack_binary_rock(name, version, tree)
+function pack.pack_installed_rock(name, version, tree)
    assert(type(name) == "string")
    assert(type(version) == "string" or not version)
 
@@ -104,10 +92,8 @@ local function do_pack_binary_rock(name, version, tree)
       return nil, "'"..name.." "..version.."' does not seem to be an installed rock."
    end
    
-   local rock_manifest = manif.load_rock_manifest(name, version, root)
-   if not rock_manifest then
-      return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks 2 tree?"
-   end
+   local rock_manifest, err = manif.load_rock_manifest(name, version, root)
+   if not rock_manifest then return nil, err end
 
    local name_version = name .. "-" .. version
    local rock_file = fs.absolute_name(name_version .. "."..cfg.arch..".rock")
@@ -164,34 +150,7 @@ function pack.pack_binary_rock(name, version, cmd, ...)
    if not rname then
       rname, rversion = name, version
    end
-   return do_pack_binary_rock(rname, rversion, temp_dir)
-end
-
---- Driver function for the "pack" command.
--- @param arg string:  may be a rockspec file, for creating a source rock,
--- or the name of an installed package, for creating a binary rock.
--- @param version string or nil: if the name of a package is given, a
--- version may also be passed.
--- @return boolean or (nil, string): true if successful or nil followed
--- by an error message.
-function pack.command(flags, arg, version)
-   assert(type(version) == "string" or not version)
-   if type(arg) ~= "string" then
-      return nil, "Argument missing. "..util.see_help("pack")
-   end
-
-   local file, err
-   if arg:match(".*%.rockspec") then
-      file, err = pack.pack_source_rock(arg)
-   else
-      file, err = do_pack_binary_rock(arg:lower(), version, flags["tree"])
-   end
-   if err then
-      return nil, err
-   else
-      util.printout("Packed: "..file)
-      return true
-   end
+   return pack.pack_installed_rock(rname, rversion, temp_dir)
 end
 
 return pack
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index dafc64e7..37898435 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -3,9 +3,10 @@
 -- All paths are configured in this module, making it a single
 -- point where the layout of the local installation is defined in LuaRocks.
 local path = {}
+setmetatable(path, { __index = require("luarocks.core.path") })
 
 local dir = require("luarocks.dir")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 
 --- Infer rockspec filename from a rock filename.
@@ -17,29 +18,11 @@ function path.rockspec_name_from_rock(rock_name)
    return base_name:match("(.*)%.[^.]*.rock") .. ".rockspec"
 end
 
-function path.rocks_dir(tree)
-   if type(tree) == "string" then
-      return dir.path(tree, cfg.rocks_subdir)
-   else
-      assert(type(tree) == "table")
-      return tree.rocks_dir or dir.path(tree.root, cfg.rocks_subdir)
-   end
-end
-
 function path.root_dir(rocks_dir)
    assert(type(rocks_dir) == "string")
    return rocks_dir:match("(.*)" .. util.matchquote(cfg.rocks_subdir) .. ".*$")
 end
 
-function path.rocks_tree_to_string(tree)
-   if type(tree) == "string" then
-      return tree
-   else
-      assert(type(tree) == "table")
-      return tree.root
-   end
-end
-
 function path.deploy_bin_dir(tree)
    if type(tree) == "string" then
       return dir.path(tree, "bin")
@@ -49,24 +32,6 @@ function path.deploy_bin_dir(tree)
    end
 end
 
-function path.deploy_lua_dir(tree)
-   if type(tree) == "string" then
-      return dir.path(tree, cfg.lua_modules_path)
-   else
-      assert(type(tree) == "table")
-      return tree.lua_dir or dir.path(tree.root, cfg.lua_modules_path)
-   end
-end
-
-function path.deploy_lib_dir(tree)
-   if type(tree) == "string" then
-      return dir.path(tree, cfg.lib_modules_path)
-   else
-      assert(type(tree) == "table")
-      return tree.lib_dir or dir.path(tree.root, cfg.lib_modules_path)
-   end
-end
-
 function path.manifest_file(tree)
    if type(tree) == "string" then
       return dir.path(tree, cfg.rocks_subdir, "manifest")
@@ -229,34 +194,6 @@ function path.make_url(pathname, name, version, arch)
    return dir.path(pathname, filename)
 end
 
---- Convert a pathname to a module identifier.
--- In Unix, for example, a path "foo/bar/baz.lua" is converted to
--- "foo.bar.baz"; "bla/init.lua" returns "bla"; "foo.so" returns "foo".
--- @param file string: Pathname of module
--- @return string: The module identifier, or nil if given path is
--- not a conformant module path (the function does not check if the
--- path actually exists).
-function path.path_to_module(file)
-   assert(type(file) == "string")
-
-   local name = file:match("(.*)%."..cfg.lua_extension.."$")
-   if name then
-      name = name:gsub(dir.separator, ".")
-      local init = name:match("(.*)%.init$")
-      if init then
-         name = init
-      end
-   else
-      name = file:match("(.*)%."..cfg.lib_extension.."$")
-      if name then
-         name = name:gsub(dir.separator, ".")
-      end
-   end
-   if not name then name = file end
-   name = name:gsub("^%.+", ""):gsub("%.+$", "")
-   return name
-end
-
 --- Obtain the directory name where a module should be stored.
 -- For example, on Unix, "foo.bar.baz" will return "foo/bar".
 -- @param mod string: A module name in Lua dot-separated format.
@@ -286,22 +223,6 @@ function path.configure_paths(rockspec)
    rockspec.variables = vars
 end
 
---- Produce a versioned version of a filename.
--- @param file string: filename (must start with prefix)
--- @param prefix string: Path prefix for file
--- @param name string: Rock name
--- @param version string: Rock version
--- @return string: a pathname with the same directory parts and a versioned basename.
-function path.versioned_name(file, prefix, name, version)
-   assert(type(file) == "string")
-   assert(type(name) == "string")
-   assert(type(version) == "string")
-
-   local rest = file:sub(#prefix+1):gsub("^/*", "")
-   local name_version = (name.."_"..version):gsub("%-", "_"):gsub("%.", "_")
-   return dir.path(prefix, name_version.."-"..rest)
-end
-
 function path.use_tree(tree)
    cfg.root_dir = tree
    cfg.rocks_dir = path.rocks_dir(tree)
@@ -310,6 +231,15 @@ function path.use_tree(tree)
    cfg.deploy_lib_dir = path.deploy_lib_dir(tree)
 end
 
+function path.rocks_tree_to_string(tree)
+   if type(tree) == "string" then
+      return tree
+   else
+      assert(type(tree) == "table")
+      return tree.root
+   end
+end
+
 --- Apply a given function to the active rocks trees based on chosen dependency mode.
 -- @param deps_mode string: Dependency mode: "one" for the current default tree,
 -- "all" for all trees, "order" for all trees with priority >= the current default,
@@ -338,51 +268,4 @@ function path.map_trees(deps_mode, fn, ...)
    return result
 end
 
-local is_src_extension = { [".lua"] = true, [".tl"] = true, [".tld"] = true, [".moon"] = true }
-
---- Return the pathname of the file that would be loaded for a module, indexed.
--- @param file_name string: module file name as in manifest (eg. "socket/core.so")
--- @param name string: name of the package (eg. "luasocket")
--- @param version string: version number (eg. "2.0.2-1")
--- @param tree string: repository path (eg. "/usr/local")
--- @param i number: the index, 1 if version is the current default, > 1 otherwise.
--- This is done this way for use by select_module in luarocks.loader.
--- @return string: filename of the module (eg. "/usr/local/lib/lua/5.1/socket/core.so")
-function path.which_i(file_name, name, version, tree, i)
-   local deploy_dir
-   local extension = file_name:match("%.[a-z]+$")
-   if is_src_extension[extension] then
-      deploy_dir = path.deploy_lua_dir(tree)
-      file_name = dir.path(deploy_dir, file_name)
-   else
-      deploy_dir = path.deploy_lib_dir(tree)
-      file_name = dir.path(deploy_dir, file_name)
-   end
-   if i > 1 then
-      file_name = path.versioned_name(file_name, deploy_dir, name, version)
-   end
-   return file_name
-end
-
---- Return the pathname of the file that would be loaded for a module, 
--- returning the versioned pathname if given version is not the default version
--- in the given manifest.
--- @param module_name string: module name (eg. "socket.core")
--- @param file_name string: module file name as in manifest (eg. "socket/core.so")
--- @param name string: name of the package (eg. "luasocket")
--- @param version string: version number (eg. "2.0.2-1")
--- @param tree string: repository path (eg. "/usr/local")
--- @param manifest table: the manifest table for the tree.
--- @return string: filename of the module (eg. "/usr/local/lib/lua/5.1/socket/core.so")
-function path.which(module_name, file_name, name, version, tree, manifest)
-   local versions = manifest.modules[module_name]
-   assert(versions)
-   for i, name_version in ipairs(versions) do
-      if name_version == name.."/"..version then
-         return path.which_i(file_name, name, version, tree, i):gsub("//", "/")
-      end
-   end
-   assert(false)
-end
-
 return path
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index 708f07be..6d5e917b 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -4,83 +4,10 @@
 -- Implemented separately to avoid interdependencies,
 -- as it is used in the bootstrapping stage of the cfg module.
 local persist = {}
-package.loaded["luarocks.persist"] = persist
+setmetatable(persist, { __index = require("luarocks.core.persist") })
 
 local util = require("luarocks.util")
 
---- Load and run a Lua file in an environment.
--- @param filename string: the name of the file.
--- @param env table: the environment table.
--- @return (true, any) or (nil, string, string): true and the return value
--- of the file, or nil, an error message and an error code ("open", "load"
--- or "run") in case of errors.
-local function run_file(filename, env)
-   local fd, err = io.open(filename)
-   if not fd then
-      return nil, err, "open"
-   end
-   local str, err = fd:read("*a")
-   fd:close()
-   if not str then
-      return nil, err, "open"
-   end
-   str = str:gsub("^#![^\n]*\n", "")
-   local chunk, ran
-   if _VERSION == "Lua 5.1" then -- Lua 5.1
-      chunk, err = loadstring(str, filename)
-      if chunk then
-         setfenv(chunk, env)
-         ran, err = pcall(chunk)
-      end
-   else -- Lua 5.2
-      chunk, err = load(str, filename, "t", env)
-      if chunk then
-         ran, err = pcall(chunk)
-      end
-   end
-   if not chunk then
-      return nil, "Error loading file: "..err, "load"
-   end
-   if not ran then
-      return nil, "Error running file: "..err, "run"
-   end
-   return true, err
-end
-
---- Load a Lua file containing assignments, storing them in a table.
--- The global environment is not propagated to the loaded file.
--- @param filename string: the name of the file.
--- @param tbl table or nil: if given, this table is used to store
--- loaded values.
--- @return (table, table) or (nil, string, string): a table with the file's assignments
--- as fields and set of undefined globals accessed in file,
--- or nil, an error message and an error code ("open"; couldn't open the file,
--- "load"; compile-time error, or "run"; run-time error)
--- in case of errors.
-function persist.load_into_table(filename, tbl)
-   assert(type(filename) == "string")
-   assert(type(tbl) == "table" or not tbl)
-
-   local result = tbl or {}
-   local globals = {}
-   local globals_mt = {
-      __index = function(t, k)
-         globals[k] = true
-      end
-   }
-   local save_mt = getmetatable(result)
-   setmetatable(result, globals_mt)
-   
-   local ok, err, errcode = run_file(filename, result)
-   
-   setmetatable(result, save_mt)
-
-   if not ok then
-      return nil, err, errcode
-   end
-   return result, globals
-end
-
 local write_table
 
 --- Write a value as Lua code.
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 514c6dfa..6cc8334f 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -1,8 +1,4 @@
-
---- Module implementing the LuaRocks "remove" command.
--- Uninstalls rocks.
 local remove = {}
-package.loaded["luarocks.remove"] = remove
 
 local search = require("luarocks.search")
 local deps = require("luarocks.deps")
@@ -10,22 +6,7 @@ local fetch = require("luarocks.fetch")
 local repos = require("luarocks.repos")
 local path = require("luarocks.path")
 local util = require("luarocks.util")
-local cfg = require("luarocks.cfg")
-local fs = require("luarocks.fs")
-local manif = require("luarocks.manif")
-
-util.add_run_function(remove)
-remove.help_summary = "Uninstall a rock."
-remove.help_arguments = "[--force|--force-fast] <name> [<version>]"
-remove.help = [[
-Argument is the name of a rock to be uninstalled.
-If a version is not given, try to remove all versions at once.
-Will only perform the removal if it does not break dependencies.
-To override this check and force the removal, use --force.
-To perform a forced removal without reporting dependency issues,
-use --force-fast.
-
-]]..util.deps_mode_help()
+local cfg = require("luarocks.core.cfg")
 
 --- Obtain a list of packages that depend on the given set of packages
 -- (where all packages of the set are versions of one program).
@@ -131,44 +112,4 @@ function remove.remove_other_versions(name, version, force, fast)
    return true
 end
 
---- Driver function for the "remove" command.
--- @param name string: name of a rock. If a version is given, refer to
--- a specific version; otherwise, try to remove all versions.
--- @param version string: When passing a package name, a version number
--- may also be given.
--- @return boolean or (nil, string, exitcode): True if removal was
--- successful, nil and an error message otherwise. exitcode is optionally returned.
-function remove.command(flags, name, version)
-   if type(name) ~= "string" then
-      return nil, "Argument missing. "..util.see_help("remove")
-   end
-   
-   local deps_mode = flags["deps-mode"] or cfg.deps_mode
-   
-   local ok, err = fs.check_command_permissions(flags)
-   if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
-   
-   local rock_type = name:match("%.(rock)$") or name:match("%.(rockspec)$")
-   local filename = name
-   if rock_type then
-      name, version = path.parse_name(filename)
-      if not name then return nil, "Invalid "..rock_type.." filename: "..filename end
-   end
-
-   local results = {}
-   name = name:lower()
-   search.manifest_search(results, cfg.rocks_dir, search.make_query(name, version))
-   if not results[name] then
-      return nil, "Could not find rock '"..name..(version and " "..version or "").."' in "..path.rocks_tree_to_string(cfg.root_dir)
-   end
-
-   local ok, err = remove.remove_search_results(results, name, deps_mode, flags["force"], flags["force-fast"])
-   if not ok then
-      return nil, err
-   end
-
-   manif.check_dependencies(nil, deps.get_deps_mode(flags))
-   return true
-end
-
 return remove
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index abc62b0d..1abb5628 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -1,15 +1,14 @@
 
 --- Functions for managing the repository on disk.
 local repos = {}
-package.loaded["luarocks.repos"] = repos
 
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
-local deps = require("luarocks.deps")
+local vers = require("luarocks.vers")
 
 -- Tree of files installed by a package are stored
 -- in its rock manifest. Some of these files have to
@@ -55,67 +54,73 @@ end
 local function recurse_rock_manifest_tree(file_tree, action) 
    assert(type(file_tree) == "table")
    assert(type(action) == "function")
-   local function do_recurse_rock_manifest_tree(tree, parent_path, parent_module)
-      
+
+   local function do_recurse_rock_manifest_tree(tree, parent_path)
       for file, sub in pairs(tree) do
+         local sub_path = (parent_path and (parent_path .. "/") or "") .. file
+         local ok, err
+
          if type(sub) == "table" then
-            local ok, err = do_recurse_rock_manifest_tree(sub, parent_path..file.."/", parent_module..file..".")
-            if not ok then return nil, err end
+            ok, err = do_recurse_rock_manifest_tree(sub, sub_path)
          else
-            local ok, err = action(parent_path, parent_module, file)
-            if not ok then return nil, err end
+            ok, err = action(sub_path)
          end
+
+         if not ok then return nil, err end
       end
       return true
    end
-   return do_recurse_rock_manifest_tree(file_tree, "", "")
+   return do_recurse_rock_manifest_tree(file_tree)
 end
 
-local function store_package_data(result, name, file_tree)
-   if not file_tree then return end
-   return recurse_rock_manifest_tree(file_tree, 
-      function(parent_path, parent_module, file)
-         local pathname = parent_path..file
-         result[path.path_to_module(pathname)] = pathname
+local function store_package_data(result, rock_manifest, deploy_type)
+   if rock_manifest[deploy_type] then
+      recurse_rock_manifest_tree(rock_manifest[deploy_type], function(file_path)
+         local _, item_name = manif.get_provided_item(deploy_type, file_path)
+         result[item_name] = file_path
          return true
-      end
-   )
+      end)
+   end
 end
 
---- Obtain a list of modules within an installed package.
--- @param package string: The package name; for example "luasocket"
+--- Obtain a table of modules within an installed package.
+-- @param name string: The package name; for example "luasocket"
 -- @param version string: The exact version number including revision;
 -- for example "2.0.1-1".
--- @return table: A table of modules where keys are module identifiers
--- in "foo.bar" format and values are pathnames in architecture-dependent
--- "foo/bar.so" format. If no modules are found or if package or version
+-- @return table: A table of modules where keys are module names
+-- and values are file paths of files providing modules
+-- relative to "lib" or "lua" rock manifest subtree.
+-- If no modules are found or if package name or version
 -- are invalid, an empty table is returned.
-function repos.package_modules(package, version)
-   assert(type(package) == "string")
+function repos.package_modules(name, version)
+   assert(type(name) == "string")
    assert(type(version) == "string")
 
    local result = {}
-   local rock_manifest = manif.load_rock_manifest(package, version)
-   store_package_data(result, package, rock_manifest.lib)
-   store_package_data(result, package, rock_manifest.lua)
+   local rock_manifest = manif.load_rock_manifest(name, version)
+   if not rock_manifest then return result end
+   store_package_data(result, rock_manifest, "lib")
+   store_package_data(result, rock_manifest, "lua")
    return result
 end
 
---- Obtain a list of command-line scripts within an installed package.
--- @param package string: The package name; for example "luasocket"
+--- Obtain a table of command-line scripts within an installed package.
+-- @param name string: The package name; for example "luasocket"
 -- @param version string: The exact version number including revision;
 -- for example "2.0.1-1".
--- @return table: A table of items where keys are command names
--- as strings and values are pathnames in architecture-dependent
--- ".../bin/foo" format. If no modules are found or if package or version
+-- @return table: A table of commands where keys and values are command names
+-- as strings - file paths of files providing commands
+-- relative to "bin" rock manifest subtree.
+-- If no commands are found or if package name or version
 -- are invalid, an empty table is returned.
-function repos.package_commands(package, version)
-   assert(type(package) == "string")
+function repos.package_commands(name, version)
+   assert(type(name) == "string")
    assert(type(version) == "string")
 
    local result = {}
-   local rock_manifest = manif.load_rock_manifest(package, version)
-   store_package_data(result, package, rock_manifest.bin)
+   local rock_manifest = manif.load_rock_manifest(name, version)
+   if not rock_manifest then return result end
+   store_package_data(result, rock_manifest, "bin")
    return result
 end
 
@@ -130,7 +135,7 @@ function repos.has_binaries(name, version)
    assert(type(version) == "string")
 
    local rock_manifest = manif.load_rock_manifest(name, version)
-   if rock_manifest.bin then
+   if rock_manifest and rock_manifest.bin then
       for name, md5 in pairs(rock_manifest.bin) do
          -- TODO verify that it is the same file. If it isn't, find the actual command.
          if fs.is_actual_binary(dir.path(cfg.deploy_bin_dir, name)) then
@@ -241,7 +246,7 @@ local function prepare_target(name, version, deploy_type, file_path, suffix)
 
    if not cur_name then
       return non_versioned
-   elseif name < cur_name or (name == cur_name and deps.compare_versions(version, cur_version)) then
+   elseif name < cur_name or (name == cur_name and vers.compare_versions(version, cur_version)) then
       -- New version has priority. Move currently provided version back using versioned name.
       local cur_deploy_type, cur_file_path = manif.get_providing_file(cur_name, cur_version, item_type, item_name)
       local cur_non_versioned, cur_versioned = get_deploy_paths(cur_name, cur_version, cur_deploy_type, cur_file_path)
@@ -271,15 +276,15 @@ function repos.deploy_files(name, version, wrap_bin_scripts, deps_mode)
    assert(type(version) == "string")
    assert(type(wrap_bin_scripts) == "boolean")
 
-   local rock_manifest = manif.load_rock_manifest(name, version)
+   local rock_manifest, load_err = manif.load_rock_manifest(name, version)
+   if not rock_manifest then return nil, load_err end
 
    local function deploy_file_tree(deploy_type, source_dir, move_fn, suffix)
       if not rock_manifest[deploy_type] then
          return true
       end
 
-      return recurse_rock_manifest_tree(rock_manifest[deploy_type], function(parent_path, parent_module, file)
-         local file_path = parent_path .. file
+      return recurse_rock_manifest_tree(rock_manifest[deploy_type], function(file_path)
          local source = dir.path(source_dir, file_path)
 
          local target, prepare_err = prepare_target(name, version, deploy_type, file_path, suffix)
@@ -331,7 +336,8 @@ function repos.deploy_files(name, version, wrap_bin_scripts, deps_mode)
    ok, err = deploy_file_tree("lib", path.lib_dir(name, version), make_mover(cfg.perm_exec))
    if not ok then return nil, err end
 
-   return manif.add_to_manifest(name, version, nil, deps_mode)
+   local writer = require("luarocks.manif.writer")
+   return writer.add_to_manifest(name, version, nil, deps_mode)
 end
 
 --- Delete a package from the local repository.
@@ -349,18 +355,15 @@ function repos.delete_version(name, version, deps_mode, quick)
    assert(type(version) == "string")
    assert(type(deps_mode) == "string")
 
-   local rock_manifest = manif.load_rock_manifest(name, version)
-   if not rock_manifest then
-      return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks 2 tree?"
-   end
+   local rock_manifest, load_err = manif.load_rock_manifest(name, version)
+   if not rock_manifest then return nil, load_err end
 
    local function delete_deployed_file_tree(deploy_type, suffix)
       if not rock_manifest[deploy_type] then
          return true
       end
 
-      return recurse_rock_manifest_tree(rock_manifest[deploy_type], function(parent_path, parent_module, file)
-         local file_path = parent_path .. file
+      return recurse_rock_manifest_tree(rock_manifest[deploy_type], function(file_path)
          local non_versioned, versioned = get_deploy_paths(name, version, deploy_type, file_path)
 
          -- Figure out if the file is deployed using versioned or non-versioned name.
@@ -417,7 +420,30 @@ function repos.delete_version(name, version, deps_mode, quick)
       return true
    end
 
-   return manif.remove_from_manifest(name, version, nil, deps_mode)
+   local writer = require("luarocks.manif.writer")
+   return writer.remove_from_manifest(name, version, nil, deps_mode)
+end
+
+--- Find full path to a file providing a module or a command
+-- in a package.
+-- @param name string: name of package.
+-- @param version string: exact package version in string format.
+-- @param item_type string: "module" or "command".
+-- @param item_name string: module or command name.
+-- @param root string or nil: A local root dir for a rocks tree. If not given, the default is used.
+-- @return string: absolute path to the file providing given module
+-- or command.
+function repos.which(name, version, item_type, item_name, repo)
+   local deploy_type, file_path = manif.get_providing_file(name, version, item_type, item_name, repo)
+   local non_versioned, versioned = get_deploy_paths(name, version, deploy_type, file_path, repo)
+   local cur_name, cur_version = manif.get_current_provider(item_type, item_name)
+   local deploy_path = (name == cur_name and version == cur_version) and non_versioned or versioned
+
+   if deploy_type == "bin" and cfg.wrapper_suffix and cfg.wrapper_suffix ~= "" then
+      deploy_path = find_suffixed(deploy_path, cfg.wrapper_suffix) or deploy_path
+   end
+
+   return deploy_path
 end
 
 --- Find full path to a file providing a module or a command
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index d22c2a18..35010c2b 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -1,28 +1,12 @@
-
---- Module implementing the LuaRocks "search" command.
--- Queries LuaRocks servers.
 local search = {}
-package.loaded["luarocks.search"] = search
 
 local dir = require("luarocks.dir")
 local path = require("luarocks.path")
 local manif = require("luarocks.manif")
-local deps = require("luarocks.deps")
-local cfg = require("luarocks.cfg")
+local vers = require("luarocks.vers")
+local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 
-util.add_run_function(search)
-search.help_summary = "Query the LuaRocks servers."
-search.help_arguments = "[--source] [--binary] { <name> [<version>] | --all }"
-search.help = [[
---source  Return only rockspecs and source rocks,
-          to be used with the "build" command.
---binary  Return only pure Lua and binary rocks (rocks that can be used
-          with the "install" command without requiring a C toolchain).
---all     List all contents of the server that are suitable to
-          this platform, do not filter by name.
-]]
-
 --- Convert the arch field of a query table to table format.
 -- @param query table: A query table.
 local function query_arch_as_table(query)
@@ -56,7 +40,7 @@ end
 -- identifier), "rockspec" or "installed"
 -- @param repo string: Pathname of a local repository of URL of
 -- rocks server.
-local function store_result(results, name, version, arch, repo)
+function search.store_result(results, name, version, arch, repo)
    assert(type(results) == "table")
    assert(type(name) == "string")
    assert(type(version) == "string")
@@ -108,8 +92,8 @@ end
 local function store_if_match(results, repo, name, version, arch, query)
    if match_name(query, name) then
       if query.arch[arch] or query.arch["any"] then
-         if deps.match_constraints(deps.parse_version(version), query.constraints) then
-            store_result(results, name, version, arch, repo)
+         if vers.match_constraints(vers.parse_version(version), query.constraints) then
+            search.store_result(results, name, version, arch, repo)
          end
       end
    end
@@ -245,7 +229,7 @@ function search.make_query(name, version)
       constraints = {}
    }
    if version then
-      table.insert(query.constraints, { op = "==", version = deps.parse_version(version)})
+      table.insert(query.constraints, { op = "==", version = vers.parse_version(version)})
    end
    return query
 end
@@ -262,7 +246,7 @@ local function pick_latest_version(name, versions)
 
    local vtables = {}
    for v, _ in pairs(versions) do
-      table.insert(vtables, deps.parse_version(v))
+      table.insert(vtables, vers.parse_version(v))
    end
    table.sort(vtables)
    local version = vtables[#vtables].string
@@ -355,7 +339,7 @@ function search.print_results(results, porcelain)
       if not porcelain then
          util.printout(package)
       end
-      for version, repos in util.sortedpairs(versions, deps.compare_versions) do
+      for version, repos in util.sortedpairs(versions, vers.compare_versions) do
          for _, repo in ipairs(repos) do
             repo.repo = dir.normalize(repo.repo)
             if porcelain then
@@ -371,28 +355,6 @@ function search.print_results(results, porcelain)
    end
 end
 
---- Splits a list of search results into two lists, one for "source" results
--- to be used with the "build" command, and one for "binary" results to be
--- used with the "install" command.
--- @param results table: A search results table.
--- @return (table, table): Two tables, one for source and one for binary
--- results.
-local function split_source_and_binary_results(results)
-   local sources, binaries = {}, {}
-   for name, versions in pairs(results) do
-      for version, repositories in pairs(versions) do
-         for _, repo in ipairs(repositories) do
-            local where = sources
-            if repo.arch == "all" or repo.arch == cfg.arch then
-               where = binaries
-            end
-            store_result(where, name, version, repo.arch, repo.repo)
-         end
-      end
-   end
-   return sources, binaries
-end
-
 --- Given a name and optionally a version, try to find in the rocks
 -- servers a single .src.rock or .rockspec file that satisfies
 -- the request, and run the given function on it; or display to the
@@ -440,7 +402,7 @@ function search.pick_installed_rock(name, version, given_tree)
    local package, versions = util.sortedpairs(results)()
    --question: what do we do about multiple versions? This should
    --give us the latest version on the last repo (which is usually the global one)
-   for vs, repositories in util.sortedpairs(versions, deps.compare_versions) do
+   for vs, repositories in util.sortedpairs(versions, vers.compare_versions) do
       if not version then version = vs end
       for _, rp in ipairs(repositories) do repo_url = rp.repo end
    end
@@ -449,35 +411,4 @@ function search.pick_installed_rock(name, version, given_tree)
    return name, version, repo, repo_url
 end
 
---- Driver function for "search" command.
--- @param name string: A substring of a rock name to search.
--- @param version string or nil: a version may also be passed.
--- @return boolean or (nil, string): True if build was successful; nil and an
--- error message otherwise.
-function search.command(flags, name, version)
-   if flags["all"] then
-      name, version = "", nil
-   end
-
-   if type(name) ~= "string" and not flags["all"] then
-      return nil, "Enter name and version or use --all. "..util.see_help("search")
-   end
-   
-   local query = search.make_query(name:lower(), version)
-   query.exact_name = false
-   local results, err = search.search_repos(query)
-   local porcelain = flags["porcelain"]
-   util.title("Search results:", porcelain, "=")
-   local sources, binaries = split_source_and_binary_results(results)
-   if next(sources) and not flags["binary"] then
-      util.title("Rockspecs and source rocks:", porcelain)
-      search.print_results(sources, porcelain)
-   end
-   if next(binaries) and not flags["source"] then    
-      util.title("Binary and pure-Lua rocks:", porcelain)
-      search.print_results(binaries, porcelain)
-   end
-   return true
-end
-
 return search
diff --git a/src/luarocks/tools/tar.lua b/src/luarocks/tools/tar.lua
index 637a6c95..ae5c83e2 100644
--- a/src/luarocks/tools/tar.lua
+++ b/src/luarocks/tools/tar.lua
@@ -56,10 +56,11 @@ end
 local function read_header_block(block)
    local header = {}
    header.name = nullterm(block:sub(1,100))
-   header.mode = nullterm(block:sub(101,108))
+   header.mode = nullterm(block:sub(101,108)):gsub(" ", "")
    header.uid = octal_to_number(nullterm(block:sub(109,116)))
    header.gid = octal_to_number(nullterm(block:sub(117,124)))
    header.size = octal_to_number(nullterm(block:sub(125,136)))
+print("{"..block:sub(125,136).."}", "{"..nullterm(block:sub(125,136)).."}", "{"..octal_to_number(nullterm(block:sub(125,136))).."}", header.size)
    header.mtime = octal_to_number(nullterm(block:sub(137,148)))
    header.chksum = octal_to_number(nullterm(block:sub(149,156)))
    header.typeflag = get_typeflag(block:sub(157,157))
@@ -93,13 +94,14 @@ function tar.untar(filename, destdir)
    local long_name, long_link_name
    while true do
       local block
-      repeat 
+      repeat
          block = tar_handle:read(blocksize)
       until (not block) or checksum_header(block) > 256
       if not block then break end
       local header, err = read_header_block(block)
       if not header then
          util.printerr(err)
+         return nil, err
       end
 
       local file_data = tar_handle:read(math.ceil(header.size / blocksize) * blocksize):sub(1,header.size)
diff --git a/src/luarocks/type_check.lua b/src/luarocks/type_check.lua
index 63c59ca2..4b7e68d7 100644
--- a/src/luarocks/type_check.lua
+++ b/src/luarocks/type_check.lua
@@ -2,16 +2,15 @@
 -- Functions and definitions for doing a basic lint check on files
 -- loaded by LuaRocks.
 local type_check = {}
-package.loaded["luarocks.type_check"] = type_check
+setmetatable(type_check, { __index = require("luarocks.core.type_check") })
 
-local cfg = require("luarocks.cfg")
-local deps = require("luarocks.deps")
+type_check.rockspec_format = "3.0"
 
-type_check.rockspec_format = "1.1"
+local string_1 = type_check.string_1
+local mandatory_string_1 = type_check.mandatory_string_1
 
-local string_1 = { _type = "string" }
-local number_1 = { _type = "number" }
-local mandatory_string_1 = { _type = "string", _mandatory = true }
+local string_3 = { _type = "string", _version = "3.0" }
+local list_of_strings_3 = { _any = string_3, _version = "3.0" }
 
 -- Syntax for type-checking tables:
 --
@@ -37,6 +36,8 @@ local rockspec_types = {
       homepage = string_1,
       license = string_1,
       maintainer = string_1,
+      labels = list_of_strings_3,
+      issues_url = string_3,
    },
    dependencies = {
       platforms = {}, -- recursively defined below
@@ -112,206 +113,6 @@ rockspec_types.external_dependencies.platforms._any = rockspec_types.external_de
 rockspec_types.source.platforms._any = rockspec_types.source
 rockspec_types.hooks.platforms._any = rockspec_types.hooks
 
-local manifest_types = {
-   repository = {
-      _mandatory = true,
-      -- packages
-      _any = {
-         -- versions
-         _any = {
-            -- items
-            _any = {
-               arch = mandatory_string_1,
-               modules = { _any = string_1 },
-               commands = { _any = string_1 },
-               dependencies = { _any = string_1 },
-               -- TODO: to be extended with more metadata.
-            }
-         }
-      }
-   },
-   modules = {
-      _mandatory = true,
-      -- modules
-      _any = {
-         -- providers
-         _any = string_1
-      }
-   },
-   commands = {
-      _mandatory = true,
-      -- modules
-      _any = {
-         -- commands
-         _any = string_1
-      }
-   },
-   dependencies = {
-      -- each module
-      _any = {
-         -- each version
-         _any = {
-            -- each dependency
-            _any = {
-               name = string_1,
-               constraints = {
-                  _any = {
-                     no_upgrade = { _type = "boolean" },
-                     op = string_1,
-                     version = {
-                        string = string_1,
-                        _any = number_1,
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-}
-
-local function check_version(version, typetbl, context)
-   local typetbl_version = typetbl._version or "1.0"
-   if deps.compare_versions(typetbl_version, version) then
-      if context == "" then
-         return nil, "Invalid rockspec_format version number in rockspec? Please fix rockspec accordingly."
-      else
-         return nil, context.." is not supported in rockspec format "..version.." (requires version "..typetbl_version.."), please fix the rockspec_format field accordingly."
-      end
-   end
-   return true
-end
-
-local type_check_table
-
---- Type check an object.
--- The object is compared against an archetypical value
--- matching the expected type -- the actual values don't matter,
--- only their types. Tables are type checked recursively.
--- @param version string: The version of the item.
--- @param item any: The object being checked.
--- @param typetbl any: The type-checking table for the object.
--- @param context string: A string indicating the "context" where the
--- error occurred (the full table path), for error messages.
--- @return boolean or (nil, string): true if type checking
--- succeeded, or nil and an error message if it failed.
--- @see type_check_table
-local function type_check_item(version, item, typetbl, context)
-   assert(type(version) == "string")
-   
-   local ok, err = check_version(version, typetbl, context)
-   if not ok then
-      return nil, err
-   end
-   
-   local item_type = type(item) or "nil"
-   local expected_type = typetbl._type or "table"
-   
-   if expected_type == "number" then
-      if not tonumber(item) then
-         return nil, "Type mismatch on field "..context..": expected a number"
-      end
-   elseif expected_type == "string" then
-      if item_type ~= "string" then
-         return nil, "Type mismatch on field "..context..": expected a string, got "..item_type
-      end
-      if typetbl._pattern then
-         if not item:match("^"..typetbl._pattern.."$") then
-            return nil, "Type mismatch on field "..context..": invalid value "..item.." does not match '"..typetbl._pattern.."'"
-         end
-      end
-   elseif expected_type == "table" then
-      if item_type ~= expected_type then
-         return nil, "Type mismatch on field "..context..": expected a table"
-      else
-         return type_check_table(version, item, typetbl, context)
-      end
-   elseif item_type ~= expected_type then
-      return nil, "Type mismatch on field "..context..": expected "..expected_type
-   end
-   return true
-end
-
-local function mkfield(context, field)
-   if context == "" then
-      return tostring(field)
-   elseif type(field) == "string" then
-      return context.."."..field
-   else
-      return context.."["..tostring(field).."]"
-   end
-end
-
---- Type check the contents of a table.
--- The table's contents are compared against a reference table,
--- which contains the recognized fields, with archetypical values
--- matching the expected types -- the actual values of items in the
--- reference table don't matter, only their types (ie, for field x
--- in tbl that is correctly typed, type(tbl.x) == type(types.x)).
--- If the reference table contains a field called MORE, then
--- unknown fields in the checked table are accepted.
--- If it contains a field called ANY, then its type will be 
--- used to check any unknown fields. If a field is prefixed
--- with MUST_, it is mandatory; its absence from the table is
--- a type error.
--- Tables are type checked recursively.
--- @param version string: The version of tbl.
--- @param tbl table: The table to be type checked.
--- @param typetbl table: The type-checking table, containing
--- values for recognized fields in the checked table.
--- @param context string: A string indicating the "context" where the
--- error occurred (such as the name of the table the item is a part of),
--- to be used by error messages.
--- @return boolean or (nil, string): true if type checking
--- succeeded, or nil and an error message if it failed.
-type_check_table = function(version, tbl, typetbl, context)
-   assert(type(version) == "string")
-   assert(type(tbl) == "table")
-   assert(type(typetbl) == "table")
-   
-   local ok, err = check_version(version, typetbl, context)
-   if not ok then
-      return nil, err
-   end
-   
-   for k, v in pairs(tbl) do
-      local t = typetbl[k] or typetbl._any
-      if t then 
-         local ok, err = type_check_item(version, v, t, mkfield(context, k))
-         if not ok then return nil, err end
-      elseif typetbl._more then
-         -- Accept unknown field
-      else
-         if not cfg.accept_unknown_fields then
-            return nil, "Unknown field "..k
-         end
-      end
-   end
-   for k, v in pairs(typetbl) do
-      if k:sub(1,1) ~= "_" and v._mandatory then
-         if not tbl[k] then
-            return nil, "Mandatory field "..mkfield(context, k).." is missing."
-         end
-      end
-   end
-   return true
-end
-
-local function check_undeclared_globals(globals, typetbl)
-   local undeclared = {}
-   for glob, _ in pairs(globals) do
-      if not (typetbl[glob] or typetbl["MUST_"..glob]) then
-         table.insert(undeclared, glob)
-      end
-   end
-   if #undeclared == 1 then
-      return nil, "Unknown variable: "..undeclared[1]
-   elseif #undeclared > 1 then
-      return nil, "Unknown variables: "..table.concat(undeclared, ", ")
-   end
-   return true
-end
-
 --- Type check a rockspec table.
 -- Verify the correctness of elements from a 
 -- rockspec table, reporting on unknown fields and type
@@ -323,22 +124,9 @@ function type_check.type_check_rockspec(rockspec, globals)
    if not rockspec.rockspec_format then
       rockspec.rockspec_format = "1.0"
    end
-   local ok, err = check_undeclared_globals(globals, rockspec_types)
-   if not ok then return nil, err end
-   return type_check_table(rockspec.rockspec_format, rockspec, rockspec_types, "")
-end
-
---- Type check a manifest table.
--- Verify the correctness of elements from a 
--- manifest table, reporting on unknown fields and type
--- mismatches.
--- @return boolean or (nil, string): true if type checking
--- succeeded, or nil and an error message if it failed.
-function type_check.type_check_manifest(manifest, globals)
-   assert(type(manifest) == "table")
-   local ok, err = check_undeclared_globals(globals, manifest_types)
+   local ok, err = type_check.check_undeclared_globals(globals, rockspec_types)
    if not ok then return nil, err end
-   return type_check_table("1.0", manifest, manifest_types, "")
+   return type_check.type_check_table(rockspec.rockspec_format, rockspec, rockspec_types, "")
 end
 
 return type_check
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua
index 2f0fa815..99162e75 100644
--- a/src/luarocks/upload/api.lua
+++ b/src/luarocks/upload/api.lua
@@ -1,7 +1,7 @@
 
 local api = {}
 
-local cfg = require("luarocks.cfg")
+local cfg = require("luarocks.core.cfg")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index c9fb7d63..2c4724f4 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -2,9 +2,10 @@
 --- Assorted utilities for managing tables, plus a scheduler for rollback functions.
 -- Does not requires modules directly (only as locals
 -- inside specific functions) to avoid interdependencies,
--- as this is used in the bootstrapping stage of luarocks.cfg.
+-- as this is used in the bootstrapping stage of luarocks.core.cfg.
 
 local util = {}
+setmetatable(util, { __index = require("luarocks.core.util") })
 
 local unpack = unpack or table.unpack
 
@@ -86,7 +87,9 @@ local supported_flags = {
    ["help"] = true,
    ["home"] = true,
    ["homepage"] = "\"<url>\"",
+   ["issues"] = true,
    ["keep"] = true,
+   ["labels"] = true,
    ["lib"] = "<library>",
    ["license"] = "\"<text>\"",
    ["list"] = true,
@@ -196,34 +199,6 @@ function util.parse_flags(...)
    return flags, unpack(out)
 end
 
--- Adds legacy 'run' function to a command module.
--- @param command table: command module with 'command' function,
--- the added 'run' function calls it after parseing command-line arguments.
-function util.add_run_function(command)
-   command.run = function(...) return command.command(util.parse_flags(...)) end
-end
-
---- Merges contents of src on top of dst's contents.
--- @param dst Destination table, which will receive src's contents.
--- @param src Table which provides new contents to dst.
--- @see platform_overrides
-function util.deep_merge(dst, src)
-   for k, v in pairs(src) do
-      if type(v) == "table" then
-         if not dst[k] then
-            dst[k] = {}
-         end
-         if type(dst[k]) == "table" then
-            util.deep_merge(dst[k], v)
-         else
-            dst[k] = v
-         end
-      else
-         dst[k] = v
-      end
-   end
-end
-
 --- Perform platform-specific overrides on a table.
 -- Overrides values of table with the contents of the appropriate
 -- subset of its "platforms" field. The "platforms" field should
@@ -240,7 +215,7 @@ end
 function util.platform_overrides(tbl)
    assert(type(tbl) == "table" or not tbl)
    
-   local cfg = require("luarocks.cfg")
+   local cfg = require("luarocks.core.cfg")
    
    if not tbl then return end
    
@@ -257,19 +232,6 @@ end
 
 local var_format_pattern = "%$%((%a[%a%d_]+)%)"
 
---- Create a new shallow copy of a table: a new table with
--- the same keys and values. Keys point to the same objects as
--- the original table (ie, does not copy recursively).
--- @param tbl table: the input table
--- @return table: a new table with the same contents.
-function util.make_shallow_copy(tbl)
-   local copy = {}
-   for k,v in pairs(tbl) do
-      copy[k] = v
-   end
-   return copy
-end
-
 -- Check if a set of needed variables are referenced
 -- somewhere in a list of definitions, warning the user
 -- about any unused ones. Each key in needed_set should
@@ -332,86 +294,6 @@ function util.variable_substitutions(tbl, vars)
    end
 end
 
---- Return an array of keys of a table.
--- @param tbl table: The input table.
--- @return table: The array of keys.
-function util.keys(tbl)
-   local ks = {}
-   for k,_ in pairs(tbl) do
-      table.insert(ks, k)
-   end
-   return ks
-end
-
-local function default_sort(a, b)
-   local ta = type(a)
-   local tb = type(b)
-   if ta == "number" and tb == "number" then
-      return a < b
-   elseif ta == "number" then
-      return true
-   elseif tb == "number" then
-      return false
-   else
-      return tostring(a) < tostring(b)
-   end
-end
-
---- A table iterator generator that returns elements sorted by key,
--- to be used in "for" loops.
--- @param tbl table: The table to be iterated.
--- @param sort_function function or table or nil: An optional comparison function
--- to be used by table.sort when sorting keys, or an array listing an explicit order
--- for keys. If a value itself is an array, it is taken so that the first element
--- is a string representing the field name, and the second element is a priority table
--- for that key, which is returned by the iterator as the third value after the key
--- and the value.
--- @return function: the iterator function.
-function util.sortedpairs(tbl, sort_function)
-   sort_function = sort_function or default_sort
-   local keys = util.keys(tbl)
-   local sub_orders = {}
-
-   if type(sort_function) == "function" then
-      table.sort(keys, sort_function)
-   else
-      local order = sort_function
-      local ordered_keys = {}
-      local all_keys = keys
-      keys = {}
-
-      for _, order_entry in ipairs(order) do
-         local key, sub_order
-         if type(order_entry) == "table" then
-            key = order_entry[1]
-            sub_order = order_entry[2]
-         else
-            key = order_entry
-         end
-
-         if tbl[key] then
-            ordered_keys[key] = true
-            sub_orders[key] = sub_order
-            table.insert(keys, key)
-         end
-      end
-
-      table.sort(all_keys, default_sort)
-      for _, key in ipairs(all_keys) do
-         if not ordered_keys[key] then
-            table.insert(keys, key)
-         end
-      end
-   end
-
-   local i = 1
-   return function()
-      local key = keys[i]
-      i = i + 1
-      return key, tbl[key], sub_orders[key]
-   end
-end
-
 function util.lua_versions()
    local versions = { "5.1", "5.2", "5.3" }
    local i = 0
@@ -431,12 +313,6 @@ function util.printout(...)
    io.stdout:write("\n")
 end
 
---- Print a line to standard error
-function util.printerr(...)
-   io.stderr:write(table.concat({...},"\t"))
-   io.stderr:write("\n")
-end
-
 --- Display a warning message.
 -- @param msg string: the warning message
 function util.warning(msg)
@@ -465,7 +341,7 @@ function util.this_program(default)
 end
 
 function util.deps_mode_help(program)
-   local cfg = require("luarocks.cfg")
+   local cfg = require("luarocks.core.cfg")
    return [[
 --deps-mode=<mode>  How to handle dependencies. Four modes are supported:
                     * all - use all trees from the rocks_trees list
@@ -488,7 +364,7 @@ function util.see_help(command, program)
 end
 
 function util.announce_install(rockspec)
-   local cfg = require("luarocks.cfg")
+   local cfg = require("luarocks.core.cfg")
    local path = require("luarocks.path")
 
    local suffix = ""
@@ -511,7 +387,7 @@ local function collect_rockspecs(versions, paths, unnamed_paths, subdir)
    local fs = require("luarocks.fs")
    local dir = require("luarocks.dir")
    local path = require("luarocks.path")
-   local deps = require("luarocks.deps")
+   local vers = require("luarocks.vers")
 
    if fs.is_dir(subdir) then
       for file in fs.dir(subdir) do
@@ -521,7 +397,7 @@ local function collect_rockspecs(versions, paths, unnamed_paths, subdir)
             local rock, version = path.parse_name(file)
 
             if rock then
-               if not versions[rock] or deps.compare_versions(version, versions[rock]) then
+               if not versions[rock] or vers.compare_versions(version, versions[rock]) then
                   versions[rock] = version
                   paths[rock] = file
                end
@@ -566,135 +442,6 @@ function util.get_default_rockspec()
    end
 end
 
--- from http://lua-users.org/wiki/SplitJoin
--- by PhilippeLhoste
-function util.split_string(str, delim, maxNb)
-   -- Eliminate bad cases...
-   if string.find(str, delim) == nil then
-      return { str }
-   end
-   if maxNb == nil or maxNb < 1 then
-      maxNb = 0    -- No limit
-   end
-   local result = {}
-   local pat = "(.-)" .. delim .. "()"
-   local nb = 0
-   local lastPos
-   for part, pos in string.gmatch(str, pat) do
-      nb = nb + 1
-      result[nb] = part
-      lastPos = pos
-      if nb == maxNb then break end
-   end
-   -- Handle the last field
-   if nb ~= maxNb then
-      result[nb + 1] = string.sub(str, lastPos)
-   end
-   return result
-end
-
---- Remove repeated entries from a path-style string.
--- Example: given ("a;b;c;a;b;d", ";"), returns "a;b;c;d".
--- @param list string: A path string (from $PATH or package.path)
--- @param sep string: The separator
-function util.remove_path_dupes(list, sep)
-   assert(type(list) == "string")
-   assert(type(sep) == "string")
-   local parts = util.split_string(list, sep)
-   local final, entries = {}, {}
-   for _, part in ipairs(parts) do
-      part = part:gsub("//", "/")
-      if not entries[part] then
-         table.insert(final, part)
-         entries[part] = true
-      end
-   end
-   return table.concat(final, sep)
-end
-
----
--- Formats tables with cycles recursively to any depth.
--- References to other tables are shown as values.
--- Self references are indicated.
--- The string returned is "Lua code", which can be procesed
--- (in the case in which indent is composed by spaces or "--").
--- Userdata and function keys and values are shown as strings,
--- which logically are exactly not equivalent to the original code.
--- This routine can serve for pretty formating tables with
--- proper indentations, apart from printing them:
--- io.write(table.show(t, "t"))   -- a typical use
--- Written by Julio Manuel Fernandez-Diaz,
--- Heavily based on "Saving tables with cycles", PIL2, p. 113.
--- @param t table: is the table.
--- @param name string: is the name of the table (optional)
--- @param indent string: is a first indentation (optional).
--- @return string: the pretty-printed table
-function util.show_table(t, name, indent)
-   local cart     -- a container
-   local autoref  -- for self references
-
-   local function isemptytable(t) return next(t) == nil end
-   
-   local function basicSerialize (o)
-      local so = tostring(o)
-      if type(o) == "function" then
-         local info = debug.getinfo(o, "S")
-         -- info.name is nil because o is not a calling level
-         if info.what == "C" then
-            return ("%q"):format(so .. ", C function")
-         else 
-            -- the information is defined through lines
-            return ("%q"):format(so .. ", defined in (" .. info.linedefined .. "-" .. info.lastlinedefined .. ")" .. info.source)
-         end
-      elseif type(o) == "number" then
-         return so
-      else
-         return ("%q"):format(so)
-      end
-   end
-   
-   local function addtocart (value, name, indent, saved, field)
-      indent = indent or ""
-      saved = saved or {}
-      field = field or name
-      
-      cart = cart .. indent .. field
-      
-      if type(value) ~= "table" then
-         cart = cart .. " = " .. basicSerialize(value) .. ";\n"
-      else
-         if saved[value] then
-            cart = cart .. " = {}; -- " .. saved[value] .. " (self reference)\n"
-            autoref = autoref ..  name .. " = " .. saved[value] .. ";\n"
-         else
-            saved[value] = name
-            --if tablecount(value) == 0 then
-            if isemptytable(value) then
-               cart = cart .. " = {};\n"
-            else
-               cart = cart .. " = {\n"
-               for k, v in pairs(value) do
-                  k = basicSerialize(k)
-                  local fname = ("%s[%s]"):format(name, k)
-                  field = ("[%s]"):format(k)
-                  -- three spaces between levels
-                  addtocart(v, fname, indent .. "   ", saved, field)
-               end
-               cart = cart .. indent .. "};\n"
-            end
-         end
-      end
-   end
-   
-   name = name or "__unnamed__"
-   if type(t) ~= "table" then
-      return name .. " = " .. basicSerialize(t)
-   end
-   cart, autoref = "", ""
-   addtocart(t, name, indent)
-   return cart .. autoref
-end
-
 function util.array_contains(tbl, value)
    for _, v in ipairs(tbl) do
       if v == value then
diff --git a/src/luarocks/validate.lua b/src/luarocks/validate.lua
deleted file mode 100644
index c4570aa4..00000000
--- a/src/luarocks/validate.lua
+++ /dev/null
@@ -1,159 +0,0 @@
-
---- Sandboxed test of build/install of all packages in a repository (unfinished and disabled).
-local validate = {}
-package.loaded["luarocks.validate"] = validate
-
-local fs = require("luarocks.fs")
-local dir = require("luarocks.dir")
-local path = require("luarocks.path")
-local cfg = require("luarocks.cfg")
-local build = require("luarocks.build")
-local install = require("luarocks.install")
-local util = require("luarocks.util")
-
-util.add_run_function(validate)
-validate.help_summary = "Sandboxed test of build/install of all packages in a repository."
-
-validate.help = [[
-<argument>, if given, is a local repository pathname.
-]]
-
-local function save_settings(repo)
-   local protocol, path = dir.split_url(repo)
-   table.insert(cfg.rocks_servers, 1, protocol.."://"..path)
-   return {
-      root_dir = cfg.root_dir,
-      rocks_dir = cfg.rocks_dir,
-      deploy_bin_dir = cfg.deploy_bin_dir,
-      deploy_lua_dir = cfg.deploy_lua_dir,
-      deploy_lib_dir = cfg.deploy_lib_dir,
-   }
-end
-
-local function restore_settings(settings)
-   cfg.root_dir = settings.root_dir
-   cfg.rocks_dir = settings.rocks_dir
-   cfg.deploy_bin_dir = settings.deploy_bin_dir
-   cfg.deploy_lua_dir = settings.deploy_lua_dir
-   cfg.deploy_lib_dir = settings.deploy_lib_dir
-   cfg.variables.ROCKS_TREE = settings.rocks_dir
-   cfg.variables.SCRIPTS_DIR = settings.deploy_bin_dir
-   table.remove(cfg.rocks_servers, 1)
-end
-
-local function prepare_sandbox(file)
-   local root_dir = fs.make_temp_dir(file):gsub("/+$", "")
-   cfg.root_dir = root_dir
-   cfg.rocks_dir = path.rocks_dir(root_dir)
-   cfg.deploy_bin_dir = path.deploy_bin_dir(root_dir)
-   cfg.variables.ROCKS_TREE = cfg.rocks_dir
-   cfg.variables.SCRIPTS_DIR = cfg.deploy_bin_dir
-   return root_dir
-end
-
-local function validate_rockspec(file)
-   local ok, err, errcode = build.build_rockspec(file, true, "one")
-   if not ok then
-      util.printerr(err)
-   end
-   return ok, err, errcode
-end
-
-local function validate_src_rock(file)
-   local ok, err, errcode = build.build_rock(file, false, "one")
-   if not ok then
-      util.printerr(err)
-   end
-   return ok, err, errcode
-end
-
-local function validate_rock(file)
-   local ok, err, errcode = install.install_binary_rock(file, "one")
-   if not ok then
-      util.printerr(err)
-   end
-   return ok, err, errcode
-end
-
-function validate.command(flags, repo)
-   repo = repo or cfg.rocks_dir
-
-   util.printout("Verifying contents of "..repo)
-
-   local results = {
-      ok = {}
-   }
-   local settings = save_settings(repo)
-   local sandbox
-   if flags["quick"] then
-      sandbox = prepare_sandbox("luarocks_validate")
-   end
-   if not fs.exists(repo) then
-      return nil, repo.." is not a local repository."
-   end
-   for file in fs.dir(repo) do for _=1,1 do
-      if file == "manifest" or file == "index.html" then
-         break -- continue for
-      end
-      local pathname = fs.absolute_name(dir.path(repo, file))
-      if not flags["quick"] then
-         sandbox = prepare_sandbox(file)
-      end
-      local ok, err, errcode
-      util.printout()
-      util.printout("Verifying "..pathname)
-      if file:match("%.rockspec$") then
-         ok, err, errcode = validate_rockspec(pathname, "one")
-      elseif file:match("%.src%.rock$") then
-         ok, err, errcode = validate_src_rock(pathname)
-      elseif file:match("%.rock$") then
-         ok, err, errcode = validate_rock(pathname)
-      end
-      if ok then
-         table.insert(results.ok, {file=file} )
-      else
-         if not errcode then
-            errcode = "misc"
-         end
-         if not results[errcode] then
-            results[errcode] = {}
-         end
-         table.insert(results[errcode], {file=file, err=err} )
-      end
-      util.run_scheduled_functions()
-      if not flags["quick"] then
-         fs.delete(sandbox)
-      end
-      repeat until not fs.pop_dir()
-   end end
-   if flags["quick"] then
-      fs.delete(sandbox)
-   end
-   restore_settings(settings)
-   util.title("Results:")
-   util.printout("OK: "..tostring(#results.ok))
-   for _, entry in ipairs(results.ok) do
-      util.printout(entry.file)
-   end
-   for errcode, errors in pairs(results) do
-      if errcode ~= "ok" then
-         util.printout()
-         util.printout(errcode.." errors: "..tostring(#errors))
-         for _, entry in ipairs(errors) do
-            util.printout(entry.file, entry.err)
-         end
-      end
-   end
-
-   util.title("Summary:")
-   local total = 0
-   for errcode, errors in pairs(results) do
-      util.printout(errcode..": "..tostring(#errors))
-      total = total + #errors
-   end
-   util.printout("Total: "..total)
-   return true
-end
-
-
-return validate
diff --git a/src/luarocks/vers.lua b/src/luarocks/vers.lua
new file mode 100644
index 00000000..6ce5d738
--- /dev/null
+++ b/src/luarocks/vers.lua
@@ -0,0 +1,138 @@
+
+--- Dependency format handling functions.
+-- Dependencies are represented in LuaRocks through strings with
+-- a package name followed by a comma-separated list of constraints.
+-- Each constraint consists of an operator and a version number.
+-- In this string format, version numbers are represented as
+-- naturally as possible, like they are used by upstream projects
+-- (e.g. "2.0beta3"). Internally, LuaRocks converts them to a purely
+-- numeric representation, allowing comparison following some
+-- "common sense" heuristics. The precise specification of the
+-- comparison criteria is the source code of this module.
+local vers = {}
+setmetatable(vers, { __index = require("luarocks.core.vers") })
+
+--- Check if rockspec format version satisfies version requirement.
+-- @param rockspec table: The rockspec table.
+-- @param version string: required version.
+-- @return boolean: true if rockspec format matches version or is newer, false otherwise.
+function vers.format_is_at_least(rockspec, version)
+   local rockspec_format = rockspec.rockspec_format or "1.0"
+   return vers.parse_version(rockspec_format) >= vers.parse_version(version)
+end
+
+local operators = {
+   ["=="] = "==",
+   ["~="] = "~=",
+   [">"] = ">",
+   ["<"] = "<",
+   [">="] = ">=",
+   ["<="] = "<=",
+   ["~>"] = "~>",
+   -- plus some convenience translations
+   [""] = "==",
+   ["="] = "==",
+   ["!="] = "~="
+}
+
+--- Consumes a constraint from a string, converting it to table format.
+-- For example, a string ">= 1.0, > 2.0" is converted to a table in the
+-- format {op = ">=", version={1,0}} and the rest, "> 2.0", is returned
+-- back to the caller.
+-- @param input string: A list of constraints in string format.
+-- @return (table, string) or nil: A table representing the same
+-- constraints and the string with the unused input, or nil if the
+-- input string is invalid.
+local function parse_constraint(input)
+   assert(type(input) == "string")
+
+   local no_upgrade, op, version, rest = input:match("^(@?)([<>=~!]*)%s*([%w%.%_%-]+)[%s,]*(.*)")
+   local _op = operators[op]
+   version = vers.parse_version(version)
+   if not _op then
+      return nil, "Encountered bad constraint operator: '"..tostring(op).."' in '"..input.."'"
+   end
+   if not version then 
+      return nil, "Could not parse version from constraint: '"..input.."'"
+   end
+   return { op = _op, version = version, no_upgrade = no_upgrade=="@" and true or nil }, rest
+end
+
+--- Convert a list of constraints from string to table format.
+-- For example, a string ">= 1.0, < 2.0" is converted to a table in the format
+-- {{op = ">=", version={1,0}}, {op = "<", version={2,0}}}.
+-- Version tables use a metatable allowing later comparison through
+-- relational operators.
+-- @param input string: A list of constraints in string format.
+-- @return table or nil: A table representing the same constraints,
+-- or nil if the input string is invalid.
+function vers.parse_constraints(input)
+   assert(type(input) == "string")
+
+   local constraints, oinput, constraint = {}, input
+   while #input > 0 do
+      constraint, input = parse_constraint(input)
+      if constraint then
+         table.insert(constraints, constraint)
+      else
+         return nil, "Failed to parse constraint '"..tostring(oinput).."' with error: ".. input
+      end
+   end
+   return constraints
+end
+
+--- Convert a dependency from string to table format.
+-- For example, a string "foo >= 1.0, < 2.0"
+-- is converted to a table in the format
+-- {name = "foo", constraints = {{op = ">=", version={1,0}},
+-- {op = "<", version={2,0}}}}. Version tables use a metatable
+-- allowing later comparison through relational operators.
+-- @param dep string: A dependency in string format
+-- as entered in rockspec files.
+-- @return table or nil: A table representing the same dependency relation,
+-- or nil if the input string is invalid.
+function vers.parse_dep(dep)
+   assert(type(dep) == "string")
+
+   local name, rest = dep:match("^%s*([a-zA-Z0-9][a-zA-Z0-9%.%-%_]*)%s*(.*)")
+   if not name then return nil, "failed to extract dependency name from '"..tostring(dep).."'" end
+   local constraints, err = vers.parse_constraints(rest)
+   if not constraints then return nil, err end
+   return { name = name, constraints = constraints }
+end
+
+--- Convert a version table to a string.
+-- @param v table: The version table
+-- @param internal boolean or nil: Whether to display versions in their
+-- internal representation format or how they were specified.
+-- @return string: The dependency information pretty-printed as a string.
+function vers.show_version(v, internal)
+   assert(type(v) == "table")
+   assert(type(internal) == "boolean" or not internal)
+
+   return (internal
+           and table.concat(v, ":")..(v.revision and tostring(v.revision) or "")
+           or v.string)
+end
+
+--- Convert a dependency in table format to a string.
+-- @param dep table: The dependency in table format
+-- @param internal boolean or nil: Whether to display versions in their
+-- internal representation format or how they were specified.
+-- @return string: The dependency information pretty-printed as a string.
+function vers.show_dep(dep, internal)
+   assert(type(dep) == "table")
+   assert(type(internal) == "boolean" or not internal)
+
+   if #dep.constraints > 0 then
+      local pretty = {}
+      for _, c in ipairs(dep.constraints) do
+         table.insert(pretty, c.op .. " " .. vers.show_version(c.version, internal))
+      end
+      return dep.name.." "..table.concat(pretty, ", ")
+   else
+      return dep.name
+   end
+end
+
+return vers