diff --git a/help/help.go b/help/help.go
index 9a4df43b..8fbc0857 100644
--- a/help/help.go
+++ b/help/help.go
@@ -3,12 +3,12 @@ package help
 import (
 	"fmt"
 
-	"github.com/wtfutil/wtf/git"
-	"github.com/wtfutil/wtf/github"
-	"github.com/wtfutil/wtf/textfile"
-	"github.com/wtfutil/wtf/todo"
-	"github.com/wtfutil/wtf/todoist"
-	"github.com/wtfutil/wtf/weatherservices/weather"
+	"github.com/wtfutil/wtf/modules/git"
+	"github.com/wtfutil/wtf/modules/github"
+	"github.com/wtfutil/wtf/modules/textfile"
+	"github.com/wtfutil/wtf/modules/todo"
+	"github.com/wtfutil/wtf/modules/todoist"
+	"github.com/wtfutil/wtf/modules/weatherservices/weather"
 )
 
 func Display(moduleName string) {
diff --git a/main.go b/main.go
index cf38476c..892dd9a7 100644
--- a/main.go
+++ b/main.go
@@ -16,54 +16,54 @@ import (
 	"github.com/pkg/profile"
 	"github.com/radovskyb/watcher"
 	"github.com/rivo/tview"
-	"github.com/wtfutil/wtf/bamboohr"
 	"github.com/wtfutil/wtf/bargraph"
 	"github.com/wtfutil/wtf/cfg"
-	"github.com/wtfutil/wtf/circleci"
-	"github.com/wtfutil/wtf/clocks"
-	"github.com/wtfutil/wtf/cmdrunner"
-	"github.com/wtfutil/wtf/cryptoexchanges/bittrex"
-	"github.com/wtfutil/wtf/cryptoexchanges/blockfolio"
-	"github.com/wtfutil/wtf/cryptoexchanges/cryptolive"
-	"github.com/wtfutil/wtf/datadog"
 	"github.com/wtfutil/wtf/flags"
-	"github.com/wtfutil/wtf/gcal"
-	"github.com/wtfutil/wtf/gerrit"
-	"github.com/wtfutil/wtf/git"
-	"github.com/wtfutil/wtf/github"
-	"github.com/wtfutil/wtf/gitlab"
-	"github.com/wtfutil/wtf/gitter"
-	"github.com/wtfutil/wtf/gspreadsheets"
-	"github.com/wtfutil/wtf/hackernews"
-	"github.com/wtfutil/wtf/ipaddresses/ipapi"
-	"github.com/wtfutil/wtf/ipaddresses/ipinfo"
-	"github.com/wtfutil/wtf/jenkins"
-	"github.com/wtfutil/wtf/jira"
 	"github.com/wtfutil/wtf/logger"
-	"github.com/wtfutil/wtf/mercurial"
-	"github.com/wtfutil/wtf/newrelic"
-	"github.com/wtfutil/wtf/opsgenie"
-	"github.com/wtfutil/wtf/pagerduty"
-	"github.com/wtfutil/wtf/power"
-	"github.com/wtfutil/wtf/resourceusage"
-	"github.com/wtfutil/wtf/rollbar"
-	"github.com/wtfutil/wtf/security"
-	"github.com/wtfutil/wtf/spotify"
-	"github.com/wtfutil/wtf/spotifyweb"
-	"github.com/wtfutil/wtf/status"
-	"github.com/wtfutil/wtf/system"
-	"github.com/wtfutil/wtf/textfile"
-	"github.com/wtfutil/wtf/todo"
-	"github.com/wtfutil/wtf/todoist"
-	"github.com/wtfutil/wtf/travisci"
-	"github.com/wtfutil/wtf/trello"
-	"github.com/wtfutil/wtf/twitter"
-	"github.com/wtfutil/wtf/unknown"
-	"github.com/wtfutil/wtf/victorops"
-	"github.com/wtfutil/wtf/weatherservices/prettyweather"
-	"github.com/wtfutil/wtf/weatherservices/weather"
+	"github.com/wtfutil/wtf/modules/bamboohr"
+	"github.com/wtfutil/wtf/modules/circleci"
+	"github.com/wtfutil/wtf/modules/clocks"
+	"github.com/wtfutil/wtf/modules/cmdrunner"
+	"github.com/wtfutil/wtf/modules/cryptoexchanges/bittrex"
+	"github.com/wtfutil/wtf/modules/cryptoexchanges/blockfolio"
+	"github.com/wtfutil/wtf/modules/cryptoexchanges/cryptolive"
+	"github.com/wtfutil/wtf/modules/datadog"
+	"github.com/wtfutil/wtf/modules/gcal"
+	"github.com/wtfutil/wtf/modules/gerrit"
+	"github.com/wtfutil/wtf/modules/git"
+	"github.com/wtfutil/wtf/modules/github"
+	"github.com/wtfutil/wtf/modules/gitlab"
+	"github.com/wtfutil/wtf/modules/gitter"
+	"github.com/wtfutil/wtf/modules/gspreadsheets"
+	"github.com/wtfutil/wtf/modules/hackernews"
+	"github.com/wtfutil/wtf/modules/ipaddresses/ipapi"
+	"github.com/wtfutil/wtf/modules/ipaddresses/ipinfo"
+	"github.com/wtfutil/wtf/modules/jenkins"
+	"github.com/wtfutil/wtf/modules/jira"
+	"github.com/wtfutil/wtf/modules/mercurial"
+	"github.com/wtfutil/wtf/modules/newrelic"
+	"github.com/wtfutil/wtf/modules/opsgenie"
+	"github.com/wtfutil/wtf/modules/pagerduty"
+	"github.com/wtfutil/wtf/modules/power"
+	"github.com/wtfutil/wtf/modules/resourceusage"
+	"github.com/wtfutil/wtf/modules/rollbar"
+	"github.com/wtfutil/wtf/modules/security"
+	"github.com/wtfutil/wtf/modules/spotify"
+	"github.com/wtfutil/wtf/modules/spotifyweb"
+	"github.com/wtfutil/wtf/modules/status"
+	"github.com/wtfutil/wtf/modules/system"
+	"github.com/wtfutil/wtf/modules/textfile"
+	"github.com/wtfutil/wtf/modules/todo"
+	"github.com/wtfutil/wtf/modules/todoist"
+	"github.com/wtfutil/wtf/modules/travisci"
+	"github.com/wtfutil/wtf/modules/trello"
+	"github.com/wtfutil/wtf/modules/twitter"
+	"github.com/wtfutil/wtf/modules/unknown"
+	"github.com/wtfutil/wtf/modules/victorops"
+	"github.com/wtfutil/wtf/modules/weatherservices/prettyweather"
+	"github.com/wtfutil/wtf/modules/weatherservices/weather"
+	"github.com/wtfutil/wtf/modules/zendesk"
 	"github.com/wtfutil/wtf/wtf"
-	"github.com/wtfutil/wtf/zendesk"
 )
 
 var focusTracker wtf.FocusTracker
diff --git a/bamboohr/calendar.go b/modules/bamboohr/calendar.go
similarity index 100%
rename from bamboohr/calendar.go
rename to modules/bamboohr/calendar.go
diff --git a/bamboohr/client.go b/modules/bamboohr/client.go
similarity index 100%
rename from bamboohr/client.go
rename to modules/bamboohr/client.go
diff --git a/bamboohr/employee.go b/modules/bamboohr/employee.go
similarity index 100%
rename from bamboohr/employee.go
rename to modules/bamboohr/employee.go
diff --git a/bamboohr/item.go b/modules/bamboohr/item.go
similarity index 100%
rename from bamboohr/item.go
rename to modules/bamboohr/item.go
diff --git a/bamboohr/request.go b/modules/bamboohr/request.go
similarity index 100%
rename from bamboohr/request.go
rename to modules/bamboohr/request.go
diff --git a/bamboohr/widget.go b/modules/bamboohr/widget.go
similarity index 100%
rename from bamboohr/widget.go
rename to modules/bamboohr/widget.go
diff --git a/circleci/build.go b/modules/circleci/build.go
similarity index 100%
rename from circleci/build.go
rename to modules/circleci/build.go
diff --git a/circleci/client.go b/modules/circleci/client.go
similarity index 100%
rename from circleci/client.go
rename to modules/circleci/client.go
diff --git a/circleci/widget.go b/modules/circleci/widget.go
similarity index 100%
rename from circleci/widget.go
rename to modules/circleci/widget.go
diff --git a/clocks/clock.go b/modules/clocks/clock.go
similarity index 100%
rename from clocks/clock.go
rename to modules/clocks/clock.go
diff --git a/clocks/clock_collection.go b/modules/clocks/clock_collection.go
similarity index 100%
rename from clocks/clock_collection.go
rename to modules/clocks/clock_collection.go
diff --git a/clocks/display.go b/modules/clocks/display.go
similarity index 100%
rename from clocks/display.go
rename to modules/clocks/display.go
diff --git a/clocks/widget.go b/modules/clocks/widget.go
similarity index 100%
rename from clocks/widget.go
rename to modules/clocks/widget.go
diff --git a/cmdrunner/widget.go b/modules/cmdrunner/widget.go
similarity index 100%
rename from cmdrunner/widget.go
rename to modules/cmdrunner/widget.go
diff --git a/cryptoexchanges/bittrex/bittrex.go b/modules/cryptoexchanges/bittrex/bittrex.go
similarity index 100%
rename from cryptoexchanges/bittrex/bittrex.go
rename to modules/cryptoexchanges/bittrex/bittrex.go
diff --git a/cryptoexchanges/bittrex/display.go b/modules/cryptoexchanges/bittrex/display.go
similarity index 100%
rename from cryptoexchanges/bittrex/display.go
rename to modules/cryptoexchanges/bittrex/display.go
diff --git a/cryptoexchanges/bittrex/widget.go b/modules/cryptoexchanges/bittrex/widget.go
similarity index 100%
rename from cryptoexchanges/bittrex/widget.go
rename to modules/cryptoexchanges/bittrex/widget.go
diff --git a/cryptoexchanges/blockfolio/widget.go b/modules/cryptoexchanges/blockfolio/widget.go
similarity index 100%
rename from cryptoexchanges/blockfolio/widget.go
rename to modules/cryptoexchanges/blockfolio/widget.go
diff --git a/cryptoexchanges/cryptolive/price/price.go b/modules/cryptoexchanges/cryptolive/price/price.go
similarity index 100%
rename from cryptoexchanges/cryptolive/price/price.go
rename to modules/cryptoexchanges/cryptolive/price/price.go
diff --git a/cryptoexchanges/cryptolive/price/widget.go b/modules/cryptoexchanges/cryptolive/price/widget.go
similarity index 100%
rename from cryptoexchanges/cryptolive/price/widget.go
rename to modules/cryptoexchanges/cryptolive/price/widget.go
diff --git a/cryptoexchanges/cryptolive/toplist/display.go b/modules/cryptoexchanges/cryptolive/toplist/display.go
similarity index 100%
rename from cryptoexchanges/cryptolive/toplist/display.go
rename to modules/cryptoexchanges/cryptolive/toplist/display.go
diff --git a/cryptoexchanges/cryptolive/toplist/toplist.go b/modules/cryptoexchanges/cryptolive/toplist/toplist.go
similarity index 100%
rename from cryptoexchanges/cryptolive/toplist/toplist.go
rename to modules/cryptoexchanges/cryptolive/toplist/toplist.go
diff --git a/cryptoexchanges/cryptolive/toplist/widget.go b/modules/cryptoexchanges/cryptolive/toplist/widget.go
similarity index 100%
rename from cryptoexchanges/cryptolive/toplist/widget.go
rename to modules/cryptoexchanges/cryptolive/toplist/widget.go
diff --git a/cryptoexchanges/cryptolive/widget.go b/modules/cryptoexchanges/cryptolive/widget.go
similarity index 89%
rename from cryptoexchanges/cryptolive/widget.go
rename to modules/cryptoexchanges/cryptolive/widget.go
index 70a33195..1671bfb2 100644
--- a/cryptoexchanges/cryptolive/widget.go
+++ b/modules/cryptoexchanges/cryptolive/widget.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"github.com/rivo/tview"
-	"github.com/wtfutil/wtf/cryptoexchanges/cryptolive/price"
-	"github.com/wtfutil/wtf/cryptoexchanges/cryptolive/toplist"
+	"github.com/wtfutil/wtf/modules/cryptoexchanges/cryptolive/price"
+	"github.com/wtfutil/wtf/modules/cryptoexchanges/cryptolive/toplist"
 	"github.com/wtfutil/wtf/wtf"
 )
 
