diff --git a/lib/Drupal/twitter/Plugin/Core/Entity/TwitterAccount.php b/src/Entity/TwitterAccount.php
similarity index 100%
rename from lib/Drupal/twitter/Plugin/Core/Entity/TwitterAccount.php
rename to src/Entity/TwitterAccount.php
diff --git a/lib/Drupal/twitter/Plugin/Core/Entity/TwitterStatus.php b/src/Entity/TwitterStatus.php
similarity index 100%
rename from lib/Drupal/twitter/Plugin/Core/Entity/TwitterStatus.php
rename to src/Entity/TwitterStatus.php
diff --git a/lib/Drupal/twitter/Form/TwitterSettingsForm.php b/src/Form/TwitterSettingsForm.php
similarity index 100%
rename from lib/Drupal/twitter/Form/TwitterSettingsForm.php
rename to src/Form/TwitterSettingsForm.php
diff --git a/lib/Drupal/twitter/Tests/TwitterCore.php b/src/Tests/TwitterCore.php
similarity index 77%
rename from lib/Drupal/twitter/Tests/TwitterCore.php
rename to src/Tests/TwitterCore.php
index c36ab98..8cec611 100644
--- a/lib/Drupal/twitter/Tests/TwitterCore.php
+++ b/src/Tests/TwitterCore.php
@@ -11,6 +11,8 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests the Twitter module functionality.
+ *
+ * @group Twitter
  */
 class TwitterCore extends WebTestBase {
 
@@ -19,28 +21,18 @@ class TwitterCore extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('twitter', 'views', 'twitter_mock');
-
-  protected $user;
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Main tests',
-      'description' => 'Tests main module features such as adding accounts or loading tweets.',
-      'group' => 'Twitter',
-    );
-  }
+  public static $modules = array('twitter', 'views');
 
   /**
    * Tests account addition without Oauth module activated
    */
   public function testAccountAdditionNoOauth() {
     // Create user
-    $this->user = $this->drupalCreateUser(array(
+    $twitter_user = $this->drupalCreateUser(array(
       'add twitter accounts',
       'import own tweets',
     ));
-    $this->drupalLogin($this->user);
+    $this->drupalLogin($twitter_user);
 
     // Add a Twitter account
     $edit = array(
diff --git a/lib/Drupal/twitter/Tests/TwitterInputFilters.php b/src/Tests/TwitterInputFilters.php
similarity index 84%
rename from lib/Drupal/twitter/Tests/TwitterInputFilters.php
rename to src/Tests/TwitterInputFilters.php
index 90aba73..25e514d 100644
--- a/lib/Drupal/twitter/Tests/TwitterInputFilters.php
+++ b/src/Tests/TwitterInputFilters.php
@@ -16,28 +16,18 @@ class TwitterInputFilters extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('twitter');
-
-  protected $privileged_user;
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Input filters',
-      'description' => 'Tests input filters provided by the Twitter module.',
-      'group' => 'Twitter',
-    );
-  }
+  public static $modules = array('filter', 'node', 'twitter');
 
   /**
    * Tests input filters
    */
   public function testInputFilters() {
     // Create user
-    $this->privileged_user = $this->drupalCreateUser(array(
+    $privileged_user = $this->drupalCreateUser(array(
       'bypass node access',
       'administer filters',
     ));
-    $this->drupalLogin($this->privileged_user);
+    $this->drupalLogin($privileged_user);
 
     // Activate twitter input filters
     $edit = array(
diff --git a/lib/Drupal/twitter/TwitterAccountStorageController.php b/src/TwitterAccountStorageController.php
similarity index 100%
rename from lib/Drupal/twitter/TwitterAccountStorageController.php
rename to src/TwitterAccountStorageController.php
diff --git a/twitter.info.yml b/twitter.info.yml
index 9526aab..ac5e21f 100644
--- a/twitter.info.yml
+++ b/twitter.info.yml
@@ -5,7 +5,6 @@ package: Twitter
 core: 8.x
 dependencies:
   - views
-  - entity
   - libraries
   - oauth
 configure: admin/config/services/twitter
diff --git a/twitter.permissions.yml b/twitter.permissions.yml
new file mode 100644
index 0000000..1a8e07f
--- /dev/null
+++ b/twitter.permissions.yml
@@ -0,0 +1,4 @@
+add twitter accounts:
+    title: 'Add Twitter accounts'
+import own tweets:
+    title: 'Import Own Tweets'