diff --git a/lib/Drupal/profile2/Plugin/Core/Entity/Profile.php b/lib/Drupal/profile2/Plugin/Core/Entity/Profile.php
new file mode 100644
index 0000000..67addf4
--- /dev/null
+++ b/lib/Drupal/profile2/Plugin/Core/Entity/Profile.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\profile2\Plugin\Core\Entity\Profile.
+ */
+
+namespace Drupal\profile2\Plugin\Core\Entity;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\Entity;
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+
+/**
+ * Defines the profile entity class.
+ *
+ * @Plugin(
+ *   id = "profile2",
+ *   label = @Translation("Profile"),
+ *   module = "profile2",
+ *   controller_class = "Drupal\profile2\ProfileStorageController",
+ *   form_controller_class = {
+ *     "default" = "Drupal\profile2\ProfileFormController"
+ *   },
+ *   base_table = "profile",
+ *   uri_callback = "profile2_profile_uri",
+ *   fieldable = TRUE,
+ *   entity_keys = {
+ *     "id" = "pid",
+ *     "uuid" = "uuid",
+ *     "bundle" = "type",
+ *     "label" = "label"
+ *   },
+ *   bundle_keys = {
+ *     "bundle" = "id"
+ *   },
+ *   view_modes = {
+ *     "account" = {
+ *       "label" = "User account",
+ *       "custom_settings" = FALSE
+ *     }
+ *   }
+ * )
+ */
+class Profile extends Entity implements ContentEntityInterface {
+
+  /**
+   * The profile id.
+   *
+   * @var integer
+   */
+  public $pid;
+
+  /**
+   * The profile UUID.
+   *
+   * @var string
+   */
+  public $uuid;
+
+  /**
+   * The name of the profile type.
+   *
+   * @var string
+   */
+  public $type;
+
+  /**
+   * The profile label.
+   *
+   * @var string
+   */
+  public $label;
+
+  /**
+   * The user id of the profile owner.
+   *
+   * @var integer
+   */
+  public $uid;
+
+  /**
+   * The Unix timestamp when the profile was created.
+   *
+   * @var integer
+   */
+  public $created;
+
+  /**
+   * The Unix timestamp when the profile was most recently saved.
+   *
+   * @var integer
+   */
+  public $changed;
+
+  /**
+   * Overrides Drupal\Core\Entity\Entity::id().
+   */
+  public function id() {
+    return isset($this->pid) ? $this->pid : NULL;
+  }
+
+  /**
+   * Overrides Drupal\Core\Entity\Entity::bundle().
+   */
+  public function bundle() {
+    return $this->type;
+  }
+
+  /**
+   * Overrides Drupal\Core\Entity\Entity::label().
+   */
+  public function label($langcode = NULL) {
+    if (isset($this->label) && $this->label !== '') {
+      return $this->label;
+    }
+    else {
+      return entity_load('profile2_type', $this->type)->label($langcode);
+    }
+  }
+
+}
diff --git a/lib/Drupal/profile2/Plugin/Core/Entity/ProfileType.php b/lib/Drupal/profile2/Plugin/Core/Entity/ProfileType.php
new file mode 100644
index 0000000..2a6236c
--- /dev/null
+++ b/lib/Drupal/profile2/Plugin/Core/Entity/ProfileType.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\profile2\Plugin\Core\Entity\ProfileType.
+ */
+
+namespace Drupal\profile2\Plugin\Core\Entity;
+
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+
+/**
+ * Defines the profile type entity class.
+ *
+ * @Plugin(
+ *   id = "profile2_type",
+ *   label = @Translation("Profile type"),
+ *   module = "profile2",
+ *   controller_class = "Drupal\profile2\ProfileTypeStorageController",
+ *   list_controller_class = "Drupal\profile2\ProfileTypeListController",
+ *   form_controller_class = {
+ *     "default" = "Drupal\profile2\ProfileTypeFormController"
+ *   },
+ *   config_prefix = "profile2.type",
+ *   uri_callback = "profile2_profile_type_uri",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label"
+ *   }
+ * )
+ */
+class ProfileType extends ConfigEntityBase {
+
+  public $id;
+  public $uuid;
+  public $label;
+
+  public $weight = 0;
+
+  /**
+   * Whether profile type is shown during registration.
+   *
+   * @var boolean
+   */
+  public $registration = FALSE;
+
+  /**
+   * Whether the profile type appears in the user categories.
+   */
+  public $userCategory = TRUE;
+
+  /**
+   * Whether the profile is displayed on the user account page.
+   */
+  public $userView = TRUE;
+
+}
diff --git a/lib/Drupal/profile2/Profile.php b/lib/Drupal/profile2/Profile.php
deleted file mode 100644
index 2dd351a..0000000
--- a/lib/Drupal/profile2/Profile.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains Drupal\profile2\Profile.
- */
-
-namespace Drupal\profile2;
-
-use Drupal\Core\Entity\Entity;
-
-/**
- * The class used for profile entities.
- */
-class Profile extends Entity {
-
-  /**
-   * The profile id.
-   *
-   * @var integer
-   */
-  public $pid;
-
-  /**
-   * The profile UUID.
-   *
-   * @var string
-   */
-  public $uuid;
-
-  /**
-   * The name of the profile type.
-   *
-   * @var string
-   */
-  public $type;
-
-  /**
-   * The profile label.
-   *
-   * @var string
-   */
-  public $label;
-
-  /**
-   * The user id of the profile owner.
-   *
-   * @var integer
-   */
-  public $uid;
-
-  /**
-   * The Unix timestamp when the profile was created.
-   *
-   * @var integer
-   */
-  public $created;
-
-  /**
-   * The Unix timestamp when the profile was most recently saved.
-   *
-   * @var integer
-   */
-  public $changed;
-
-  /**
-   * Overrides Drupal\Core\Entity\Entity::id().
-   */
-  public function id() {
-    return isset($this->pid) ? $this->pid : NULL;
-  }
-
-  /**
-   * Overrides Drupal\Core\Entity\Entity::bundle().
-   */
-  public function bundle() {
-    return $this->type;
-  }
-
-  /**
-   * Overrides Drupal\Core\Entity\Entity::label().
-   */
-  public function label($langcode = NULL) {
-    if (isset($this->label) && $this->label !== '') {
-      return $this->label;
-    }
-    else {
-      return entity_load('profile2_type', $this->type)->label($langcode);
-    }
-  }
-
-}
diff --git a/lib/Drupal/profile2/ProfileType.php b/lib/Drupal/profile2/ProfileType.php
deleted file mode 100644
index c458069..0000000
--- a/lib/Drupal/profile2/ProfileType.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains Drupal\profile2\ProfileType.
- */
-
-namespace Drupal\profile2;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-
-/**
- * Use a separate class for profile types so we can specify some defaults
- * modules may alter.
- */
-class ProfileType extends ConfigEntityBase {
-
-  public $id;
-  public $uuid;
-  public $label;
-
-  public $weight = 0;
-
-  /**
-   * Whether profile type is shown during registration.
-   *
-   * @var boolean
-   */
-  public $registration = FALSE;
-
-  /**
-   * Whether the profile type appears in the user categories.
-   */
-  public $userCategory = TRUE;
-
-  /**
-   * Whether the profile is displayed on the user account page.
-   */
-  public $userView = TRUE;
-
-}
diff --git a/profile2.admin.inc b/profile2.admin.inc
index 7fbe835..466ff80 100644
--- a/profile2.admin.inc
+++ b/profile2.admin.inc
@@ -5,7 +5,7 @@
  * Profile type editing UI.
  */
 
