diff --git a/src/plugins/Dropbox/index.js b/src/plugins/Dropbox/index.js
index 61b3a5312..6ac4fc0d8 100644
--- a/src/plugins/Dropbox/index.js
+++ b/src/plugins/Dropbox/index.js
@@ -1,9 +1,7 @@
 const html = require('yo-yo')
 const Plugin = require('../../core/Plugin')
-
-const Provider = require('../../Provider')
-
-const View = require('../../generic-provider-views')
+const Provider = require('../Provider')
+const View = require('../Provider/view')
 const icons = require('./icons')
 
 module.exports = class Dropbox extends Plugin {
diff --git a/src/plugins/GoogleDrive/index.js b/src/plugins/GoogleDrive/index.js
index ada315166..8d06e2263 100644
--- a/src/plugins/GoogleDrive/index.js
+++ b/src/plugins/GoogleDrive/index.js
@@ -1,9 +1,7 @@
 const html = require('yo-yo')
 const Plugin = require('../../core/Plugin')
-
-const Provider = require('../../Provider')
-
-const View = require('../../generic-provider-views')
+const Provider = require('../Provider')
+const View = require('../Provider/view')
 
 module.exports = class GoogleDrive extends Plugin {
   constructor (core, opts) {
diff --git a/src/plugins/Instagram/index.js b/src/plugins/Instagram/index.js
index fb5865442..c20ad9ad6 100644
--- a/src/plugins/Instagram/index.js
+++ b/src/plugins/Instagram/index.js
@@ -1,9 +1,7 @@
 const html = require('yo-yo')
 const Plugin = require('../../core/Plugin')
-
-const Provider = require('../../Provider')
-
-const View = require('../../generic-provider-views')
+const Provider = require('../Provider')
+const View = require('../Provider/view')
 
 module.exports = class Instagram extends Plugin {
   constructor (core, opts) {
diff --git a/src/Provider.js b/src/plugins/Provider/index.js
similarity index 100%
rename from src/Provider.js
rename to src/plugins/Provider/index.js
diff --git a/src/generic-provider-views/AuthView.js b/src/plugins/Provider/view/AuthView.js
similarity index 100%
rename from src/generic-provider-views/AuthView.js
rename to src/plugins/Provider/view/AuthView.js
diff --git a/src/generic-provider-views/Breadcrumb.js b/src/plugins/Provider/view/Breadcrumb.js
similarity index 100%
rename from src/generic-provider-views/Breadcrumb.js
rename to src/plugins/Provider/view/Breadcrumb.js
diff --git a/src/generic-provider-views/Breadcrumbs.js b/src/plugins/Provider/view/Breadcrumbs.js
similarity index 100%
rename from src/generic-provider-views/Breadcrumbs.js
rename to src/plugins/Provider/view/Breadcrumbs.js
diff --git a/src/generic-provider-views/Browser.js b/src/plugins/Provider/view/Browser.js
similarity index 100%
rename from src/generic-provider-views/Browser.js
rename to src/plugins/Provider/view/Browser.js
diff --git a/src/generic-provider-views/Loader.js b/src/plugins/Provider/view/Loader.js
similarity index 100%
rename from src/generic-provider-views/Loader.js
rename to src/plugins/Provider/view/Loader.js
diff --git a/src/generic-provider-views/Table.js b/src/plugins/Provider/view/Table.js
similarity index 100%
rename from src/generic-provider-views/Table.js
rename to src/plugins/Provider/view/Table.js
diff --git a/src/generic-provider-views/TableColumn.js b/src/plugins/Provider/view/TableColumn.js
similarity index 100%
rename from src/generic-provider-views/TableColumn.js
rename to src/plugins/Provider/view/TableColumn.js
diff --git a/src/generic-provider-views/TableRow.js b/src/plugins/Provider/view/TableRow.js
similarity index 100%
rename from src/generic-provider-views/TableRow.js
rename to src/plugins/Provider/view/TableRow.js
diff --git a/src/generic-provider-views/index.js b/src/plugins/Provider/view/index.js
similarity index 99%
rename from src/generic-provider-views/index.js
rename to src/plugins/Provider/view/index.js
index 95c0c1afe..162931934 100644
--- a/src/generic-provider-views/index.js
+++ b/src/plugins/Provider/view/index.js
@@ -1,7 +1,7 @@
 const AuthView = require('./AuthView')
 const Browser = require('./Browser')
 const LoaderView = require('./Loader')
-const Utils = require('../core/Utils')
+const Utils = require('../../../core/Utils')
 
 /**
  * Class to easily generate generic views for plugins