diff --git a/lib/Drupal/simplereservation/Access/ReservationAccessBase.php b/src/Access/ReservationAccessBase.php
similarity index 100%
rename from lib/Drupal/simplereservation/Access/ReservationAccessBase.php
rename to src/Access/ReservationAccessBase.php
diff --git a/lib/Drupal/simplereservation/Access/ReservationDeleteAccessCheck.php b/src/Access/ReservationDeleteAccessCheck.php
similarity index 100%
rename from lib/Drupal/simplereservation/Access/ReservationDeleteAccessCheck.php
rename to src/Access/ReservationDeleteAccessCheck.php
diff --git a/lib/Drupal/simplereservation/Access/ReservationEditAccessCheck.php b/src/Access/ReservationEditAccessCheck.php
similarity index 100%
rename from lib/Drupal/simplereservation/Access/ReservationEditAccessCheck.php
rename to src/Access/ReservationEditAccessCheck.php
diff --git a/lib/Drupal/simplereservation/Controller/SimpleReservationAdminController.php b/src/Controller/SimpleReservationAdminController.php
similarity index 100%
rename from lib/Drupal/simplereservation/Controller/SimpleReservationAdminController.php
rename to src/Controller/SimpleReservationAdminController.php
diff --git a/lib/Drupal/simplereservation/Controller/SimpleReservationReservationController.php b/src/Controller/SimpleReservationReservationController.php
similarity index 100%
rename from lib/Drupal/simplereservation/Controller/SimpleReservationReservationController.php
rename to src/Controller/SimpleReservationReservationController.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationAdminNodeTypeForm.php b/src/Form/SimpleReservationAdminNodeTypeForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationAdminNodeTypeForm.php
rename to src/Form/SimpleReservationAdminNodeTypeForm.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationAdminPageForm.php b/src/Form/SimpleReservationAdminPageForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationAdminPageForm.php
rename to src/Form/SimpleReservationAdminPageForm.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationItemDeleteForm.php b/src/Form/SimpleReservationItemDeleteForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationItemDeleteForm.php
rename to src/Form/SimpleReservationItemDeleteForm.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationItemEditForm.php b/src/Form/SimpleReservationItemEditForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationItemEditForm.php
rename to src/Form/SimpleReservationItemEditForm.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationNodeTypeChangeForm.php b/src/Form/SimpleReservationNodeTypeChangeForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationNodeTypeChangeForm.php
rename to src/Form/SimpleReservationNodeTypeChangeForm.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationNodeTypeDeleteForm.php b/src/Form/SimpleReservationNodeTypeDeleteForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationNodeTypeDeleteForm.php
rename to src/Form/SimpleReservationNodeTypeDeleteForm.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationNodeTypeEditForm.php b/src/Form/SimpleReservationNodeTypeEditForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationNodeTypeEditForm.php
rename to src/Form/SimpleReservationNodeTypeEditForm.php
diff --git a/lib/Drupal/simplereservation/Form/SimpleReservationReservationDeleteForm.php b/src/Form/SimpleReservationReservationDeleteForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/SimpleReservationReservationDeleteForm.php
rename to src/Form/SimpleReservationReservationDeleteForm.php
diff --git a/lib/Drupal/simplereservation/Form/simpleReservationNodeTypeFormBase.php b/src/Form/simpleReservationNodeTypeFormBase.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/simpleReservationNodeTypeFormBase.php
rename to src/Form/simpleReservationNodeTypeFormBase.php
diff --git a/lib/Drupal/simplereservation/Form/simpleReservationReservationAddForm.php b/src/Form/simpleReservationReservationAddForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/simpleReservationReservationAddForm.php
rename to src/Form/simpleReservationReservationAddForm.php
diff --git a/lib/Drupal/simplereservation/Form/simpleReservationReservationEditForm.php b/src/Form/simpleReservationReservationEditForm.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/simpleReservationReservationEditForm.php
rename to src/Form/simpleReservationReservationEditForm.php
diff --git a/lib/Drupal/simplereservation/Form/simpleReservationReservationFormBase.php b/src/Form/simpleReservationReservationFormBase.php
similarity index 100%
rename from lib/Drupal/simplereservation/Form/simpleReservationReservationFormBase.php
rename to src/Form/simpleReservationReservationFormBase.php
diff --git a/lib/Drupal/simplereservation/Plugin/Block/UpcomingReservationBlock.php b/src/Plugin/Block/UpcomingReservationBlock.php
similarity index 100%
rename from lib/Drupal/simplereservation/Plugin/Block/UpcomingReservationBlock.php
rename to src/Plugin/Block/UpcomingReservationBlock.php