From 6867e076f1ceed4f0f63ec1cd8050886dcb66e20 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Thu, 10 Jul 2025 15:27:41 +0200 Subject: [PATCH] refactor: move v2 module code to root directory for cleaner structure Keeps module path as github.com/projectdiscovery/subfinder/v2 to preserve import compatibility. Signed-off-by: Mikel Olasagasti Uranga --- v2/.goreleaser.yml => .goreleaser.yml | 0 v2/Makefile => Makefile | 0 {v2/cmd => cmd}/subfinder/main.go | 0 {v2/examples => examples}/main.go | 0 v2/go.mod => go.mod | 0 v2/go.sum => go.sum | 0 {v2/pkg => pkg}/passive/doc.go | 0 {v2/pkg => pkg}/passive/passive.go | 0 {v2/pkg => pkg}/passive/sources.go | 0 {v2/pkg => pkg}/passive/sources_test.go | 0 {v2/pkg => pkg}/passive/sources_w_auth_test.go | 0 {v2/pkg => pkg}/passive/sources_wo_auth_test.go | 0 {v2/pkg => pkg}/resolve/client.go | 0 {v2/pkg => pkg}/resolve/doc.go | 0 {v2/pkg => pkg}/resolve/resolve.go | 0 {v2/pkg => pkg}/runner/banners.go | 0 {v2/pkg => pkg}/runner/config.go | 0 {v2/pkg => pkg}/runner/doc.go | 0 {v2/pkg => pkg}/runner/enumerate.go | 0 {v2/pkg => pkg}/runner/enumerate_test.go | 0 {v2/pkg => pkg}/runner/initialize.go | 0 {v2/pkg => pkg}/runner/options.go | 0 {v2/pkg => pkg}/runner/outputter.go | 0 {v2/pkg => pkg}/runner/runner.go | 0 {v2/pkg => pkg}/runner/stats.go | 0 {v2/pkg => pkg}/runner/util.go | 0 {v2/pkg => pkg}/runner/validate.go | 0 {v2/pkg => pkg}/subscraping/agent.go | 0 {v2/pkg => pkg}/subscraping/doc.go | 0 {v2/pkg => pkg}/subscraping/extractor.go | 0 {v2/pkg => pkg}/subscraping/sources/alienvault/alienvault.go | 0 {v2/pkg => pkg}/subscraping/sources/anubis/anubis.go | 0 {v2/pkg => pkg}/subscraping/sources/bevigil/bevigil.go | 0 {v2/pkg => pkg}/subscraping/sources/bufferover/bufferover.go | 0 {v2/pkg => pkg}/subscraping/sources/builtwith/builtwith.go | 0 {v2/pkg => pkg}/subscraping/sources/c99/c99.go | 0 {v2/pkg => pkg}/subscraping/sources/censys/censys.go | 0 {v2/pkg => pkg}/subscraping/sources/certspotter/certspotter.go | 0 {v2/pkg => pkg}/subscraping/sources/chaos/chaos.go | 0 {v2/pkg => pkg}/subscraping/sources/chinaz/chinaz.go | 0 {v2/pkg => pkg}/subscraping/sources/commoncrawl/commoncrawl.go | 0 {v2/pkg => pkg}/subscraping/sources/crtsh/crtsh.go | 0 {v2/pkg => pkg}/subscraping/sources/digitalyama/digitalyama.go | 0 {v2/pkg => pkg}/subscraping/sources/digitorus/digitorus.go | 0 {v2/pkg => pkg}/subscraping/sources/dnsdb/dnsdb.go | 0 {v2/pkg => pkg}/subscraping/sources/dnsdumpster/dnsdumpster.go | 0 {v2/pkg => pkg}/subscraping/sources/dnsrepo/dnsrepo.go | 0 {v2/pkg => pkg}/subscraping/sources/facebook/ctlogs.go | 0 {v2/pkg => pkg}/subscraping/sources/facebook/ctlogs_test.go | 0 {v2/pkg => pkg}/subscraping/sources/facebook/types.go | 0 {v2/pkg => pkg}/subscraping/sources/fofa/fofa.go | 0 {v2/pkg => pkg}/subscraping/sources/fullhunt/fullhunt.go | 0 {v2/pkg => pkg}/subscraping/sources/github/github.go | 0 {v2/pkg => pkg}/subscraping/sources/github/tokenmanager.go | 0 {v2/pkg => pkg}/subscraping/sources/gitlab/gitlab.go | 0 {v2/pkg => pkg}/subscraping/sources/hackertarget/hackertarget.go | 0 {v2/pkg => pkg}/subscraping/sources/hudsonrock/hudsonrock.go | 0 {v2/pkg => pkg}/subscraping/sources/hunter/hunter.go | 0 {v2/pkg => pkg}/subscraping/sources/intelx/intelx.go | 0 {v2/pkg => pkg}/subscraping/sources/leakix/leakix.go | 0 {v2/pkg => pkg}/subscraping/sources/netlas/netlas.go | 0 {v2/pkg => pkg}/subscraping/sources/pugrecon/pugrecon.go | 0 {v2/pkg => pkg}/subscraping/sources/quake/quake.go | 0 {v2/pkg => pkg}/subscraping/sources/rapiddns/rapiddns.go | 0 {v2/pkg => pkg}/subscraping/sources/reconcloud/reconcloud.go | 0 {v2/pkg => pkg}/subscraping/sources/redhuntlabs/redhuntlabs.go | 0 {v2/pkg => pkg}/subscraping/sources/riddler/riddler.go | 0 {v2/pkg => pkg}/subscraping/sources/robtex/robtext.go | 0 {v2/pkg => pkg}/subscraping/sources/rsecloud/rsecloud.go | 0 .../subscraping/sources/securitytrails/securitytrails.go | 0 {v2/pkg => pkg}/subscraping/sources/shodan/shodan.go | 0 {v2/pkg => pkg}/subscraping/sources/sitedossier/sitedossier.go | 0 {v2/pkg => pkg}/subscraping/sources/threatbook/threatbook.go | 0 {v2/pkg => pkg}/subscraping/sources/threatcrowd/threatcrowd.go | 0 {v2/pkg => pkg}/subscraping/sources/threatminer/threatminer.go | 0 {v2/pkg => pkg}/subscraping/sources/virustotal/virustotal.go | 0 .../subscraping/sources/waybackarchive/waybackarchive.go | 0 {v2/pkg => pkg}/subscraping/sources/whoisxmlapi/whoisxmlapi.go | 0 {v2/pkg => pkg}/subscraping/sources/zoomeyeapi/zoomeyeapi.go | 0 {v2/pkg => pkg}/subscraping/types.go | 0 {v2/pkg => pkg}/subscraping/utils.go | 0 {v2/pkg => pkg}/testutils/integration.go | 0 82 files changed, 0 insertions(+), 0 deletions(-) rename v2/.goreleaser.yml => .goreleaser.yml (100%) rename v2/Makefile => Makefile (100%) rename {v2/cmd => cmd}/subfinder/main.go (100%) rename {v2/examples => examples}/main.go (100%) rename v2/go.mod => go.mod (100%) rename v2/go.sum => go.sum (100%) rename {v2/pkg => pkg}/passive/doc.go (100%) rename {v2/pkg => pkg}/passive/passive.go (100%) rename {v2/pkg => pkg}/passive/sources.go (100%) rename {v2/pkg => pkg}/passive/sources_test.go (100%) rename {v2/pkg => pkg}/passive/sources_w_auth_test.go (100%) rename {v2/pkg => pkg}/passive/sources_wo_auth_test.go (100%) rename {v2/pkg => pkg}/resolve/client.go (100%) rename {v2/pkg => pkg}/resolve/doc.go (100%) rename {v2/pkg => pkg}/resolve/resolve.go (100%) rename {v2/pkg => pkg}/runner/banners.go (100%) rename {v2/pkg => pkg}/runner/config.go (100%) rename {v2/pkg => pkg}/runner/doc.go (100%) rename {v2/pkg => pkg}/runner/enumerate.go (100%) rename {v2/pkg => pkg}/runner/enumerate_test.go (100%) rename {v2/pkg => pkg}/runner/initialize.go (100%) rename {v2/pkg => pkg}/runner/options.go (100%) rename {v2/pkg => pkg}/runner/outputter.go (100%) rename {v2/pkg => pkg}/runner/runner.go (100%) rename {v2/pkg => pkg}/runner/stats.go (100%) rename {v2/pkg => pkg}/runner/util.go (100%) rename {v2/pkg => pkg}/runner/validate.go (100%) rename {v2/pkg => pkg}/subscraping/agent.go (100%) rename {v2/pkg => pkg}/subscraping/doc.go (100%) rename {v2/pkg => pkg}/subscraping/extractor.go (100%) rename {v2/pkg => pkg}/subscraping/sources/alienvault/alienvault.go (100%) rename {v2/pkg => pkg}/subscraping/sources/anubis/anubis.go (100%) rename {v2/pkg => pkg}/subscraping/sources/bevigil/bevigil.go (100%) rename {v2/pkg => pkg}/subscraping/sources/bufferover/bufferover.go (100%) rename {v2/pkg => pkg}/subscraping/sources/builtwith/builtwith.go (100%) rename {v2/pkg => pkg}/subscraping/sources/c99/c99.go (100%) rename {v2/pkg => pkg}/subscraping/sources/censys/censys.go (100%) rename {v2/pkg => pkg}/subscraping/sources/certspotter/certspotter.go (100%) rename {v2/pkg => pkg}/subscraping/sources/chaos/chaos.go (100%) rename {v2/pkg => pkg}/subscraping/sources/chinaz/chinaz.go (100%) rename {v2/pkg => pkg}/subscraping/sources/commoncrawl/commoncrawl.go (100%) rename {v2/pkg => pkg}/subscraping/sources/crtsh/crtsh.go (100%) rename {v2/pkg => pkg}/subscraping/sources/digitalyama/digitalyama.go (100%) rename {v2/pkg => pkg}/subscraping/sources/digitorus/digitorus.go (100%) rename {v2/pkg => pkg}/subscraping/sources/dnsdb/dnsdb.go (100%) rename {v2/pkg => pkg}/subscraping/sources/dnsdumpster/dnsdumpster.go (100%) rename {v2/pkg => pkg}/subscraping/sources/dnsrepo/dnsrepo.go (100%) rename {v2/pkg => pkg}/subscraping/sources/facebook/ctlogs.go (100%) rename {v2/pkg => pkg}/subscraping/sources/facebook/ctlogs_test.go (100%) rename {v2/pkg => pkg}/subscraping/sources/facebook/types.go (100%) rename {v2/pkg => pkg}/subscraping/sources/fofa/fofa.go (100%) rename {v2/pkg => pkg}/subscraping/sources/fullhunt/fullhunt.go (100%) rename {v2/pkg => pkg}/subscraping/sources/github/github.go (100%) rename {v2/pkg => pkg}/subscraping/sources/github/tokenmanager.go (100%) rename {v2/pkg => pkg}/subscraping/sources/gitlab/gitlab.go (100%) rename {v2/pkg => pkg}/subscraping/sources/hackertarget/hackertarget.go (100%) rename {v2/pkg => pkg}/subscraping/sources/hudsonrock/hudsonrock.go (100%) rename {v2/pkg => pkg}/subscraping/sources/hunter/hunter.go (100%) rename {v2/pkg => pkg}/subscraping/sources/intelx/intelx.go (100%) rename {v2/pkg => pkg}/subscraping/sources/leakix/leakix.go (100%) rename {v2/pkg => pkg}/subscraping/sources/netlas/netlas.go (100%) rename {v2/pkg => pkg}/subscraping/sources/pugrecon/pugrecon.go (100%) rename {v2/pkg => pkg}/subscraping/sources/quake/quake.go (100%) rename {v2/pkg => pkg}/subscraping/sources/rapiddns/rapiddns.go (100%) rename {v2/pkg => pkg}/subscraping/sources/reconcloud/reconcloud.go (100%) rename {v2/pkg => pkg}/subscraping/sources/redhuntlabs/redhuntlabs.go (100%) rename {v2/pkg => pkg}/subscraping/sources/riddler/riddler.go (100%) rename {v2/pkg => pkg}/subscraping/sources/robtex/robtext.go (100%) rename {v2/pkg => pkg}/subscraping/sources/rsecloud/rsecloud.go (100%) rename {v2/pkg => pkg}/subscraping/sources/securitytrails/securitytrails.go (100%) rename {v2/pkg => pkg}/subscraping/sources/shodan/shodan.go (100%) rename {v2/pkg => pkg}/subscraping/sources/sitedossier/sitedossier.go (100%) rename {v2/pkg => pkg}/subscraping/sources/threatbook/threatbook.go (100%) rename {v2/pkg => pkg}/subscraping/sources/threatcrowd/threatcrowd.go (100%) rename {v2/pkg => pkg}/subscraping/sources/threatminer/threatminer.go (100%) rename {v2/pkg => pkg}/subscraping/sources/virustotal/virustotal.go (100%) rename {v2/pkg => pkg}/subscraping/sources/waybackarchive/waybackarchive.go (100%) rename {v2/pkg => pkg}/subscraping/sources/whoisxmlapi/whoisxmlapi.go (100%) rename {v2/pkg => pkg}/subscraping/sources/zoomeyeapi/zoomeyeapi.go (100%) rename {v2/pkg => pkg}/subscraping/types.go (100%) rename {v2/pkg => pkg}/subscraping/utils.go (100%) rename {v2/pkg => pkg}/testutils/integration.go (100%) 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/Makefile b/Makefile similarity index 100% rename from v2/Makefile rename to Makefile diff --git a/v2/cmd/subfinder/main.go b/cmd/subfinder/main.go similarity index 100% rename from v2/cmd/subfinder/main.go rename to cmd/subfinder/main.go diff --git a/v2/examples/main.go b/examples/main.go similarity index 100% rename from v2/examples/main.go rename to examples/main.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/pkg/passive/doc.go b/pkg/passive/doc.go similarity index 100% rename from v2/pkg/passive/doc.go rename to pkg/passive/doc.go diff --git a/v2/pkg/passive/passive.go b/pkg/passive/passive.go similarity index 100% rename from v2/pkg/passive/passive.go rename to pkg/passive/passive.go diff --git a/v2/pkg/passive/sources.go b/pkg/passive/sources.go similarity index 100% rename from v2/pkg/passive/sources.go rename to pkg/passive/sources.go diff --git a/v2/pkg/passive/sources_test.go b/pkg/passive/sources_test.go similarity index 100% rename from v2/pkg/passive/sources_test.go rename to pkg/passive/sources_test.go diff --git a/v2/pkg/passive/sources_w_auth_test.go b/pkg/passive/sources_w_auth_test.go similarity index 100% rename from v2/pkg/passive/sources_w_auth_test.go rename to pkg/passive/sources_w_auth_test.go diff --git a/v2/pkg/passive/sources_wo_auth_test.go b/pkg/passive/sources_wo_auth_test.go similarity index 100% rename from v2/pkg/passive/sources_wo_auth_test.go rename to pkg/passive/sources_wo_auth_test.go diff --git a/v2/pkg/resolve/client.go b/pkg/resolve/client.go similarity index 100% rename from v2/pkg/resolve/client.go rename to pkg/resolve/client.go diff --git a/v2/pkg/resolve/doc.go b/pkg/resolve/doc.go similarity index 100% rename from v2/pkg/resolve/doc.go rename to pkg/resolve/doc.go diff --git a/v2/pkg/resolve/resolve.go b/pkg/resolve/resolve.go similarity index 100% rename from v2/pkg/resolve/resolve.go rename to pkg/resolve/resolve.go diff --git a/v2/pkg/runner/banners.go b/pkg/runner/banners.go similarity index 100% rename from v2/pkg/runner/banners.go rename to pkg/runner/banners.go diff --git a/v2/pkg/runner/config.go b/pkg/runner/config.go similarity index 100% rename from v2/pkg/runner/config.go rename to pkg/runner/config.go diff --git a/v2/pkg/runner/doc.go b/pkg/runner/doc.go similarity index 100% rename from v2/pkg/runner/doc.go rename to pkg/runner/doc.go diff --git a/v2/pkg/runner/enumerate.go b/pkg/runner/enumerate.go similarity index 100% rename from v2/pkg/runner/enumerate.go rename to pkg/runner/enumerate.go diff --git a/v2/pkg/runner/enumerate_test.go b/pkg/runner/enumerate_test.go similarity index 100% rename from v2/pkg/runner/enumerate_test.go rename to pkg/runner/enumerate_test.go diff --git a/v2/pkg/runner/initialize.go b/pkg/runner/initialize.go similarity index 100% rename from v2/pkg/runner/initialize.go rename to pkg/runner/initialize.go diff --git a/v2/pkg/runner/options.go b/pkg/runner/options.go similarity index 100% rename from v2/pkg/runner/options.go rename to pkg/runner/options.go diff --git a/v2/pkg/runner/outputter.go b/pkg/runner/outputter.go similarity index 100% rename from v2/pkg/runner/outputter.go rename to pkg/runner/outputter.go diff --git a/v2/pkg/runner/runner.go b/pkg/runner/runner.go similarity index 100% rename from v2/pkg/runner/runner.go rename to pkg/runner/runner.go diff --git a/v2/pkg/runner/stats.go b/pkg/runner/stats.go similarity index 100% rename from v2/pkg/runner/stats.go rename to pkg/runner/stats.go diff --git a/v2/pkg/runner/util.go b/pkg/runner/util.go similarity index 100% rename from v2/pkg/runner/util.go rename to pkg/runner/util.go diff --git a/v2/pkg/runner/validate.go b/pkg/runner/validate.go similarity index 100% rename from v2/pkg/runner/validate.go rename to pkg/runner/validate.go diff --git a/v2/pkg/subscraping/agent.go b/pkg/subscraping/agent.go similarity index 100% rename from v2/pkg/subscraping/agent.go rename to pkg/subscraping/agent.go diff --git a/v2/pkg/subscraping/doc.go b/pkg/subscraping/doc.go similarity index 100% rename from v2/pkg/subscraping/doc.go rename to pkg/subscraping/doc.go diff --git a/v2/pkg/subscraping/extractor.go b/pkg/subscraping/extractor.go similarity index 100% rename from v2/pkg/subscraping/extractor.go rename to pkg/subscraping/extractor.go diff --git a/v2/pkg/subscraping/sources/alienvault/alienvault.go b/pkg/subscraping/sources/alienvault/alienvault.go similarity index 100% rename from v2/pkg/subscraping/sources/alienvault/alienvault.go rename to pkg/subscraping/sources/alienvault/alienvault.go diff --git a/v2/pkg/subscraping/sources/anubis/anubis.go b/pkg/subscraping/sources/anubis/anubis.go similarity index 100% rename from v2/pkg/subscraping/sources/anubis/anubis.go rename to pkg/subscraping/sources/anubis/anubis.go diff --git a/v2/pkg/subscraping/sources/bevigil/bevigil.go b/pkg/subscraping/sources/bevigil/bevigil.go similarity index 100% rename from v2/pkg/subscraping/sources/bevigil/bevigil.go rename to pkg/subscraping/sources/bevigil/bevigil.go diff --git a/v2/pkg/subscraping/sources/bufferover/bufferover.go b/pkg/subscraping/sources/bufferover/bufferover.go similarity index 100% rename from v2/pkg/subscraping/sources/bufferover/bufferover.go rename to pkg/subscraping/sources/bufferover/bufferover.go diff --git a/v2/pkg/subscraping/sources/builtwith/builtwith.go b/pkg/subscraping/sources/builtwith/builtwith.go similarity index 100% rename from v2/pkg/subscraping/sources/builtwith/builtwith.go rename to pkg/subscraping/sources/builtwith/builtwith.go diff --git a/v2/pkg/subscraping/sources/c99/c99.go b/pkg/subscraping/sources/c99/c99.go similarity index 100% rename from v2/pkg/subscraping/sources/c99/c99.go rename to pkg/subscraping/sources/c99/c99.go diff --git a/v2/pkg/subscraping/sources/censys/censys.go b/pkg/subscraping/sources/censys/censys.go similarity index 100% rename from v2/pkg/subscraping/sources/censys/censys.go rename to pkg/subscraping/sources/censys/censys.go diff --git a/v2/pkg/subscraping/sources/certspotter/certspotter.go b/pkg/subscraping/sources/certspotter/certspotter.go similarity index 100% rename from v2/pkg/subscraping/sources/certspotter/certspotter.go rename to pkg/subscraping/sources/certspotter/certspotter.go diff --git a/v2/pkg/subscraping/sources/chaos/chaos.go b/pkg/subscraping/sources/chaos/chaos.go similarity index 100% rename from v2/pkg/subscraping/sources/chaos/chaos.go rename to pkg/subscraping/sources/chaos/chaos.go diff --git a/v2/pkg/subscraping/sources/chinaz/chinaz.go b/pkg/subscraping/sources/chinaz/chinaz.go similarity index 100% rename from v2/pkg/subscraping/sources/chinaz/chinaz.go rename to pkg/subscraping/sources/chinaz/chinaz.go diff --git a/v2/pkg/subscraping/sources/commoncrawl/commoncrawl.go b/pkg/subscraping/sources/commoncrawl/commoncrawl.go similarity index 100% rename from v2/pkg/subscraping/sources/commoncrawl/commoncrawl.go rename to pkg/subscraping/sources/commoncrawl/commoncrawl.go diff --git a/v2/pkg/subscraping/sources/crtsh/crtsh.go b/pkg/subscraping/sources/crtsh/crtsh.go similarity index 100% rename from v2/pkg/subscraping/sources/crtsh/crtsh.go rename to pkg/subscraping/sources/crtsh/crtsh.go diff --git a/v2/pkg/subscraping/sources/digitalyama/digitalyama.go b/pkg/subscraping/sources/digitalyama/digitalyama.go similarity index 100% rename from v2/pkg/subscraping/sources/digitalyama/digitalyama.go rename to pkg/subscraping/sources/digitalyama/digitalyama.go diff --git a/v2/pkg/subscraping/sources/digitorus/digitorus.go b/pkg/subscraping/sources/digitorus/digitorus.go similarity index 100% rename from v2/pkg/subscraping/sources/digitorus/digitorus.go rename to pkg/subscraping/sources/digitorus/digitorus.go diff --git a/v2/pkg/subscraping/sources/dnsdb/dnsdb.go b/pkg/subscraping/sources/dnsdb/dnsdb.go similarity index 100% rename from v2/pkg/subscraping/sources/dnsdb/dnsdb.go rename to pkg/subscraping/sources/dnsdb/dnsdb.go diff --git a/v2/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go b/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go similarity index 100% rename from v2/pkg/subscraping/sources/dnsdumpster/dnsdumpster.go rename to pkg/subscraping/sources/dnsdumpster/dnsdumpster.go diff --git a/v2/pkg/subscraping/sources/dnsrepo/dnsrepo.go b/pkg/subscraping/sources/dnsrepo/dnsrepo.go similarity index 100% rename from v2/pkg/subscraping/sources/dnsrepo/dnsrepo.go rename to pkg/subscraping/sources/dnsrepo/dnsrepo.go diff --git a/v2/pkg/subscraping/sources/facebook/ctlogs.go b/pkg/subscraping/sources/facebook/ctlogs.go similarity index 100% rename from v2/pkg/subscraping/sources/facebook/ctlogs.go rename to pkg/subscraping/sources/facebook/ctlogs.go diff --git a/v2/pkg/subscraping/sources/facebook/ctlogs_test.go b/pkg/subscraping/sources/facebook/ctlogs_test.go similarity index 100% rename from v2/pkg/subscraping/sources/facebook/ctlogs_test.go rename to pkg/subscraping/sources/facebook/ctlogs_test.go diff --git a/v2/pkg/subscraping/sources/facebook/types.go b/pkg/subscraping/sources/facebook/types.go similarity index 100% rename from v2/pkg/subscraping/sources/facebook/types.go rename to pkg/subscraping/sources/facebook/types.go diff --git a/v2/pkg/subscraping/sources/fofa/fofa.go b/pkg/subscraping/sources/fofa/fofa.go similarity index 100% rename from v2/pkg/subscraping/sources/fofa/fofa.go rename to pkg/subscraping/sources/fofa/fofa.go diff --git a/v2/pkg/subscraping/sources/fullhunt/fullhunt.go b/pkg/subscraping/sources/fullhunt/fullhunt.go similarity index 100% rename from v2/pkg/subscraping/sources/fullhunt/fullhunt.go rename to pkg/subscraping/sources/fullhunt/fullhunt.go diff --git a/v2/pkg/subscraping/sources/github/github.go b/pkg/subscraping/sources/github/github.go similarity index 100% rename from v2/pkg/subscraping/sources/github/github.go rename to pkg/subscraping/sources/github/github.go diff --git a/v2/pkg/subscraping/sources/github/tokenmanager.go b/pkg/subscraping/sources/github/tokenmanager.go similarity index 100% rename from v2/pkg/subscraping/sources/github/tokenmanager.go rename to pkg/subscraping/sources/github/tokenmanager.go diff --git a/v2/pkg/subscraping/sources/gitlab/gitlab.go b/pkg/subscraping/sources/gitlab/gitlab.go similarity index 100% rename from v2/pkg/subscraping/sources/gitlab/gitlab.go rename to pkg/subscraping/sources/gitlab/gitlab.go diff --git a/v2/pkg/subscraping/sources/hackertarget/hackertarget.go b/pkg/subscraping/sources/hackertarget/hackertarget.go similarity index 100% rename from v2/pkg/subscraping/sources/hackertarget/hackertarget.go rename to pkg/subscraping/sources/hackertarget/hackertarget.go diff --git a/v2/pkg/subscraping/sources/hudsonrock/hudsonrock.go b/pkg/subscraping/sources/hudsonrock/hudsonrock.go similarity index 100% rename from v2/pkg/subscraping/sources/hudsonrock/hudsonrock.go rename to pkg/subscraping/sources/hudsonrock/hudsonrock.go diff --git a/v2/pkg/subscraping/sources/hunter/hunter.go b/pkg/subscraping/sources/hunter/hunter.go similarity index 100% rename from v2/pkg/subscraping/sources/hunter/hunter.go rename to pkg/subscraping/sources/hunter/hunter.go diff --git a/v2/pkg/subscraping/sources/intelx/intelx.go b/pkg/subscraping/sources/intelx/intelx.go similarity index 100% rename from v2/pkg/subscraping/sources/intelx/intelx.go rename to pkg/subscraping/sources/intelx/intelx.go diff --git a/v2/pkg/subscraping/sources/leakix/leakix.go b/pkg/subscraping/sources/leakix/leakix.go similarity index 100% rename from v2/pkg/subscraping/sources/leakix/leakix.go rename to pkg/subscraping/sources/leakix/leakix.go diff --git a/v2/pkg/subscraping/sources/netlas/netlas.go b/pkg/subscraping/sources/netlas/netlas.go similarity index 100% rename from v2/pkg/subscraping/sources/netlas/netlas.go rename to pkg/subscraping/sources/netlas/netlas.go diff --git a/v2/pkg/subscraping/sources/pugrecon/pugrecon.go b/pkg/subscraping/sources/pugrecon/pugrecon.go similarity index 100% rename from v2/pkg/subscraping/sources/pugrecon/pugrecon.go rename to pkg/subscraping/sources/pugrecon/pugrecon.go diff --git a/v2/pkg/subscraping/sources/quake/quake.go b/pkg/subscraping/sources/quake/quake.go similarity index 100% rename from v2/pkg/subscraping/sources/quake/quake.go rename to pkg/subscraping/sources/quake/quake.go diff --git a/v2/pkg/subscraping/sources/rapiddns/rapiddns.go b/pkg/subscraping/sources/rapiddns/rapiddns.go similarity index 100% rename from v2/pkg/subscraping/sources/rapiddns/rapiddns.go rename to pkg/subscraping/sources/rapiddns/rapiddns.go diff --git a/v2/pkg/subscraping/sources/reconcloud/reconcloud.go b/pkg/subscraping/sources/reconcloud/reconcloud.go similarity index 100% rename from v2/pkg/subscraping/sources/reconcloud/reconcloud.go rename to pkg/subscraping/sources/reconcloud/reconcloud.go diff --git a/v2/pkg/subscraping/sources/redhuntlabs/redhuntlabs.go b/pkg/subscraping/sources/redhuntlabs/redhuntlabs.go similarity index 100% rename from v2/pkg/subscraping/sources/redhuntlabs/redhuntlabs.go rename to pkg/subscraping/sources/redhuntlabs/redhuntlabs.go diff --git a/v2/pkg/subscraping/sources/riddler/riddler.go b/pkg/subscraping/sources/riddler/riddler.go similarity index 100% rename from v2/pkg/subscraping/sources/riddler/riddler.go rename to pkg/subscraping/sources/riddler/riddler.go diff --git a/v2/pkg/subscraping/sources/robtex/robtext.go b/pkg/subscraping/sources/robtex/robtext.go similarity index 100% rename from v2/pkg/subscraping/sources/robtex/robtext.go rename to pkg/subscraping/sources/robtex/robtext.go diff --git a/v2/pkg/subscraping/sources/rsecloud/rsecloud.go b/pkg/subscraping/sources/rsecloud/rsecloud.go similarity index 100% rename from v2/pkg/subscraping/sources/rsecloud/rsecloud.go rename to pkg/subscraping/sources/rsecloud/rsecloud.go diff --git a/v2/pkg/subscraping/sources/securitytrails/securitytrails.go b/pkg/subscraping/sources/securitytrails/securitytrails.go similarity index 100% rename from v2/pkg/subscraping/sources/securitytrails/securitytrails.go rename to pkg/subscraping/sources/securitytrails/securitytrails.go diff --git a/v2/pkg/subscraping/sources/shodan/shodan.go b/pkg/subscraping/sources/shodan/shodan.go similarity index 100% rename from v2/pkg/subscraping/sources/shodan/shodan.go rename to pkg/subscraping/sources/shodan/shodan.go diff --git a/v2/pkg/subscraping/sources/sitedossier/sitedossier.go b/pkg/subscraping/sources/sitedossier/sitedossier.go similarity index 100% rename from v2/pkg/subscraping/sources/sitedossier/sitedossier.go rename to pkg/subscraping/sources/sitedossier/sitedossier.go diff --git a/v2/pkg/subscraping/sources/threatbook/threatbook.go b/pkg/subscraping/sources/threatbook/threatbook.go similarity index 100% rename from v2/pkg/subscraping/sources/threatbook/threatbook.go rename to pkg/subscraping/sources/threatbook/threatbook.go diff --git a/v2/pkg/subscraping/sources/threatcrowd/threatcrowd.go b/pkg/subscraping/sources/threatcrowd/threatcrowd.go similarity index 100% rename from v2/pkg/subscraping/sources/threatcrowd/threatcrowd.go rename to pkg/subscraping/sources/threatcrowd/threatcrowd.go diff --git a/v2/pkg/subscraping/sources/threatminer/threatminer.go b/pkg/subscraping/sources/threatminer/threatminer.go similarity index 100% rename from v2/pkg/subscraping/sources/threatminer/threatminer.go rename to pkg/subscraping/sources/threatminer/threatminer.go diff --git a/v2/pkg/subscraping/sources/virustotal/virustotal.go b/pkg/subscraping/sources/virustotal/virustotal.go similarity index 100% rename from v2/pkg/subscraping/sources/virustotal/virustotal.go rename to pkg/subscraping/sources/virustotal/virustotal.go diff --git a/v2/pkg/subscraping/sources/waybackarchive/waybackarchive.go b/pkg/subscraping/sources/waybackarchive/waybackarchive.go similarity index 100% rename from v2/pkg/subscraping/sources/waybackarchive/waybackarchive.go rename to pkg/subscraping/sources/waybackarchive/waybackarchive.go diff --git a/v2/pkg/subscraping/sources/whoisxmlapi/whoisxmlapi.go b/pkg/subscraping/sources/whoisxmlapi/whoisxmlapi.go similarity index 100% rename from v2/pkg/subscraping/sources/whoisxmlapi/whoisxmlapi.go rename to pkg/subscraping/sources/whoisxmlapi/whoisxmlapi.go diff --git a/v2/pkg/subscraping/sources/zoomeyeapi/zoomeyeapi.go b/pkg/subscraping/sources/zoomeyeapi/zoomeyeapi.go similarity index 100% rename from v2/pkg/subscraping/sources/zoomeyeapi/zoomeyeapi.go rename to pkg/subscraping/sources/zoomeyeapi/zoomeyeapi.go diff --git a/v2/pkg/subscraping/types.go b/pkg/subscraping/types.go similarity index 100% rename from v2/pkg/subscraping/types.go rename to pkg/subscraping/types.go diff --git a/v2/pkg/subscraping/utils.go b/pkg/subscraping/utils.go similarity index 100% rename from v2/pkg/subscraping/utils.go rename to pkg/subscraping/utils.go diff --git a/v2/pkg/testutils/integration.go b/pkg/testutils/integration.go similarity index 100% rename from v2/pkg/testutils/integration.go rename to pkg/testutils/integration.go