diff --git a/help/help.go b/help/help.go
index cf79c9307..bac22d0a6 100644
--- a/help/help.go
+++ b/help/help.go
@@ -8,7 +8,7 @@ import (
 	"github.com/senorprogrammer/wtf/github"
 	"github.com/senorprogrammer/wtf/textfile"
 	"github.com/senorprogrammer/wtf/todo"
-	"github.com/senorprogrammer/wtf/weather"
+	"github.com/senorprogrammer/wtf/weatherservices/weather"
 )
 
 func DisplayModuleInfo(moduleName string) {
diff --git a/ipapi/widget.go b/ipaddresses/ipapi/widget.go
similarity index 100%
rename from ipapi/widget.go
rename to ipaddresses/ipapi/widget.go
diff --git a/ipinfo/widget.go b/ipaddresses/ipinfo/widget.go
similarity index 100%
rename from ipinfo/widget.go
rename to ipaddresses/ipinfo/widget.go
diff --git a/prettyweather/widget.go b/weatherservices/prettyweather/widget.go
similarity index 100%
rename from prettyweather/widget.go
rename to weatherservices/prettyweather/widget.go
diff --git a/weather/display.go b/weatherservices/weather/display.go
similarity index 100%
rename from weather/display.go
rename to weatherservices/weather/display.go
diff --git a/weather/widget.go b/weatherservices/weather/widget.go
similarity index 100%
rename from weather/widget.go
rename to weatherservices/weather/widget.go
diff --git a/wtf.go b/wtf.go
index 5d27e6a2f..e4425aaab 100644
--- a/wtf.go
+++ b/wtf.go
@@ -25,20 +25,20 @@ import (
 	"github.com/senorprogrammer/wtf/gitlab"
 	"github.com/senorprogrammer/wtf/gspreadsheets"
 	"github.com/senorprogrammer/wtf/help"
-	"github.com/senorprogrammer/wtf/ipapi"
-	"github.com/senorprogrammer/wtf/ipinfo"
+	"github.com/senorprogrammer/wtf/ipaddresses/ipapi"
+	"github.com/senorprogrammer/wtf/ipaddresses/ipinfo"
 	"github.com/senorprogrammer/wtf/jenkins"
 	"github.com/senorprogrammer/wtf/jira"
 	"github.com/senorprogrammer/wtf/newrelic"
 	"github.com/senorprogrammer/wtf/opsgenie"
 	"github.com/senorprogrammer/wtf/power"
-	"github.com/senorprogrammer/wtf/prettyweather"
 	"github.com/senorprogrammer/wtf/security"
 	"github.com/senorprogrammer/wtf/status"
 	"github.com/senorprogrammer/wtf/system"
 	"github.com/senorprogrammer/wtf/textfile"
 	"github.com/senorprogrammer/wtf/todo"
-	"github.com/senorprogrammer/wtf/weather"
+	"github.com/senorprogrammer/wtf/weatherservices/prettyweather"
+	"github.com/senorprogrammer/wtf/weatherservices/weather"
 	"github.com/senorprogrammer/wtf/wtf"
 )