diff --git a/src/config/Environment.php b/src/Environment.php
similarity index 100%
rename from src/config/Environment.php
rename to src/Environment.php
diff --git a/src/Fhir.php b/src/Fhir.php
index 6ebf8eb..f633a60 100644
--- a/src/Fhir.php
+++ b/src/Fhir.php
@@ -4,7 +4,7 @@
 
 use Ekopras18\Satusehat\Exception\ExceptionHandler;
 use Ekopras18\Satusehat\Models\Token;
-use Ekopras18\Satusehat\Config\Environment;
+use Ekopras18\Satusehat\Environment;
 use Carbon\Carbon;
 
 /**
diff --git a/src/Fhir/Onboarding/Organization.php b/src/Fhir/Onboarding/Organization.php
index 6b74be4..6c03d1c 100644
--- a/src/Fhir/Onboarding/Organization.php
+++ b/src/Fhir/Onboarding/Organization.php
@@ -3,7 +3,7 @@
 namespace Ekopras18\Satusehat\Fhir\Onboarding;
 
 use Ekopras18\Satusehat\Fhir;
-use Ekopras18\Satusehat\Config\Environment;
+use Ekopras18\Satusehat\Environment;
 
 /**
  * Class Organization
diff --git a/tests/Test.php b/tests/Test.php
index 909367d..7b1261d 100644
--- a/tests/Test.php
+++ b/tests/Test.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * Namespace Satusehat\Integration\Tests
- */
 namespace Satusehat\Integration\Tests;
 
 use PHPUnit\Framework\TestCase;