diff --git a/accountProviders.go b/accountProviders.go
index 0e99733..4ece5c8 100644
--- a/accountProviders.go
+++ b/accountProviders.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"deadbeef.codes/steven/ynab-portfolio-monitor/bitcoin"
-	"deadbeef.codes/steven/ynab-portfolio-monitor/questrade"
-	"deadbeef.codes/steven/ynab-portfolio-monitor/staticjsonFinnhub"
-	"deadbeef.codes/steven/ynab-portfolio-monitor/staticjsonYahooFinance"
+	"deadbeef.codes/steven/ynab-portfolio-monitor/providers/bitcoin"
+	"deadbeef.codes/steven/ynab-portfolio-monitor/providers/questrade"
+	"deadbeef.codes/steven/ynab-portfolio-monitor/providers/staticjsonFinnhub"
+	"deadbeef.codes/steven/ynab-portfolio-monitor/providers/staticjsonYahooFinance"
 )
 
 // AccountProvider is the base set of requirements to be implemented for any integration
diff --git a/bitcoin/README.md b/providers/bitcoin/README.md
similarity index 100%
rename from bitcoin/README.md
rename to providers/bitcoin/README.md
diff --git a/bitcoin/address.go b/providers/bitcoin/address.go
similarity index 100%
rename from bitcoin/address.go
rename to providers/bitcoin/address.go
diff --git a/bitcoin/client.go b/providers/bitcoin/client.go
similarity index 100%
rename from bitcoin/client.go
rename to providers/bitcoin/client.go
diff --git a/bitcoin/fiat.go b/providers/bitcoin/fiat.go
similarity index 100%
rename from bitcoin/fiat.go
rename to providers/bitcoin/fiat.go
diff --git a/bitcoin/providerImpl.go b/providers/bitcoin/providerImpl.go
similarity index 100%
rename from bitcoin/providerImpl.go
rename to providers/bitcoin/providerImpl.go
diff --git a/questrade/README.md b/providers/questrade/README.md
similarity index 100%
rename from questrade/README.md
rename to providers/questrade/README.md
diff --git a/questrade/account.go b/providers/questrade/account.go
similarity index 100%
rename from questrade/account.go
rename to providers/questrade/account.go
diff --git a/questrade/client.go b/providers/questrade/client.go
similarity index 100%
rename from questrade/client.go
rename to providers/questrade/client.go
diff --git a/questrade/errors.go b/providers/questrade/errors.go
similarity index 100%
rename from questrade/errors.go
rename to providers/questrade/errors.go
diff --git a/questrade/providerImpl.go b/providers/questrade/providerImpl.go
similarity index 100%
rename from questrade/providerImpl.go
rename to providers/questrade/providerImpl.go
diff --git a/staticjsonFinnhub/README.md b/providers/staticjsonFinnhub/README.md
similarity index 100%
rename from staticjsonFinnhub/README.md
rename to providers/staticjsonFinnhub/README.md
diff --git a/staticjsonFinnhub/client.go b/providers/staticjsonFinnhub/client.go
similarity index 100%
rename from staticjsonFinnhub/client.go
rename to providers/staticjsonFinnhub/client.go
diff --git a/staticjsonFinnhub/providerImpl.go b/providers/staticjsonFinnhub/providerImpl.go
similarity index 100%
rename from staticjsonFinnhub/providerImpl.go
rename to providers/staticjsonFinnhub/providerImpl.go
diff --git a/staticjsonFinnhub/quote.go b/providers/staticjsonFinnhub/quote.go
similarity index 100%
rename from staticjsonFinnhub/quote.go
rename to providers/staticjsonFinnhub/quote.go
diff --git a/staticjsonYahooFinance/README.md b/providers/staticjsonYahooFinance/README.md
similarity index 100%
rename from staticjsonYahooFinance/README.md
rename to providers/staticjsonYahooFinance/README.md
diff --git a/staticjsonYahooFinance/chart.go b/providers/staticjsonYahooFinance/chart.go
similarity index 100%
rename from staticjsonYahooFinance/chart.go
rename to providers/staticjsonYahooFinance/chart.go
diff --git a/staticjsonYahooFinance/client.go b/providers/staticjsonYahooFinance/client.go
similarity index 100%
rename from staticjsonYahooFinance/client.go
rename to providers/staticjsonYahooFinance/client.go
diff --git a/staticjsonYahooFinance/providerImpl.go b/providers/staticjsonYahooFinance/providerImpl.go
similarity index 100%
rename from staticjsonYahooFinance/providerImpl.go
rename to providers/staticjsonYahooFinance/providerImpl.go