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 100%
rename from lib/Drupal/twitter/Tests/TwitterCore.php
rename to src/Tests/TwitterCore.php
diff --git a/lib/Drupal/twitter/Tests/TwitterInputFilters.php b/src/Tests/TwitterInputFilters.php
similarity index 100%
rename from lib/Drupal/twitter/Tests/TwitterInputFilters.php
rename to src/Tests/TwitterInputFilters.php
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