diff --git a/datadog/client.go b/modules/datadog/client.go
similarity index 100%
rename from datadog/client.go
rename to modules/datadog/client.go
diff --git a/datadog/widget.go b/modules/datadog/widget.go
similarity index 100%
rename from datadog/widget.go
rename to modules/datadog/widget.go
diff --git a/gcal/cal_event.go b/modules/gcal/cal_event.go
similarity index 100%
rename from gcal/cal_event.go
rename to modules/gcal/cal_event.go
diff --git a/gcal/client.go b/modules/gcal/client.go
similarity index 100%
rename from gcal/client.go
rename to modules/gcal/client.go
diff --git a/gcal/display.go b/modules/gcal/display.go
similarity index 100%
rename from gcal/display.go
rename to modules/gcal/display.go
diff --git a/gcal/widget.go b/modules/gcal/widget.go
similarity index 100%
rename from gcal/widget.go
rename to modules/gcal/widget.go
diff --git a/gerrit/display.go b/modules/gerrit/display.go
similarity index 100%
rename from gerrit/display.go
rename to modules/gerrit/display.go
diff --git a/gerrit/gerrit_repo.go b/modules/gerrit/gerrit_repo.go
similarity index 100%
rename from gerrit/gerrit_repo.go
rename to modules/gerrit/gerrit_repo.go
diff --git a/gerrit/widget.go b/modules/gerrit/widget.go
similarity index 100%
rename from gerrit/widget.go
rename to modules/gerrit/widget.go
diff --git a/git/display.go b/modules/git/display.go
similarity index 100%
rename from git/display.go
rename to modules/git/display.go
diff --git a/git/git_repo.go b/modules/git/git_repo.go
similarity index 100%
rename from git/git_repo.go
rename to modules/git/git_repo.go
diff --git a/git/widget.go b/modules/git/widget.go
similarity index 100%
rename from git/widget.go
rename to modules/git/widget.go
diff --git a/github/display.go b/modules/github/display.go
similarity index 100%
rename from github/display.go
rename to modules/github/display.go
diff --git a/github/github_repo.go b/modules/github/github_repo.go
similarity index 100%
rename from github/github_repo.go
rename to modules/github/github_repo.go
diff --git a/github/widget.go b/modules/github/widget.go
similarity index 100%
rename from github/widget.go
rename to modules/github/widget.go
diff --git a/gitlab/display.go b/modules/gitlab/display.go
similarity index 100%
rename from gitlab/display.go
rename to modules/gitlab/display.go
diff --git a/gitlab/gitlab_repo.go b/modules/gitlab/gitlab_repo.go
similarity index 100%
rename from gitlab/gitlab_repo.go
rename to modules/gitlab/gitlab_repo.go
diff --git a/gitlab/widget.go b/modules/gitlab/widget.go
similarity index 100%
rename from gitlab/widget.go
rename to modules/gitlab/widget.go
diff --git a/gitter/client.go b/modules/gitter/client.go
similarity index 100%
rename from gitter/client.go
rename to modules/gitter/client.go
diff --git a/gitter/gitter.go b/modules/gitter/gitter.go
similarity index 100%
rename from gitter/gitter.go
rename to modules/gitter/gitter.go
diff --git a/gitter/widget.go b/modules/gitter/widget.go
similarity index 100%
rename from gitter/widget.go
rename to modules/gitter/widget.go
diff --git a/gspreadsheets/client.go b/modules/gspreadsheets/client.go
similarity index 100%
rename from gspreadsheets/client.go
rename to modules/gspreadsheets/client.go
diff --git a/gspreadsheets/widget.go b/modules/gspreadsheets/widget.go
similarity index 100%
rename from gspreadsheets/widget.go
rename to modules/gspreadsheets/widget.go
diff --git a/hackernews/client.go b/modules/hackernews/client.go
similarity index 100%
rename from hackernews/client.go
rename to modules/hackernews/client.go
diff --git a/hackernews/story.go b/modules/hackernews/story.go
similarity index 100%
rename from hackernews/story.go
rename to modules/hackernews/story.go
diff --git a/hackernews/widget.go b/modules/hackernews/widget.go
similarity index 100%
rename from hackernews/widget.go
rename to modules/hackernews/widget.go
diff --git a/ipaddresses/ipapi/widget.go b/modules/ipaddresses/ipapi/widget.go
similarity index 100%
rename from ipaddresses/ipapi/widget.go
rename to modules/ipaddresses/ipapi/widget.go
diff --git a/ipaddresses/ipinfo/widget.go b/modules/ipaddresses/ipinfo/widget.go
similarity index 100%
rename from ipaddresses/ipinfo/widget.go
rename to modules/ipaddresses/ipinfo/widget.go
diff --git a/jenkins/client.go b/modules/jenkins/client.go
similarity index 100%
rename from jenkins/client.go
rename to modules/jenkins/client.go
diff --git a/jenkins/job.go b/modules/jenkins/job.go
similarity index 100%
rename from jenkins/job.go
rename to modules/jenkins/job.go
diff --git a/jenkins/view.go b/modules/jenkins/view.go
similarity index 100%
rename from jenkins/view.go
rename to modules/jenkins/view.go
diff --git a/jenkins/widget.go b/modules/jenkins/widget.go
similarity index 100%
rename from jenkins/widget.go
rename to modules/jenkins/widget.go
diff --git a/jira/client.go b/modules/jira/client.go
similarity index 100%
rename from jira/client.go
rename to modules/jira/client.go
diff --git a/jira/issues.go b/modules/jira/issues.go
similarity index 100%
rename from jira/issues.go
rename to modules/jira/issues.go
diff --git a/jira/search_result.go b/modules/jira/search_result.go
similarity index 100%
rename from jira/search_result.go
rename to modules/jira/search_result.go
diff --git a/jira/widget.go b/modules/jira/widget.go
similarity index 100%
rename from jira/widget.go
rename to modules/jira/widget.go
diff --git a/mercurial/display.go b/modules/mercurial/display.go
similarity index 100%
rename from mercurial/display.go
rename to modules/mercurial/display.go
diff --git a/mercurial/hg_repo.go b/modules/mercurial/hg_repo.go
similarity index 100%
rename from mercurial/hg_repo.go
rename to modules/mercurial/hg_repo.go
diff --git a/mercurial/widget.go b/modules/mercurial/widget.go
similarity index 100%
rename from mercurial/widget.go
rename to modules/mercurial/widget.go
diff --git a/newrelic/client.go b/modules/newrelic/client.go
similarity index 100%
rename from newrelic/client.go
rename to modules/newrelic/client.go
diff --git a/newrelic/widget.go b/modules/newrelic/widget.go
similarity index 100%
rename from newrelic/widget.go
rename to modules/newrelic/widget.go
diff --git a/opsgenie/client.go b/modules/opsgenie/client.go
similarity index 100%
rename from opsgenie/client.go
rename to modules/opsgenie/client.go
diff --git a/opsgenie/widget.go b/modules/opsgenie/widget.go
similarity index 100%
rename from opsgenie/widget.go
rename to modules/opsgenie/widget.go
diff --git a/pagerduty/client.go b/modules/pagerduty/client.go
similarity index 100%
rename from pagerduty/client.go
rename to modules/pagerduty/client.go
diff --git a/pagerduty/sort.go b/modules/pagerduty/sort.go
similarity index 100%
rename from pagerduty/sort.go
rename to modules/pagerduty/sort.go
diff --git a/pagerduty/widget.go b/modules/pagerduty/widget.go
similarity index 100%
rename from pagerduty/widget.go
rename to modules/pagerduty/widget.go
diff --git a/power/battery.go b/modules/power/battery.go
similarity index 100%
rename from power/battery.go
rename to modules/power/battery.go
diff --git a/power/battery_linux.go b/modules/power/battery_linux.go
similarity index 100%
rename from power/battery_linux.go
rename to modules/power/battery_linux.go
diff --git a/power/source.go b/modules/power/source.go
similarity index 100%
rename from power/source.go
rename to modules/power/source.go
diff --git a/power/source_linux.go b/modules/power/source_linux.go
similarity index 100%
rename from power/source_linux.go
rename to modules/power/source_linux.go
diff --git a/power/widget.go b/modules/power/widget.go
similarity index 100%
rename from power/widget.go
rename to modules/power/widget.go
diff --git a/resourceusage/widget.go b/modules/resourceusage/widget.go
similarity index 100%
rename from resourceusage/widget.go
rename to modules/resourceusage/widget.go
diff --git a/rollbar/client.go b/modules/rollbar/client.go
similarity index 100%
rename from rollbar/client.go
rename to modules/rollbar/client.go
diff --git a/rollbar/rollbar.go b/modules/rollbar/rollbar.go
similarity index 100%
rename from rollbar/rollbar.go
rename to modules/rollbar/rollbar.go
diff --git a/rollbar/widget.go b/modules/rollbar/widget.go
similarity index 100%
rename from rollbar/widget.go
rename to modules/rollbar/widget.go
diff --git a/security/dns.go b/modules/security/dns.go
similarity index 100%
rename from security/dns.go
rename to modules/security/dns.go
diff --git a/security/firewall.go b/modules/security/firewall.go
similarity index 100%
rename from security/firewall.go
rename to modules/security/firewall.go
diff --git a/security/security_data.go b/modules/security/security_data.go
similarity index 100%
rename from security/security_data.go
rename to modules/security/security_data.go
diff --git a/security/users.go b/modules/security/users.go
similarity index 100%
rename from security/users.go
rename to modules/security/users.go
diff --git a/security/widget.go b/modules/security/widget.go
similarity index 100%
rename from security/widget.go
rename to modules/security/widget.go
diff --git a/security/wifi.go b/modules/security/wifi.go
similarity index 100%
rename from security/wifi.go
rename to modules/security/wifi.go
diff --git a/spotify/widget.go b/modules/spotify/widget.go
similarity index 100%
rename from spotify/widget.go
rename to modules/spotify/widget.go
diff --git a/spotifyweb/widget.go b/modules/spotifyweb/widget.go
similarity index 100%
rename from spotifyweb/widget.go
rename to modules/spotifyweb/widget.go
diff --git a/status/widget.go b/modules/status/widget.go
similarity index 100%
rename from status/widget.go
rename to modules/status/widget.go
diff --git a/system/system_info.go b/modules/system/system_info.go
similarity index 100%
rename from system/system_info.go
rename to modules/system/system_info.go
diff --git a/system/system_info_windows.go b/modules/system/system_info_windows.go
similarity index 100%
rename from system/system_info_windows.go
rename to modules/system/system_info_windows.go
diff --git a/system/widget.go b/modules/system/widget.go
similarity index 100%
rename from system/widget.go
rename to modules/system/widget.go
diff --git a/textfile/widget.go b/modules/textfile/widget.go
similarity index 100%
rename from textfile/widget.go
rename to modules/textfile/widget.go
diff --git a/todo/display.go b/modules/todo/display.go
similarity index 100%
rename from todo/display.go
rename to modules/todo/display.go
diff --git a/todo/widget.go b/modules/todo/widget.go
similarity index 100%
rename from todo/widget.go
rename to modules/todo/widget.go
diff --git a/todoist/display.go b/modules/todoist/display.go
similarity index 100%
rename from todoist/display.go
rename to modules/todoist/display.go
diff --git a/todoist/project.go b/modules/todoist/project.go
similarity index 100%
rename from todoist/project.go
rename to modules/todoist/project.go
diff --git a/todoist/widget.go b/modules/todoist/widget.go
similarity index 100%
rename from todoist/widget.go
rename to modules/todoist/widget.go
diff --git a/travisci/client.go b/modules/travisci/client.go
similarity index 100%
rename from travisci/client.go
rename to modules/travisci/client.go
diff --git a/travisci/travis.go b/modules/travisci/travis.go
similarity index 100%
rename from travisci/travis.go
rename to modules/travisci/travis.go
diff --git a/travisci/widget.go b/modules/travisci/widget.go
similarity index 100%
rename from travisci/widget.go
rename to modules/travisci/widget.go
diff --git a/trello/card.go b/modules/trello/card.go
similarity index 100%
rename from trello/card.go
rename to modules/trello/card.go
diff --git a/trello/client.go b/modules/trello/client.go
similarity index 100%
rename from trello/client.go
rename to modules/trello/client.go
diff --git a/trello/search_result.go b/modules/trello/search_result.go
similarity index 100%
rename from trello/search_result.go
rename to modules/trello/search_result.go
diff --git a/trello/widget.go b/modules/trello/widget.go
similarity index 100%
rename from trello/widget.go
rename to modules/trello/widget.go
diff --git a/twitter/client.go b/modules/twitter/client.go
similarity index 100%
rename from twitter/client.go
rename to modules/twitter/client.go
diff --git a/twitter/request.go b/modules/twitter/request.go
similarity index 100%
rename from twitter/request.go
rename to modules/twitter/request.go
diff --git a/twitter/tweet.go b/modules/twitter/tweet.go
similarity index 100%
rename from twitter/tweet.go
rename to modules/twitter/tweet.go
diff --git a/twitter/user.go b/modules/twitter/user.go
similarity index 100%
rename from twitter/user.go
rename to modules/twitter/user.go
diff --git a/twitter/widget.go b/modules/twitter/widget.go
similarity index 100%
rename from twitter/widget.go
rename to modules/twitter/widget.go
diff --git a/unknown/widget.go b/modules/unknown/widget.go
similarity index 100%
rename from unknown/widget.go
rename to modules/unknown/widget.go
diff --git a/victorops/client.go b/modules/victorops/client.go
similarity index 100%
rename from victorops/client.go
rename to modules/victorops/client.go
diff --git a/victorops/oncallresponse.go b/modules/victorops/oncallresponse.go
similarity index 100%
rename from victorops/oncallresponse.go
rename to modules/victorops/oncallresponse.go
diff --git a/victorops/oncallteam.go b/modules/victorops/oncallteam.go
similarity index 100%
rename from victorops/oncallteam.go
rename to modules/victorops/oncallteam.go
diff --git a/victorops/widget.go b/modules/victorops/widget.go
similarity index 100%
rename from victorops/widget.go
rename to modules/victorops/widget.go
diff --git a/weatherservices/prettyweather/widget.go b/modules/weatherservices/prettyweather/widget.go
similarity index 100%
rename from weatherservices/prettyweather/widget.go
rename to modules/weatherservices/prettyweather/widget.go
diff --git a/weatherservices/weather/display.go b/modules/weatherservices/weather/display.go
similarity index 100%
rename from weatherservices/weather/display.go
rename to modules/weatherservices/weather/display.go
diff --git a/weatherservices/weather/emoji.go b/modules/weatherservices/weather/emoji.go
similarity index 100%
rename from weatherservices/weather/emoji.go
rename to modules/weatherservices/weather/emoji.go
diff --git a/weatherservices/weather/widget.go b/modules/weatherservices/weather/widget.go
similarity index 100%
rename from weatherservices/weather/widget.go
rename to modules/weatherservices/weather/widget.go
diff --git a/zendesk/client.go b/modules/zendesk/client.go
similarity index 100%
rename from zendesk/client.go
rename to modules/zendesk/client.go
diff --git a/zendesk/tickets.go b/modules/zendesk/tickets.go
similarity index 100%
rename from zendesk/tickets.go
rename to modules/zendesk/tickets.go
diff --git a/zendesk/widget.go b/modules/zendesk/widget.go
similarity index 100%
rename from zendesk/widget.go
rename to modules/zendesk/widget.go