diff --git a/README.md b/README.md
index f59c3c0..ded0342 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Retrieve all information about multiple events.
 Basic usage:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\Event\EventParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\Event\Request\EventParameters();
 $events = $client->getEvents($parameters); // $parameters are optional
 
 // example of reading data
@@ -71,19 +71,19 @@ foreach ($events as $event) {
 Events can be filtered by group, category, program or intended for:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\Event\EventParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\Event\Request\EventParameters();
 
 // only camps
-$parameters->setGroup(\HnutiBrontosaurus\BisClient\Enums\EventGroup::CAMP());
+$parameters->setGroup(\HnutiBrontosaurus\BisClient\Event\Group::CAMP());
 
 // only events of "voluntary" category
-$parameters->setCategory(\HnutiBrontosaurus\BisClient\Enums\EventCategory::VOLUNTEERING());
+$parameters->setCategory(\HnutiBrontosaurus\BisClient\Event\Category::VOLUNTEERING());
 
 // only events of "PsB" program
-$parameters->setProgram(\HnutiBrontosaurus\BisClient\Enums\Program::HOLIDAYS_WITH_BRONTOSAURUS());
+$parameters->setProgram(\HnutiBrontosaurus\BisClient\Event\Program::HOLIDAYS_WITH_BRONTOSAURUS());
 
 // only events intended for first time participants
-$parameters->setIntendedFor(\HnutiBrontosaurus\BisClient\Enums\IntendedFor::FIRST_TIME_PARTICIPANT());
+$parameters->setIntendedFor(\HnutiBrontosaurus\BisClient\Event\IntendedFor::FIRST_TIME_PARTICIPANT());
 
 $events = $client->getEvents($parameters);
 ```
@@ -91,19 +91,19 @@ $events = $client->getEvents($parameters);
 Note that each method call rewrites the previous one:
 
 ```php
-$parameters->setCategory(\HnutiBrontosaurus\BisClient\Enums\EventCategory::VOLUNTEERING());
-$parameters->setCategory(\HnutiBrontosaurus\BisClient\Enums\EventCategory::EXPERIENCE());
+$parameters->setCategory(\HnutiBrontosaurus\BisClient\Event\Category::VOLUNTEERING());
+$parameters->setCategory(\HnutiBrontosaurus\BisClient\Event\Category::EXPERIENCE());
 // ⚠ result is only "EXPERIENCE"
 ```
 
 You can set more values at once with method's plural complement:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\Event\EventParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\Event\Request\EventParameters();
 
 $parameters->setCategories([
-    \HnutiBrontosaurus\BisClient\Enums\EventCategory::VOLUNTEERING(),
-    \HnutiBrontosaurus\BisClient\Enums\EventCategory::EXPERIENCE(),
+    \HnutiBrontosaurus\BisClient\Event\Category::VOLUNTEERING(),
+    \HnutiBrontosaurus\BisClient\Event\Category::EXPERIENCE(),
 ]);
 
 $events = $client->getEvents($parameters);
@@ -114,11 +114,11 @@ $events = $client->getEvents($parameters);
 Restrict retrieved events to be in given period:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\Event\EventParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\Event\Request\EventParameters();
 
-$parameters->setPeriod(\HnutiBrontosaurus\BisClient\Request\Event\Period::RUNNING_AND_FUTURE()); // default
-$parameters->setPeriod(\HnutiBrontosaurus\BisClient\Request\Event\Period::RUNNING_ONLY());
-$parameters->setPeriod(\HnutiBrontosaurus\BisClient\Request\Event\Period::UNLIMITED());
+$parameters->setPeriod(\HnutiBrontosaurus\BisClient\Event\Request\Period::RUNNING_AND_FUTURE()); // default
+$parameters->setPeriod(\HnutiBrontosaurus\BisClient\Event\Request\Period::RUNNING_ONLY());
+$parameters->setPeriod(\HnutiBrontosaurus\BisClient\Event\Request\Period::UNLIMITED());
 
 $events = $client->getEvents($parameters);
 ```
@@ -135,7 +135,7 @@ $parameters->setDateEndLessThanOrEqualTo($date);
 $parameters->setDateEndGreaterThanOrEqualTo($date);
 ```
 
-If you need to reset default/previous setting:
+If you need to reset default/previous dates:
 
 ```php
 // either
@@ -155,7 +155,7 @@ $parameters->setDateStartLessThanOrEqualTo($date, reset: true);
 Choose whether you want to order by start or end date:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\Event\EventParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\Event\Request\EventParameters();
 
 // sort events by date from or date to
 $parameters->orderByStartDate();
@@ -164,7 +164,7 @@ $parameters->orderByEndDate(); // default
 $events = $client->getEvents($parameters);
 ```
 
-Both methods have optional parameter `bool $desc` which obviously sorts events in DESC order:
+Both methods have optional parameter `$desc` which allows to sort events in DESC order:
 
 ```php
 $parameters->orderByDateFrom(desc: true);
@@ -175,7 +175,7 @@ $parameters->orderByDateFrom(desc: true);
 Limit the size of obtained events or remove the limit completely:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\Event\EventParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\Event\Request\EventParameters();
 
 $parameters->setLimit(50);
 $parameters->removeLimit();
@@ -189,7 +189,7 @@ $events = $client->getEvents($parameters);
 For retrieving information about all administration units:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\AdministrationUnit\AdministrationUnitParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\AdministrationUnit\Request\AdministrationUnitParameters();
 $administrationUnits = $client->getAdministrationUnits($parameters); // $parameters is optional
 
 foreach ($administrationUnits as $administrationUnit) {
@@ -205,7 +205,7 @@ foreach ($administrationUnits as $administrationUnit) {
 Retrieving information about all opportunities:
 
 ```php
-$parameters = new \HnutiBrontosaurus\BisClient\Request\Opportunity\OpportunityParameters();
+$parameters = new \HnutiBrontosaurus\BisClient\Opportunity\Request\OpportunityParameters();
 $opportunities = $client->getOpportunities($parameters); // $parameters is optional
 
 foreach ($opportunities as $opportunity) {
@@ -283,9 +283,10 @@ composer install
 
 - `docs` – instruction on how connection between brontoweb and BIS works (todo: move to brontoweb repo)
 - `src` – source code
-    - `Enums` – basic enum types
-    - `Request` – request-related value objects
-    - `Response` – response-related value objects and exceptions
+    - `AdministrationUnit` – value objects related to administration units
+    - `Event` – value objects related to events
+    - `Opportunity` – value objects related to opportunities
+    - `Response` – response value objects common to all endpoints
     - `BisClient` – client itself, serves for making requests to BIS API
     - `BisClientFactory` – takes configuration and creates instance of `BisClient`
     - `HttpClient` – wrapper around Guzzle client which adds BIS API specific pieces into the request
diff --git a/src/AdministrationUnit/Category.php b/src/AdministrationUnit/Category.php
new file mode 100644
index 0000000..bc33208
--- /dev/null
+++ b/src/AdministrationUnit/Category.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types = 1);
+
+namespace HnutiBrontosaurus\BisClient\AdministrationUnit;
+
+use Grifart\Enum\AutoInstances;
+use Grifart\Enum\Enum;
+
+
+/**
+ * @method static Category CLUB()
+ * @method static Category BASIC_SECTION()
+ * @method static Category REGIONAL_CENTER()
+ * @method static Category HEADQUARTER()
+ */
+final class Category extends Enum
+{
+	use AutoInstances;
+
+	protected const CLUB = 'club';
+	protected const BASIC_SECTION = 'basic_section';
+	protected const REGIONAL_CENTER = 'regional_center';
+	protected const HEADQUARTER = 'headquarter';
+}
diff --git a/src/Request/AdministrationUnit/AdministrationUnitParameters.php b/src/AdministrationUnit/Request/AdministrationUnitParameters.php
similarity index 59%
rename from src/Request/AdministrationUnit/AdministrationUnitParameters.php
rename to src/AdministrationUnit/Request/AdministrationUnitParameters.php
index c735470..be1252c 100644
--- a/src/Request/AdministrationUnit/AdministrationUnitParameters.php
+++ b/src/AdministrationUnit/Request/AdministrationUnitParameters.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Request\AdministrationUnit;
+namespace HnutiBrontosaurus\BisClient\AdministrationUnit\Request;
 
-use HnutiBrontosaurus\BisClient\Enums\AdministrationUnitCategory;
-use HnutiBrontosaurus\BisClient\Request\LimitParameter;
-use HnutiBrontosaurus\BisClient\Request\QueryParameters;
+use HnutiBrontosaurus\BisClient\AdministrationUnit\Category;
+use HnutiBrontosaurus\BisClient\LimitParameter;
+use HnutiBrontosaurus\BisClient\QueryParameters;
 
 
 final class AdministrationUnitParameters implements QueryParameters
@@ -17,17 +17,17 @@ public function __construct()
 
 	// categories
 
-	/** @var AdministrationUnitCategory[] */
+	/** @var Category[] */
 	private array $categories = [];
 
-	public function setCategory(AdministrationUnitCategory $category): self
+	public function setCategory(Category $category): self
 	{
 		$this->categories = [$category];
 		return $this;
 	}
 
 	/**
-	 * @param AdministrationUnitCategory[] $categories
+	 * @param Category[] $categories
 	 */
 	public function setCategories(array $categories): self
 	{
diff --git a/src/Response/AdministrationUnit/AdministrationUnit.php b/src/AdministrationUnit/Response/AdministrationUnit.php
similarity index 84%
rename from src/Response/AdministrationUnit/AdministrationUnit.php
rename to src/AdministrationUnit/Response/AdministrationUnit.php
index ba91d23..3702425 100644
--- a/src/Response/AdministrationUnit/AdministrationUnit.php
+++ b/src/AdministrationUnit/Response/AdministrationUnit.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Response\AdministrationUnit;
+namespace HnutiBrontosaurus\BisClient\AdministrationUnit\Response;
 
-use HnutiBrontosaurus\BisClient\Enums\AdministrationUnitCategory;
+use HnutiBrontosaurus\BisClient\AdministrationUnit\Category;
 use HnutiBrontosaurus\BisClient\Response\Coordinates;
 
 
@@ -21,7 +21,7 @@ private function __construct(
 		private ?string $phone,
 		private ?string $email,
 		private ?string $website,
-		private AdministrationUnitCategory $category,
+		private Category $category,
 		private ?string $chairman,
 		private ?string $manager,
 		private array $rawData,
@@ -68,7 +68,7 @@ public static function fromResponseData(array $data): self
 			$data['phone'] !== '' ? $data['phone'] : null,
 			$data['email'] !== '' ? $data['email'] : null,
 			$data['www'] !== '' ? $data['www'] : null,
-			AdministrationUnitCategory::fromScalar($data['category']['slug']),
+			Category::fromScalar($data['category']['slug']),
 			$data['chairman'] !== null ? $data['chairman']['name'] : null,
 			$data['manager'] !== null ? $data['manager']['name'] : null,
 			$data,
@@ -138,25 +138,25 @@ public function getManager(): ?string
 
 	public function isClub(): bool
 	{
-		return $this->category->equals(AdministrationUnitCategory::CLUB());
+		return $this->category->equals(Category::CLUB());
 	}
 
 
 	public function isBaseUnit(): bool
 	{
-		return $this->category->equals(AdministrationUnitCategory::BASIC_SECTION());
+		return $this->category->equals(Category::BASIC_SECTION());
 	}
 
 
 	public function isRegionalUnit(): bool
 	{
-		return $this->category->equals(AdministrationUnitCategory::REGIONAL_CENTER());
+		return $this->category->equals(Category::REGIONAL_CENTER());
 	}
 
 
 	public function isOffice(): bool
 	{
-		return $this->category->equals(AdministrationUnitCategory::HEADQUARTER());
+		return $this->category->equals(Category::HEADQUARTER());
 	}
 
 
diff --git a/src/BisClient.php b/src/BisClient.php
index cc070c3..8d77882 100644
--- a/src/BisClient.php
+++ b/src/BisClient.php
@@ -2,13 +2,12 @@
 
 namespace HnutiBrontosaurus\BisClient;
 
-use HnutiBrontosaurus\BisClient\Request\AdministrationUnit\AdministrationUnitParameters;
-use HnutiBrontosaurus\BisClient\Request\Event\EventParameters;
-use HnutiBrontosaurus\BisClient\Request\Opportunity\OpportunityParameters;
-use HnutiBrontosaurus\BisClient\Request\QueryParameters;
-use HnutiBrontosaurus\BisClient\Response\AdministrationUnit\AdministrationUnit;
-use HnutiBrontosaurus\BisClient\Response\Event\Event;
-use HnutiBrontosaurus\BisClient\Response\Opportunity\Opportunity;
+use HnutiBrontosaurus\BisClient\AdministrationUnit\Request\AdministrationUnitParameters as AdministrationUnitParameters;
+use HnutiBrontosaurus\BisClient\AdministrationUnit\Response\AdministrationUnit;
+use HnutiBrontosaurus\BisClient\Event\Request\EventParameters as EventParameters;
+use HnutiBrontosaurus\BisClient\Event\Response\Event;
+use HnutiBrontosaurus\BisClient\Opportunity\Request\OpportunityParameters as OpportunityParameters;
+use HnutiBrontosaurus\BisClient\Opportunity\Response\Opportunity;
 
 
 final class BisClient
diff --git a/src/Enums/AdministrationUnitCategory.php b/src/Enums/AdministrationUnitCategory.php
deleted file mode 100644
index 7682048..0000000
--- a/src/Enums/AdministrationUnitCategory.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace HnutiBrontosaurus\BisClient\Enums;
-
-use Grifart\Enum\AutoInstances;
-use Grifart\Enum\Enum;
-
-
-/**
- * @method static AdministrationUnitCategory CLUB()
- * @method static AdministrationUnitCategory BASIC_SECTION()
- * @method static AdministrationUnitCategory REGIONAL_CENTER()
- * @method static AdministrationUnitCategory HEADQUARTER()
- */
-final class AdministrationUnitCategory extends Enum
-{
-	use AutoInstances;
-
-	protected const CLUB = 'club';
-	protected const BASIC_SECTION = 'basic_section';
-	protected const REGIONAL_CENTER = 'regional_center';
-	protected const HEADQUARTER = 'headquarter';
-}
diff --git a/src/Enums/EventCategory.php b/src/Event/Category.php
similarity index 63%
rename from src/Enums/EventCategory.php
rename to src/Event/Category.php
index 68a9d3d..679a6d3 100644
--- a/src/Enums/EventCategory.php
+++ b/src/Event/Category.php
@@ -1,29 +1,29 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Enums;
+namespace HnutiBrontosaurus\BisClient\Event;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
 
 
 /**
- * @method static EventCategory VOLUNTEERING()
- * @method static EventCategory EXPERIENCE()
- * @method static EventCategory EDUCATIONAL_LECTURE()
- * @method static EventCategory EDUCATIONAL_COURSE()
- * @method static EventCategory EDUCATIONAL_OHB()
- * @method static EventCategory EDUCATIONAL_EDUCATIONAL()
- * @method static EventCategory EDUCATIONAL_EDUCATIONAL_WITH_STAY()
- * @method static EventCategory CLUB_MEETING()
- * @method static EventCategory CLUB_LECTURE()
- * @method static EventCategory FOR_PUBLIC()
- * @method static EventCategory ECO_TENT()
- * @method static EventCategory EXHIBITION()
- * @method static EventCategory INTERNAL_VOLUNTEER_MEETING()
- * @method static EventCategory INTERNAL_GENERAL_MEETING()
- * @method static EventCategory INTERNAL_SECTION_MEETING()
+ * @method static Category VOLUNTEERING()
+ * @method static Category EXPERIENCE()
+ * @method static Category EDUCATIONAL_LECTURE()
+ * @method static Category EDUCATIONAL_COURSE()
+ * @method static Category EDUCATIONAL_OHB()
+ * @method static Category EDUCATIONAL_EDUCATIONAL()
+ * @method static Category EDUCATIONAL_EDUCATIONAL_WITH_STAY()
+ * @method static Category CLUB_MEETING()
+ * @method static Category CLUB_LECTURE()
+ * @method static Category FOR_PUBLIC()
+ * @method static Category ECO_TENT()
+ * @method static Category EXHIBITION()
+ * @method static Category INTERNAL_VOLUNTEER_MEETING()
+ * @method static Category INTERNAL_GENERAL_MEETING()
+ * @method static Category INTERNAL_SECTION_MEETING()
  */
-final class EventCategory extends Enum
+final class Category extends Enum
 {
 	use AutoInstances;
 
diff --git a/src/Enums/EventGroup.php b/src/Event/Group.php
similarity index 54%
rename from src/Enums/EventGroup.php
rename to src/Event/Group.php
index 3b6b2f9..942be8d 100644
--- a/src/Enums/EventGroup.php
+++ b/src/Event/Group.php
@@ -1,17 +1,17 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Enums;
+namespace HnutiBrontosaurus\BisClient\Event;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
 
 
 /**
- * @method static EventGroup CAMP()
- * @method static EventGroup WEEKEND_EVENT()
- * @method static EventGroup OTHER()
+ * @method static Group CAMP()
+ * @method static Group WEEKEND_EVENT()
+ * @method static Group OTHER()
  */
-final class EventGroup extends Enum
+final class Group extends Enum
 {
 	use AutoInstances;
 
diff --git a/src/Enums/IntendedFor.php b/src/Event/IntendedFor.php
similarity index 93%
rename from src/Enums/IntendedFor.php
rename to src/Event/IntendedFor.php
index a81b120..6778ade 100644
--- a/src/Enums/IntendedFor.php
+++ b/src/Event/IntendedFor.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Enums;
+namespace HnutiBrontosaurus\BisClient\Event;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
diff --git a/src/Enums/Program.php b/src/Event/Program.php
similarity index 94%
rename from src/Enums/Program.php
rename to src/Event/Program.php
index 1f9628e..5b1ac0a 100644
--- a/src/Enums/Program.php
+++ b/src/Event/Program.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Enums;
+namespace HnutiBrontosaurus\BisClient\Event;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
diff --git a/src/Request/Event/EventParameters.php b/src/Event/Request/EventParameters.php
similarity index 86%
rename from src/Request/Event/EventParameters.php
rename to src/Event/Request/EventParameters.php
index c82d7ea..64c68e4 100644
--- a/src/Request/Event/EventParameters.php
+++ b/src/Event/Request/EventParameters.php
@@ -1,21 +1,19 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Request\Event;
+namespace HnutiBrontosaurus\BisClient\Event\Request;
 
 use Brick\DateTime\Clock;
 use Brick\DateTime\LocalDate;
 use Brick\DateTime\TimeZone;
-use HnutiBrontosaurus\BisClient\Enums\EventCategory;
-use HnutiBrontosaurus\BisClient\Enums\EventGroup;
-use HnutiBrontosaurus\BisClient\Enums\Program;
-use HnutiBrontosaurus\BisClient\Enums\IntendedFor;
-use HnutiBrontosaurus\BisClient\Request\LimitParameter;
-use HnutiBrontosaurus\BisClient\Request\QueryParameters;
+use HnutiBrontosaurus\BisClient\Event\Category;
+use HnutiBrontosaurus\BisClient\Event\Group;
+use HnutiBrontosaurus\BisClient\Event\IntendedFor;
+use HnutiBrontosaurus\BisClient\Event\Program;
 
 
-final class EventParameters implements QueryParameters
+final class EventParameters implements \HnutiBrontosaurus\BisClient\QueryParameters
 {
-	use LimitParameter;
+	use \HnutiBrontosaurus\BisClient\LimitParameter;
 
 	private Ordering $ordering;
 	private TimeZone $timeZone;
@@ -32,17 +30,17 @@ public function __construct()
 
 	// groups
 
-	/** @var EventGroup[] */
+	/** @var \HnutiBrontosaurus\BisClient\Event\Group[] */
 	private array $groups = [];
 
-	public function setGroup(EventGroup $group): self
+	public function setGroup(Group $group): self
 	{
 		$this->groups = [$group];
 		return $this;
 	}
 
 	/**
-	 * @param EventGroup[] $groups
+	 * @param \HnutiBrontosaurus\BisClient\Event\Group[] $groups
 	 */
 	public function setGroups(array $groups): self
 	{
@@ -53,17 +51,17 @@ public function setGroups(array $groups): self
 
 	// category
 
-	/** @var EventCategory[] */
+	/** @var \HnutiBrontosaurus\BisClient\Event\Category[] */
 	private array $categories = [];
 
-	public function setCategory(EventCategory $category): self
+	public function setCategory(Category $category): self
 	{
 		$this->categories = [$category];
 		return $this;
 	}
 
 	/**
-	 * @param EventCategory[] $categories
+	 * @param Category[] $categories
 	 */
 	public function setCategories(array $categories): self
 	{
@@ -74,7 +72,7 @@ public function setCategories(array $categories): self
 
 	// program
 
-	/** @var Program[] */
+	/** @var \HnutiBrontosaurus\BisClient\Event\Program[] */
 	private array $programs = [];
 
 	public function setProgram(Program $program): self
@@ -105,7 +103,7 @@ public function setIntendedFor(IntendedFor $intendedFor): self
 	}
 
 	/**
-	 * @param IntendedFor[] $intendedFor
+	 * @param \HnutiBrontosaurus\BisClient\Event\IntendedFor[] $intendedFor
 	 */
 	public function setMultipleIntendedFor(array $intendedFor): self
 	{
diff --git a/src/Request/Event/Ordering.php b/src/Event/Request/Ordering.php
similarity index 90%
rename from src/Request/Event/Ordering.php
rename to src/Event/Request/Ordering.php
index 28178fd..4284380 100644
--- a/src/Request/Event/Ordering.php
+++ b/src/Event/Request/Ordering.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Request\Event;
+namespace HnutiBrontosaurus\BisClient\Event\Request;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
diff --git a/src/Request/Event/Period.php b/src/Event/Request/Period.php
similarity index 92%
rename from src/Request/Event/Period.php
rename to src/Event/Request/Period.php
index 7109da7..719e356 100644
--- a/src/Request/Event/Period.php
+++ b/src/Event/Request/Period.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Request\Event;
+namespace HnutiBrontosaurus\BisClient\Event\Request;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
diff --git a/src/Response/Event/Event.php b/src/Event/Response/Event.php
similarity index 98%
rename from src/Response/Event/Event.php
rename to src/Event/Response/Event.php
index d713d7a..6c4c38d 100644
--- a/src/Response/Event/Event.php
+++ b/src/Event/Response/Event.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Response\Event;
+namespace HnutiBrontosaurus\BisClient\Event\Response;
 
 use Brick\DateTime\LocalDate;
 use Brick\DateTime\LocalTime;
-use HnutiBrontosaurus\BisClient\Enums\IntendedFor;
-use HnutiBrontosaurus\BisClient\Enums\Program;
+use HnutiBrontosaurus\BisClient\Event\IntendedFor;
+use HnutiBrontosaurus\BisClient\Event\Program;
 use HnutiBrontosaurus\BisClient\Response\ContactPerson;
 use HnutiBrontosaurus\BisClient\Response\Coordinates;
 use HnutiBrontosaurus\BisClient\Response\Location;
diff --git a/src/Response/Event/Food.php b/src/Event/Response/Food.php
similarity index 86%
rename from src/Response/Event/Food.php
rename to src/Event/Response/Food.php
index 99ab11b..69f2371 100644
--- a/src/Response/Event/Food.php
+++ b/src/Event/Response/Food.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Response\Event;
+namespace HnutiBrontosaurus\BisClient\Event\Response;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
diff --git a/src/Response/Event/Photo.php b/src/Event/Response/Photo.php
similarity index 94%
rename from src/Response/Event/Photo.php
rename to src/Event/Response/Photo.php
index 5ecb2b3..dc994c0 100644
--- a/src/Response/Event/Photo.php
+++ b/src/Event/Response/Photo.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Response\Event;
+namespace HnutiBrontosaurus\BisClient\Event\Response;
 
 
 final class Photo
diff --git a/src/HttpClient.php b/src/HttpClient.php
index fd672b4..8a26742 100644
--- a/src/HttpClient.php
+++ b/src/HttpClient.php
@@ -8,7 +8,6 @@
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Exception\TooManyRedirectsException;
 use GuzzleHttp\Psr7\Request;
-use HnutiBrontosaurus\BisClient\Request\QueryParameters;
 use Psr\Http\Client\NetworkExceptionInterface;
 
 
diff --git a/src/Request/LimitParameter.php b/src/LimitParameter.php
similarity index 88%
rename from src/Request/LimitParameter.php
rename to src/LimitParameter.php
index c2bbf56..fc659ff 100644
--- a/src/Request/LimitParameter.php
+++ b/src/LimitParameter.php
@@ -1,8 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Request;
-
-use HnutiBrontosaurus\BisClient\UsageException;
+namespace HnutiBrontosaurus\BisClient;
 
 
 /**
diff --git a/src/Enums/OpportunityCategory.php b/src/Opportunity/Category.php
similarity index 56%
rename from src/Enums/OpportunityCategory.php
rename to src/Opportunity/Category.php
index e8ede48..b192602 100644
--- a/src/Enums/OpportunityCategory.php
+++ b/src/Opportunity/Category.php
@@ -1,17 +1,17 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Enums;
+namespace HnutiBrontosaurus\BisClient\Opportunity;
 
 use Grifart\Enum\AutoInstances;
 use Grifart\Enum\Enum;
 
 
 /**
- * @method static OpportunityCategory ORGANIZING()
- * @method static OpportunityCategory COLLABORATION()
- * @method static OpportunityCategory LOCATION_HELP()
+ * @method static Category ORGANIZING()
+ * @method static Category COLLABORATION()
+ * @method static Category LOCATION_HELP()
  */
-final class OpportunityCategory extends Enum
+final class Category extends Enum
 {
 	use AutoInstances;
 
diff --git a/src/Request/Opportunity/OpportunityParameters.php b/src/Opportunity/Request/OpportunityParameters.php
similarity index 54%
rename from src/Request/Opportunity/OpportunityParameters.php
rename to src/Opportunity/Request/OpportunityParameters.php
index bf9fcd7..0de9920 100644
--- a/src/Request/Opportunity/OpportunityParameters.php
+++ b/src/Opportunity/Request/OpportunityParameters.php
@@ -1,13 +1,12 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Request\Opportunity;
+namespace HnutiBrontosaurus\BisClient\Opportunity\Request;
 
-use HnutiBrontosaurus\BisClient\Enums\OpportunityCategory;
-use HnutiBrontosaurus\BisClient\Request\LimitParameter;
-use HnutiBrontosaurus\BisClient\Request\QueryParameters;
+use HnutiBrontosaurus\BisClient\LimitParameter;
+use HnutiBrontosaurus\BisClient\Opportunity\Category;
 
 
-final class OpportunityParameters implements QueryParameters
+final class OpportunityParameters implements \HnutiBrontosaurus\BisClient\QueryParameters
 {
 	use LimitParameter;
 
@@ -17,17 +16,17 @@ public function __construct()
 
 	// categories
 
-	/** @var OpportunityCategory[] */
+	/** @var Category[] */
 	private array $categories = [];
 
-	public function setCategory(OpportunityCategory $category): self
+	public function setCategory(Category $category): self
 	{
 		$this->categories = [$category];
 		return $this;
 	}
 
 	/**
-	 * @param OpportunityCategory[] $categories
+	 * @param Category[] $categories
 	 */
 	public function setCategories(array $categories): self
 	{
diff --git a/src/Response/Opportunity/Opportunity.php b/src/Opportunity/Response/Opportunity.php
similarity index 94%
rename from src/Response/Opportunity/Opportunity.php
rename to src/Opportunity/Response/Opportunity.php
index 26b3acd..d6c6760 100644
--- a/src/Response/Opportunity/Opportunity.php
+++ b/src/Opportunity/Response/Opportunity.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Response\Opportunity;
+namespace HnutiBrontosaurus\BisClient\Opportunity\Response;
 
 use Brick\DateTime\LocalDate;
-use HnutiBrontosaurus\BisClient\Enums\OpportunityCategory;
+use HnutiBrontosaurus\BisClient\Opportunity\Category;
 use HnutiBrontosaurus\BisClient\Response\ContactPerson;
 use HnutiBrontosaurus\BisClient\Response\Coordinates;
 use HnutiBrontosaurus\BisClient\Response\Html;
@@ -20,7 +20,7 @@ final class Opportunity
 	private function __construct(
 		private int $id,
 		private string $name,
-		private OpportunityCategory $category,
+		private Category $category,
 		private LocalDate $startDate,
 		private LocalDate $endDate,
 		private Location $location,
@@ -82,7 +82,7 @@ public static function fromResponseData(array $data): self
 		return new self(
 			$data['id'],
 			$data['name'],
-			OpportunityCategory::fromScalar($data['category']['slug']),
+			Category::fromScalar($data['category']['slug']),
 			LocalDate::parse($data['start']),
 			LocalDate::parse($data['end']),
 			Location::from($data['location']['name'], $data['location']['gps_location'] !== null
@@ -119,7 +119,7 @@ public function getName(): string
 	}
 
 
-	public function getCategory(): OpportunityCategory
+	public function getCategory(): Category
 	{
 		return $this->category;
 	}
diff --git a/src/Request/QueryParameters.php b/src/QueryParameters.php
similarity index 79%
rename from src/Request/QueryParameters.php
rename to src/QueryParameters.php
index 009c23d..94c73f6 100644
--- a/src/Request/QueryParameters.php
+++ b/src/QueryParameters.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace HnutiBrontosaurus\BisClient\Request;
+namespace HnutiBrontosaurus\BisClient;
 
 
 interface QueryParameters
diff --git a/src/Response/Location.php b/src/Response/Location.php
index f0034a2..8d25ec6 100644
--- a/src/Response/Location.php
+++ b/src/Response/Location.php
@@ -2,8 +2,6 @@
 
 namespace HnutiBrontosaurus\BisClient\Response;
 
-use HnutiBrontosaurus\BisClient\Response\Coordinates;
-
 
 final class Location
 {
diff --git a/tests/administrative-units.php b/tests/administrative-units.php
index 998faac..4578174 100644
--- a/tests/administrative-units.php
+++ b/tests/administrative-units.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types = 1);
 
+use HnutiBrontosaurus\BisClient\AdministrationUnit\Category;
+use HnutiBrontosaurus\BisClient\AdministrationUnit\Request\AdministrationUnitParameters;
 use HnutiBrontosaurus\BisClient\BisClient;
-use HnutiBrontosaurus\BisClient\Enums\AdministrationUnitCategory;
-use HnutiBrontosaurus\BisClient\Request\AdministrationUnit\AdministrationUnitParameters;
 
 
 /** @var BisClient $client */
@@ -12,10 +12,10 @@
 
 $params = new AdministrationUnitParameters();
 $params->setCategories([
-	AdministrationUnitCategory::CLUB(),
-	AdministrationUnitCategory::BASIC_SECTION(),
-	AdministrationUnitCategory::REGIONAL_CENTER(),
-	AdministrationUnitCategory::HEADQUARTER(),
+	Category::CLUB(),
+	Category::BASIC_SECTION(),
+	Category::REGIONAL_CENTER(),
+	Category::HEADQUARTER(),
 ]);
 $units = $client->getAdministrationUnits($params);
 foreach ($units as $unit) {
diff --git a/tests/events.php b/tests/events.php
index 5ccd9fc..3d51c5b 100644
--- a/tests/events.php
+++ b/tests/events.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types = 1);
 
 use HnutiBrontosaurus\BisClient\BisClient;
-use HnutiBrontosaurus\BisClient\Enums\EventCategory;
-use HnutiBrontosaurus\BisClient\Enums\EventGroup;
-use HnutiBrontosaurus\BisClient\Enums\IntendedFor;
-use HnutiBrontosaurus\BisClient\Enums\Program;
-use HnutiBrontosaurus\BisClient\Request\Event\EventParameters;
+use HnutiBrontosaurus\BisClient\Event\Category;
+use HnutiBrontosaurus\BisClient\Event\Group;
+use HnutiBrontosaurus\BisClient\Event\IntendedFor;
+use HnutiBrontosaurus\BisClient\Event\Program;
+use HnutiBrontosaurus\BisClient\Event\Request\EventParameters;
 
 
 /** @var BisClient $client */
@@ -16,26 +16,26 @@
 
 $params = new EventParameters();
 $params->setGroups([
-	EventGroup::CAMP(),
-	EventGroup::WEEKEND_EVENT(),
-	EventGroup::OTHER(),
+	Group::CAMP(),
+	Group::WEEKEND_EVENT(),
+	Group::OTHER(),
 ]);
 $params->setCategories([
-	EventCategory::VOLUNTEERING(),
-	EventCategory::EXPERIENCE(),
-	EventCategory::EDUCATIONAL_LECTURE(),
-	EventCategory::EDUCATIONAL_COURSE(),
-	EventCategory::EDUCATIONAL_OHB(),
-	EventCategory::EDUCATIONAL_EDUCATIONAL(),
-	EventCategory::EDUCATIONAL_EDUCATIONAL_WITH_STAY(),
-	EventCategory::CLUB_MEETING(),
-	EventCategory::CLUB_LECTURE(),
-	EventCategory::FOR_PUBLIC(),
-	EventCategory::ECO_TENT(),
-	EventCategory::EXHIBITION(),
-	EventCategory::INTERNAL_VOLUNTEER_MEETING(),
-	EventCategory::INTERNAL_GENERAL_MEETING(),
-	EventCategory::INTERNAL_SECTION_MEETING(),
+	Category::VOLUNTEERING(),
+	Category::EXPERIENCE(),
+	Category::EDUCATIONAL_LECTURE(),
+	Category::EDUCATIONAL_COURSE(),
+	Category::EDUCATIONAL_OHB(),
+	Category::EDUCATIONAL_EDUCATIONAL(),
+	Category::EDUCATIONAL_EDUCATIONAL_WITH_STAY(),
+	Category::CLUB_MEETING(),
+	Category::CLUB_LECTURE(),
+	Category::FOR_PUBLIC(),
+	Category::ECO_TENT(),
+	Category::EXHIBITION(),
+	Category::INTERNAL_VOLUNTEER_MEETING(),
+	Category::INTERNAL_GENERAL_MEETING(),
+	Category::INTERNAL_SECTION_MEETING(),
 ]);
 $params->setPrograms([
 	Program::NONE(),
diff --git a/tests/opportunities.php b/tests/opportunities.php
index 166f859..250d457 100644
--- a/tests/opportunities.php
+++ b/tests/opportunities.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types = 1);
 
 use HnutiBrontosaurus\BisClient\BisClient;
-use HnutiBrontosaurus\BisClient\Enums\OpportunityCategory;
-use HnutiBrontosaurus\BisClient\Request\Opportunity\OpportunityParameters;
+use HnutiBrontosaurus\BisClient\Opportunity\Category;
+use HnutiBrontosaurus\BisClient\Opportunity\Request\OpportunityParameters;
 
 
 /** @var BisClient $client */
@@ -12,9 +12,9 @@
 
 $params = new OpportunityParameters();
 $params->setCategories([
-	OpportunityCategory::ORGANIZING(),
-	OpportunityCategory::COLLABORATION(),
-	OpportunityCategory::LOCATION_HELP(),
+	Category::ORGANIZING(),
+	Category::COLLABORATION(),
+	Category::LOCATION_HELP(),
 ]);
 $opportunities = $client->getOpportunities($params);
 foreach ($opportunities as $opportunity) {