-use Drupal\profile2\ProfileType;
+use Drupal\profile2\Plugin\Core\Entity\ProfileType;
 
 /**
  * Page callback: Presents the form for creating a profile type.
@@ -21,7 +21,7 @@ function profile2_type_add() {
 /**
  * Page callback: Presents the form for editing a profile type.
  *
- * @param Drupal\profile2\ProfileType $type
+ * @param Drupal\profile2\Plugin\Core\Entity\ProfileType $type
  *   The profile type to edit.
  *
  * @return array
@@ -35,7 +35,7 @@ function profile2_type_edit(ProfileType $type) {
 /**
  * Form constructor to delete a ProfileType object.
  *
- * @param Drupal\profile2\ProfileType $type
+ * @param Drupal\profile2\Plugin\Core\Entity\ProfileType $type
  *   The ProfileType object to delete.
  */
 function profile2_type_delete_form($form, &$form_state, ProfileType $type) {
diff --git a/profile2.module b/profile2.module
index acecca2..cfbaed3 100644
--- a/profile2.module
+++ b/profile2.module
@@ -5,51 +5,22 @@
  * Support for configurable user profiles.
  */
 
-use Drupal\profile2\Profile;
-use Drupal\profile2\ProfileType;
-use Drupal\user\User;
+use Drupal\profile2\Plugin\Core\Entity\Profile;
+use Drupal\profile2\Plugin\Core\Entity\ProfileType;
+use Drupal\user\Plugin\Core\Entity\User;
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
 
 /**
- * Implements hook_entity_info().
+ * Implements hook_entity_info_alter().
  */
-function profile2_entity_info() {
-  $return = array(
-    'profile2' => array(
-      'label' => t('Profile'),
-      'entity class' => 'Drupal\profile2\Profile',
-      'base table' => 'profile',
-      'uri callback' => 'profile2_profile_uri',
-      'fieldable' => TRUE,
-      'controller class' => 'Drupal\profile2\ProfileStorageController',
-      'form controller class' => array(
-        'default' => 'Drupal\profile2\ProfileFormController',
-      ),
-      'render controller class' => 'Drupal\Core\Entity\EntityRenderController',
-      'view modes' => array(
-        'account' => array(
-          'label' => t('User account'),
-          'custom settings' => FALSE,
-        ),
-      ),
-      'entity keys' => array(
-        'id' => 'pid',
-        'uuid' => 'uuid',
-        'bundle' => 'type',
-        'label' => 'label',
-      ),
-      'bundles' => array(),
-      'bundle keys' => array(
-        'bundle' => 'id',
-      ),
-    ),
-  );
-
+function profile2_entity_info_alter(&$info) {
   // Add bundle info but bypass entity_load() as we cannot use it here.
   $config_names = config_get_storage_names_with_prefix('profile2.type.');
   foreach ($config_names as $config_name) {
     $config = config($config_name);
 
-    $return['profile2']['bundles'][$config->get('id')] = array(
+    $info['profile2']['bundles'][$config->get('id')] = array(
       'label' => $config->get('label'),
       'admin' => array(
         'path' => 'admin/structure/profiles/manage/%profile2_type',
@@ -59,30 +30,12 @@ function profile2_entity_info() {
       ),
     );
   }
-
-  $return['profile2_type'] = array(
-    'label' => t('Profile type'),
-    'entity class' => 'Drupal\profile2\ProfileType',
-    'uri callback' => 'profile2_profile_type_uri',
-    'controller class' => 'Drupal\profile2\ProfileTypeStorageController',
-    'list controller class' => 'Drupal\profile2\ProfileTypeListController',
-    'form controller class' => array(
-      'default' => 'Drupal\profile2\ProfileTypeFormController',
-    ),
-    'config prefix' => 'profile2.type',
-    'entity keys' => array(
-      'id' => 'id',
-      'label' => 'label',
-    ),
-  );
-
-  return $return;
 }
 
 /**
  * Entity URI callback for profiles.
  *
- * @param Drupal\profile2\Profile $profile
+ * @param Drupal\profile2\Plugin\Core\Entity\Profile $profile
  *   A profile entity.
  */
 function profile2_profile_uri(Profile $profile) {
@@ -94,7 +47,7 @@ function profile2_profile_uri(Profile $profile) {
 /**
  * Entity URI callback for profile types.
  *
- * @param Drupal\profile2\ProfileType $profile_type
+ * @param Drupal\profile2\Plugin\Core\Entity\ProfileType $profile_type
  *   A profile type entity.
  */
 function profile2_profile_type_uri(ProfileType $profile_type) {
@@ -189,7 +142,7 @@ function profile2_menu() {
  *   (optional) The operation to perform. If 'edit' and if there is no profile
  *   for the user account yet, a new profile entity will be created on the fly.
  *
- * @return Drupal\profile2\Profile|false
+ * @return Drupal\profile2\Plugin\Core\Entity\Profile|false
  *   The profile of type $type_id of the user account, or FALSE.
  */
 function profile2_menu_load($type_id, $map, $op = '') {
@@ -213,7 +166,7 @@ function profile2_menu_load($type_id, $map, $op = '') {
 /**
  * Menu title callback for a profile edit link.
  *
- * @param Drupal\profile2\Profile $profile
+ * @param Drupal\profile2\Plugin\Core\Entity\Profile $profile
  *   The profile to return a title for.
  *
  * @return string
@@ -281,7 +234,7 @@ function profile2_type_list_page() {
  * @param string $id
  *   The machine-readable name of a profile type to load.
  *
- * @return Drupal\profile2\ProfileType|false
+ * @return Drupal\profile2\Plugin\Core\Entity\ProfileType|false
  *   A profile type array or FALSE if $type does not exist.
  */
 function profile2_type_load($id) {
@@ -332,13 +285,13 @@ function profile2_permission() {
 /**
  * Fetch profiles by account.
  *
- * @param \Drupal\user\User $account
+ * @param \Drupal\user\Plugin\Core\Entity\User $account
  *   The user account to load profiles for.
  * @param string $type_id
  *   (optional) If passed, only the user account's profile of the specified type
  *   is loaded. If omitted, all profiles of the user account are loaded.
  *
- * @return array|\Drupal\profile2\Profile|false
+ * @return array|\Drupal\profile2\Plugin\Core\Entity\Profile|false
  *   If a $type_id was passed, the corresponding profile or FALSE, otherwise all
  *   existing profiles of $account keyed by profile type ID.
  */
@@ -415,7 +368,7 @@ function profile2_form_user_register_form_alter(&$form, &$form_state) {
 /**
  * Menu access callback; Determines edit access for a requested profile.
  *
- * @param Drupal\profile2\Profile $profile
+ * @param Drupal\profile2\Plugin\Core\Entity\Profile $profile
  *   The profile to check for edit access.
  *
  * @return bool
@@ -429,7 +382,7 @@ function profile2_profile_edit_access(Profile $profile) {
 /**
  * Page callback; Presents the form to edit a profile of a user.
  *
- * @param Drupal\profile2\Profile $profile
+ * @param Drupal\profile2\Plugin\Core\Entity\Profile $profile
  *   The user account profile to edit.
  *
  * @return array
diff --git a/profile2.pages.inc b/profile2.pages.inc
index 2b0dd06..1df2ba6 100644
--- a/profile2.pages.inc
+++ b/profile2.pages.inc
@@ -5,12 +5,12 @@
  * Page and form callbacks for profiles.
  */
 
-use Drupal\profile2\Profile;
+use Drupal\profile2\Plugin\Core\Entity\Profile;
 
 /**
  * Form constructor to confirm deletion of a profile.
  *
- * @param Drupal\profile2\Profile $profile
+ * @param Drupal\profile2\Plugin\Core\Entity\Profile $profile
  *   The profile to delete.
  *
  * @return array