From 64221a126d31af72689866c2dae3af1ec0b15c38 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Mon, 8 Jan 2018 09:28:46 +0100
Subject: [PATCH] refact: session/modules -> modules

---
 main.go                                         |   2 +-
 {session/modules => modules}/api_rest.go        |   0
 {session/modules => modules}/api_rest_routes.go |   0
 {session/modules => modules}/arp_spoof.go       |   0
 {session/modules => modules}/events_stream.go   |   0
 {session/modules => modules}/http_proxy.go      |   0
 .../http_proxy_js_request.go                    |   0
 .../http_proxy_js_response.go                   |   0
 .../modules => modules}/http_proxy_script.go    |   0
 {session/modules => modules}/net_probe.go       |   0
 {session/modules => modules}/net_recon.go       |   0
 {session/modules => modules}/net_sniff.go       |   0
 session/modules/.discovery.go.swp               | Bin 12288 -> 0 bytes
 13 files changed, 1 insertion(+), 1 deletion(-)
 rename {session/modules => modules}/api_rest.go (100%)
 rename {session/modules => modules}/api_rest_routes.go (100%)
 rename {session/modules => modules}/arp_spoof.go (100%)
 rename {session/modules => modules}/events_stream.go (100%)
 rename {session/modules => modules}/http_proxy.go (100%)
 rename {session/modules => modules}/http_proxy_js_request.go (100%)
 rename {session/modules => modules}/http_proxy_js_response.go (100%)
 rename {session/modules => modules}/http_proxy_script.go (100%)
 rename {session/modules => modules}/net_probe.go (100%)
 rename {session/modules => modules}/net_recon.go (100%)
 rename {session/modules => modules}/net_sniff.go (100%)
 delete mode 100644 session/modules/.discovery.go.swp

diff --git a/main.go b/main.go
index 3ed51978..ec86d033 100644
--- a/main.go
+++ b/main.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/evilsocket/bettercap-ng/core"
+	"github.com/evilsocket/bettercap-ng/modules"
 	"github.com/evilsocket/bettercap-ng/session"
-	"github.com/evilsocket/bettercap-ng/session/modules"
 )
 
 var sess *session.Session
diff --git a/session/modules/api_rest.go b/modules/api_rest.go
similarity index 100%
rename from session/modules/api_rest.go
rename to modules/api_rest.go
diff --git a/session/modules/api_rest_routes.go b/modules/api_rest_routes.go
similarity index 100%
rename from session/modules/api_rest_routes.go
rename to modules/api_rest_routes.go
diff --git a/session/modules/arp_spoof.go b/modules/arp_spoof.go
similarity index 100%
rename from session/modules/arp_spoof.go
rename to modules/arp_spoof.go
diff --git a/session/modules/events_stream.go b/modules/events_stream.go
similarity index 100%
rename from session/modules/events_stream.go
rename to modules/events_stream.go
diff --git a/session/modules/http_proxy.go b/modules/http_proxy.go
similarity index 100%
rename from session/modules/http_proxy.go
rename to modules/http_proxy.go
diff --git a/session/modules/http_proxy_js_request.go b/modules/http_proxy_js_request.go
similarity index 100%
rename from session/modules/http_proxy_js_request.go
rename to modules/http_proxy_js_request.go
diff --git a/session/modules/http_proxy_js_response.go b/modules/http_proxy_js_response.go
similarity index 100%
rename from session/modules/http_proxy_js_response.go
rename to modules/http_proxy_js_response.go
diff --git a/session/modules/http_proxy_script.go b/modules/http_proxy_script.go
similarity index 100%
rename from session/modules/http_proxy_script.go
rename to modules/http_proxy_script.go
diff --git a/session/modules/net_probe.go b/modules/net_probe.go
similarity index 100%
rename from session/modules/net_probe.go
rename to modules/net_probe.go
diff --git a/session/modules/net_recon.go b/modules/net_recon.go
similarity index 100%
rename from session/modules/net_recon.go
rename to modules/net_recon.go
diff --git a/session/modules/net_sniff.go b/modules/net_sniff.go
similarity index 100%
rename from session/modules/net_sniff.go
rename to modules/net_sniff.go
diff --git a/session/modules/.discovery.go.swp b/session/modules/.discovery.go.swp
deleted file mode 100644
index e6e3fbc04c970861b88c942ad2f519ab5a02e443..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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