diff --git a/v2/.gometalinter.json b/.gometalinter.json similarity index 100% rename from v2/.gometalinter.json rename to .gometalinter.json diff --git a/v2/.goreleaser.yml b/.goreleaser.yml similarity index 100% rename from v2/.goreleaser.yml rename to .goreleaser.yml diff --git a/v2/.goreleaser.yml.plush b/.goreleaser.yml.plush similarity index 100% rename from v2/.goreleaser.yml.plush rename to .goreleaser.yml.plush diff --git a/v2/LICENSE.txt b/LICENSE.txt similarity index 100% rename from v2/LICENSE.txt rename to LICENSE.txt diff --git a/v2/Makefile b/Makefile similarity index 100% rename from v2/Makefile rename to Makefile diff --git a/v2/README.md b/README.md similarity index 100% rename from v2/README.md rename to README.md diff --git a/v2/SHOULDERS.md b/SHOULDERS.md similarity index 100% rename from v2/SHOULDERS.md rename to SHOULDERS.md diff --git a/v2/_fixtures/http_test/css/main.css b/_fixtures/http_test/css/main.css similarity index 100% rename from v2/_fixtures/http_test/css/main.css rename to _fixtures/http_test/css/main.css diff --git a/v2/_fixtures/http_test/footer.html b/_fixtures/http_test/footer.html similarity index 100% rename from v2/_fixtures/http_test/footer.html rename to _fixtures/http_test/footer.html diff --git a/v2/_fixtures/http_test/index.html b/_fixtures/http_test/index.html similarity index 100% rename from v2/_fixtures/http_test/index.html rename to _fixtures/http_test/index.html diff --git a/v2/_fixtures/http_test/sub/index.html b/_fixtures/http_test/sub/index.html similarity index 100% rename from v2/_fixtures/http_test/sub/index.html rename to _fixtures/http_test/sub/index.html diff --git a/v2/_fixtures/import_pkg/import_pkg.go b/_fixtures/import_pkg/import_pkg.go similarity index 100% rename from v2/_fixtures/import_pkg/import_pkg.go rename to _fixtures/import_pkg/import_pkg.go diff --git a/v2/_fixtures/import_pkg/import_pkg_test.go b/_fixtures/import_pkg/import_pkg_test.go similarity index 100% rename from v2/_fixtures/import_pkg/import_pkg_test.go rename to _fixtures/import_pkg/import_pkg_test.go diff --git a/v2/_fixtures/import_pkg/pkg_test/1.txt b/_fixtures/import_pkg/pkg_test/1.txt similarity index 100% rename from v2/_fixtures/import_pkg/pkg_test/1.txt rename to _fixtures/import_pkg/pkg_test/1.txt diff --git a/v2/_fixtures/import_pkg/pkg_test/2.txt b/_fixtures/import_pkg/pkg_test/2.txt similarity index 100% rename from v2/_fixtures/import_pkg/pkg_test/2.txt rename to _fixtures/import_pkg/pkg_test/2.txt diff --git a/v2/_fixtures/list_test/a.txt b/_fixtures/list_test/a.txt similarity index 100% rename from v2/_fixtures/list_test/a.txt rename to _fixtures/list_test/a.txt diff --git a/v2/_fixtures/list_test/b/b.txt b/_fixtures/list_test/b/b.txt similarity index 100% rename from v2/_fixtures/list_test/b/b.txt rename to _fixtures/list_test/b/b.txt diff --git a/v2/_fixtures/list_test/b/b2.txt b/_fixtures/list_test/b/b2.txt similarity index 100% rename from v2/_fixtures/list_test/b/b2.txt rename to _fixtures/list_test/b/b2.txt diff --git a/v2/_fixtures/list_test/c/c.txt b/_fixtures/list_test/c/c.txt similarity index 100% rename from v2/_fixtures/list_test/c/c.txt rename to _fixtures/list_test/c/c.txt diff --git a/v2/_fixtures/templates/foo.txt b/_fixtures/templates/foo.txt similarity index 100% rename from v2/_fixtures/templates/foo.txt rename to _fixtures/templates/foo.txt diff --git a/v2/box.go b/box.go similarity index 100% rename from v2/box.go rename to box.go diff --git a/v2/box_import_test.go b/box_import_test.go similarity index 100% rename from v2/box_import_test.go rename to box_import_test.go diff --git a/v2/box_map.go b/box_map.go similarity index 100% rename from v2/box_map.go rename to box_map.go diff --git a/v2/box_map_test.go b/box_map_test.go similarity index 100% rename from v2/box_map_test.go rename to box_map_test.go diff --git a/v2/box_test.go b/box_test.go similarity index 100% rename from v2/box_test.go rename to box_test.go diff --git a/v2/deprecated.go b/deprecated.go similarity index 100% rename from v2/deprecated.go rename to deprecated.go diff --git a/v2/deprecated_test.go b/deprecated_test.go similarity index 100% rename from v2/deprecated_test.go rename to deprecated_test.go diff --git a/v2/dirs_map.go b/dirs_map.go similarity index 100% rename from v2/dirs_map.go rename to dirs_map.go diff --git a/v2/file/file.go b/file/file.go similarity index 100% rename from v2/file/file.go rename to file/file.go diff --git a/v2/file/info.go b/file/info.go similarity index 100% rename from v2/file/info.go rename to file/info.go diff --git a/v2/file/resolver/_fixtures/templates/foo.txt b/file/resolver/_fixtures/templates/foo.txt similarity index 100% rename from v2/file/resolver/_fixtures/templates/foo.txt rename to file/resolver/_fixtures/templates/foo.txt diff --git a/v2/file/resolver/disk.go b/file/resolver/disk.go similarity index 100% rename from v2/file/resolver/disk.go rename to file/resolver/disk.go diff --git a/v2/file/resolver/disk_test.go b/file/resolver/disk_test.go similarity index 100% rename from v2/file/resolver/disk_test.go rename to file/resolver/disk_test.go diff --git a/v2/file/resolver/encoding/hex/hex.go b/file/resolver/encoding/hex/hex.go similarity index 100% rename from v2/file/resolver/encoding/hex/hex.go rename to file/resolver/encoding/hex/hex.go diff --git a/v2/file/resolver/hex_gzip.go b/file/resolver/hex_gzip.go similarity index 100% rename from v2/file/resolver/hex_gzip.go rename to file/resolver/hex_gzip.go diff --git a/v2/file/resolver/hex_gzip_test.go b/file/resolver/hex_gzip_test.go similarity index 100% rename from v2/file/resolver/hex_gzip_test.go rename to file/resolver/hex_gzip_test.go diff --git a/v2/file/resolver/ident.go b/file/resolver/ident.go similarity index 100% rename from v2/file/resolver/ident.go rename to file/resolver/ident.go diff --git a/v2/file/resolver/ident_test.go b/file/resolver/ident_test.go similarity index 100% rename from v2/file/resolver/ident_test.go rename to file/resolver/ident_test.go diff --git a/v2/file/resolver/in_memory.go b/file/resolver/in_memory.go similarity index 100% rename from v2/file/resolver/in_memory.go rename to file/resolver/in_memory.go diff --git a/v2/file/resolver/in_memory_test.go b/file/resolver/in_memory_test.go similarity index 100% rename from v2/file/resolver/in_memory_test.go rename to file/resolver/in_memory_test.go diff --git a/v2/file/resolver/packable.go b/file/resolver/packable.go similarity index 100% rename from v2/file/resolver/packable.go rename to file/resolver/packable.go diff --git a/v2/file/resolver/resolver.go b/file/resolver/resolver.go similarity index 100% rename from v2/file/resolver/resolver.go rename to file/resolver/resolver.go diff --git a/v2/file/resolver/resolver_test.go b/file/resolver/resolver_test.go similarity index 100% rename from v2/file/resolver/resolver_test.go rename to file/resolver/resolver_test.go diff --git a/v2/go.mod b/go.mod similarity index 100% rename from v2/go.mod rename to go.mod diff --git a/v2/go.sum b/go.sum similarity index 100% rename from v2/go.sum rename to go.sum diff --git a/v2/helpers.go b/helpers.go similarity index 100% rename from v2/helpers.go rename to helpers.go diff --git a/v2/http_box_test.go b/http_box_test.go similarity index 100% rename from v2/http_box_test.go rename to http_box_test.go diff --git a/v2/internal/envy.go b/internal/envy.go similarity index 100% rename from v2/internal/envy.go rename to internal/envy.go diff --git a/v2/jam/pack.go b/jam/pack.go similarity index 100% rename from v2/jam/pack.go rename to jam/pack.go diff --git a/v2/jam/parser/_fixtures/new_from_roots/_r/r.go b/jam/parser/_fixtures/new_from_roots/_r/r.go similarity index 100% rename from v2/jam/parser/_fixtures/new_from_roots/_r/r.go rename to jam/parser/_fixtures/new_from_roots/_r/r.go diff --git a/v2/jam/parser/_fixtures/new_from_roots/e/e.go b/jam/parser/_fixtures/new_from_roots/e/e.go similarity index 100% rename from v2/jam/parser/_fixtures/new_from_roots/e/e.go rename to jam/parser/_fixtures/new_from_roots/e/e.go diff --git a/v2/jam/parser/_fixtures/new_from_roots/q.go b/jam/parser/_fixtures/new_from_roots/q.go similarity index 100% rename from v2/jam/parser/_fixtures/new_from_roots/q.go rename to jam/parser/_fixtures/new_from_roots/q.go diff --git a/v2/jam/parser/_fixtures/new_from_roots/w/w.go b/jam/parser/_fixtures/new_from_roots/w/w.go similarity index 100% rename from v2/jam/parser/_fixtures/new_from_roots/w/w.go rename to jam/parser/_fixtures/new_from_roots/w/w.go diff --git a/v2/jam/parser/args.go b/jam/parser/args.go similarity index 100% rename from v2/jam/parser/args.go rename to jam/parser/args.go diff --git a/v2/jam/parser/box.go b/jam/parser/box.go similarity index 100% rename from v2/jam/parser/box.go rename to jam/parser/box.go diff --git a/v2/jam/parser/file.go b/jam/parser/file.go similarity index 100% rename from v2/jam/parser/file.go rename to jam/parser/file.go diff --git a/v2/jam/parser/finder.go b/jam/parser/finder.go similarity index 100% rename from v2/jam/parser/finder.go rename to jam/parser/finder.go diff --git a/v2/jam/parser/gogen.go b/jam/parser/gogen.go similarity index 100% rename from v2/jam/parser/gogen.go rename to jam/parser/gogen.go diff --git a/v2/jam/parser/parser.go b/jam/parser/parser.go similarity index 100% rename from v2/jam/parser/parser.go rename to jam/parser/parser.go diff --git a/v2/jam/parser/parser_test.go b/jam/parser/parser_test.go similarity index 100% rename from v2/jam/parser/parser_test.go rename to jam/parser/parser_test.go diff --git a/v2/jam/parser/prospect.go b/jam/parser/prospect.go similarity index 100% rename from v2/jam/parser/prospect.go rename to jam/parser/prospect.go diff --git a/v2/jam/parser/prospect_test.go b/jam/parser/prospect_test.go similarity index 100% rename from v2/jam/parser/prospect_test.go rename to jam/parser/prospect_test.go diff --git a/v2/jam/parser/roots.go b/jam/parser/roots.go similarity index 100% rename from v2/jam/parser/roots.go rename to jam/parser/roots.go diff --git a/v2/jam/parser/visitor.go b/jam/parser/visitor.go similarity index 100% rename from v2/jam/parser/visitor.go rename to jam/parser/visitor.go diff --git a/v2/jam/parser/visitor_test.go b/jam/parser/visitor_test.go similarity index 100% rename from v2/jam/parser/visitor_test.go rename to jam/parser/visitor_test.go diff --git a/v2/jam/store/_fixtures/disk-pack/a/a.go b/jam/store/_fixtures/disk-pack/a/a.go similarity index 100% rename from v2/jam/store/_fixtures/disk-pack/a/a.go rename to jam/store/_fixtures/disk-pack/a/a.go diff --git a/v2/jam/store/_fixtures/disk-pack/b/b.go b/jam/store/_fixtures/disk-pack/b/b.go similarity index 100% rename from v2/jam/store/_fixtures/disk-pack/b/b.go rename to jam/store/_fixtures/disk-pack/b/b.go diff --git a/v2/jam/store/_fixtures/disk-pack/c/d.txt b/jam/store/_fixtures/disk-pack/c/d.txt similarity index 100% rename from v2/jam/store/_fixtures/disk-pack/c/d.txt rename to jam/store/_fixtures/disk-pack/c/d.txt diff --git a/v2/jam/store/_fixtures/disk-pack/c/e.txt b/jam/store/_fixtures/disk-pack/c/e.txt similarity index 100% rename from v2/jam/store/_fixtures/disk-pack/c/e.txt rename to jam/store/_fixtures/disk-pack/c/e.txt diff --git a/v2/jam/store/_fixtures/disk-pack/c/f.txt b/jam/store/_fixtures/disk-pack/c/f.txt similarity index 100% rename from v2/jam/store/_fixtures/disk-pack/c/f.txt rename to jam/store/_fixtures/disk-pack/c/f.txt diff --git a/v2/jam/store/_fixtures/disk-pack/go.mod b/jam/store/_fixtures/disk-pack/go.mod similarity index 100% rename from v2/jam/store/_fixtures/disk-pack/go.mod rename to jam/store/_fixtures/disk-pack/go.mod diff --git a/v2/jam/store/_fixtures/disk-pack/go.sum b/jam/store/_fixtures/disk-pack/go.sum similarity index 100% rename from v2/jam/store/_fixtures/disk-pack/go.sum rename to jam/store/_fixtures/disk-pack/go.sum diff --git a/v2/jam/store/_fixtures/disk/_r/r.go b/jam/store/_fixtures/disk/_r/r.go similarity index 100% rename from v2/jam/store/_fixtures/disk/_r/r.go rename to jam/store/_fixtures/disk/_r/r.go diff --git a/v2/jam/store/_fixtures/disk/e/e.go b/jam/store/_fixtures/disk/e/e.go similarity index 100% rename from v2/jam/store/_fixtures/disk/e/e.go rename to jam/store/_fixtures/disk/e/e.go diff --git a/v2/jam/store/_fixtures/disk/e/heartbreakers/refugee.txt b/jam/store/_fixtures/disk/e/heartbreakers/refugee.txt similarity index 100% rename from v2/jam/store/_fixtures/disk/e/heartbreakers/refugee.txt rename to jam/store/_fixtures/disk/e/heartbreakers/refugee.txt diff --git a/v2/jam/store/_fixtures/disk/e/petty/fallin.txt b/jam/store/_fixtures/disk/e/petty/fallin.txt similarity index 100% rename from v2/jam/store/_fixtures/disk/e/petty/fallin.txt rename to jam/store/_fixtures/disk/e/petty/fallin.txt diff --git a/v2/jam/store/_fixtures/disk/franklin/aretha.txt b/jam/store/_fixtures/disk/franklin/aretha.txt similarity index 100% rename from v2/jam/store/_fixtures/disk/franklin/aretha.txt rename to jam/store/_fixtures/disk/franklin/aretha.txt diff --git a/v2/jam/store/_fixtures/disk/franklin/think.txt b/jam/store/_fixtures/disk/franklin/think.txt similarity index 100% rename from v2/jam/store/_fixtures/disk/franklin/think.txt rename to jam/store/_fixtures/disk/franklin/think.txt diff --git a/v2/jam/store/_fixtures/disk/q.go b/jam/store/_fixtures/disk/q.go similarity index 100% rename from v2/jam/store/_fixtures/disk/q.go rename to jam/store/_fixtures/disk/q.go diff --git a/v2/jam/store/_fixtures/disk/w/w.go b/jam/store/_fixtures/disk/w/w.go similarity index 100% rename from v2/jam/store/_fixtures/disk/w/w.go rename to jam/store/_fixtures/disk/w/w.go diff --git a/v2/jam/store/clean.go b/jam/store/clean.go similarity index 100% rename from v2/jam/store/clean.go rename to jam/store/clean.go diff --git a/v2/jam/store/disk.go b/jam/store/disk.go similarity index 100% rename from v2/jam/store/disk.go rename to jam/store/disk.go diff --git a/v2/jam/store/disk_packed_test.go b/jam/store/disk_packed_test.go similarity index 100% rename from v2/jam/store/disk_packed_test.go rename to jam/store/disk_packed_test.go diff --git a/v2/jam/store/disk_test.go b/jam/store/disk_test.go similarity index 100% rename from v2/jam/store/disk_test.go rename to jam/store/disk_test.go diff --git a/v2/jam/store/disk_tmpl.go b/jam/store/disk_tmpl.go similarity index 100% rename from v2/jam/store/disk_tmpl.go rename to jam/store/disk_tmpl.go diff --git a/v2/jam/store/env.go b/jam/store/env.go similarity index 100% rename from v2/jam/store/env.go rename to jam/store/env.go diff --git a/v2/jam/store/fn.go b/jam/store/fn.go similarity index 100% rename from v2/jam/store/fn.go rename to jam/store/fn.go diff --git a/v2/jam/store/legacy.go b/jam/store/legacy.go similarity index 100% rename from v2/jam/store/legacy.go rename to jam/store/legacy.go diff --git a/v2/jam/store/legacy_test.go b/jam/store/legacy_test.go similarity index 100% rename from v2/jam/store/legacy_test.go rename to jam/store/legacy_test.go diff --git a/v2/jam/store/store.go b/jam/store/store.go similarity index 100% rename from v2/jam/store/store.go rename to jam/store/store.go diff --git a/v2/jam/store/store_test.go b/jam/store/store_test.go similarity index 100% rename from v2/jam/store/store_test.go rename to jam/store/store_test.go diff --git a/v2/packr.go b/packr.go similarity index 100% rename from v2/packr.go rename to packr.go diff --git a/v2/packr2/LICENSE b/packr2/LICENSE similarity index 100% rename from v2/packr2/LICENSE rename to packr2/LICENSE diff --git a/v2/packr2/cmd/build.go b/packr2/cmd/build.go similarity index 100% rename from v2/packr2/cmd/build.go rename to packr2/cmd/build.go diff --git a/v2/packr2/cmd/clean.go b/packr2/cmd/clean.go similarity index 100% rename from v2/packr2/cmd/clean.go rename to packr2/cmd/clean.go diff --git a/v2/packr2/cmd/fix.go b/packr2/cmd/fix.go similarity index 100% rename from v2/packr2/cmd/fix.go rename to packr2/cmd/fix.go diff --git a/v2/packr2/cmd/fix/fix.go b/packr2/cmd/fix/fix.go similarity index 100% rename from v2/packr2/cmd/fix/fix.go rename to packr2/cmd/fix/fix.go diff --git a/v2/packr2/cmd/fix/imports.go b/packr2/cmd/fix/imports.go similarity index 100% rename from v2/packr2/cmd/fix/imports.go rename to packr2/cmd/fix/imports.go diff --git a/v2/packr2/cmd/fix/runner.go b/packr2/cmd/fix/runner.go similarity index 100% rename from v2/packr2/cmd/fix/runner.go rename to packr2/cmd/fix/runner.go diff --git a/v2/packr2/cmd/gocmd.go b/packr2/cmd/gocmd.go similarity index 100% rename from v2/packr2/cmd/gocmd.go rename to packr2/cmd/gocmd.go diff --git a/v2/packr2/cmd/install.go b/packr2/cmd/install.go similarity index 100% rename from v2/packr2/cmd/install.go rename to packr2/cmd/install.go diff --git a/v2/packr2/cmd/pack.go b/packr2/cmd/pack.go similarity index 100% rename from v2/packr2/cmd/pack.go rename to packr2/cmd/pack.go diff --git a/v2/packr2/cmd/root.go b/packr2/cmd/root.go similarity index 100% rename from v2/packr2/cmd/root.go rename to packr2/cmd/root.go diff --git a/v2/packr2/cmd/version.go b/packr2/cmd/version.go similarity index 100% rename from v2/packr2/cmd/version.go rename to packr2/cmd/version.go diff --git a/v2/packr2/main.go b/packr2/main.go similarity index 100% rename from v2/packr2/main.go rename to packr2/main.go diff --git a/v2/packr_test.go b/packr_test.go similarity index 100% rename from v2/packr_test.go rename to packr_test.go diff --git a/v2/plog/plog.go b/plog/plog.go similarity index 100% rename from v2/plog/plog.go rename to plog/plog.go diff --git a/v2/pointer.go b/pointer.go similarity index 100% rename from v2/pointer.go rename to pointer.go diff --git a/v2/pointer_test.go b/pointer_test.go similarity index 100% rename from v2/pointer_test.go rename to pointer_test.go diff --git a/v2/resolvers_map.go b/resolvers_map.go similarity index 100% rename from v2/resolvers_map.go rename to resolvers_map.go diff --git a/v2/version.go b/version.go similarity index 100% rename from v2/version.go rename to version.go diff --git a/v2/walk.go b/walk.go similarity index 100% rename from v2/walk.go rename to walk.go diff --git a/v2/walk_test.go b/walk_test.go similarity index 100% rename from v2/walk_test.go rename to walk_test.go