diff --git a/.idea/PhpMvc-DotEnv.iml b/.idea/PhpMvc-DotEnv.iml
index b4aeeb9..3d0afa3 100644
--- a/.idea/PhpMvc-DotEnv.iml
+++ b/.idea/PhpMvc-DotEnv.iml
@@ -2,8 +2,8 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Dusan\DotEnv\" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Dusan\DotEnv\Tests\" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="BrosSquad\DotEnv\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="BrosSquad\DotEnv\Tests\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/2bj/phanybar" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/codedungeon/php-cli-colors" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/codedungeon/phpunit-result-printer" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0e2114f..59c77e6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="51a56bd7-56f5-4adf-9de8-42b1220c4f36" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/dictionaries/dusan.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.phpunit.result.cache" beforeDir="false" afterPath="$PROJECT_DIR$/.phpunit.result.cache" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/EnvParser.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/EnvParser.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/EnvParserInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/EnvParserInterface.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Exceptions/DotEnvSyntaxError.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Exceptions/DotEnvSyntaxError.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/EnvTest/.env" beforeDir="false" afterPath="$PROJECT_DIR$/tests/EnvTest/.env" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Exceptions/EnvNotParsed.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Exceptions/EnvNotParsed.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Exceptions/EnvVariableNotFound.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Exceptions/EnvVariableNotFound.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Tokens.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tokens.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/tests/EnvTest/EnvParserTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/tests/EnvTest/EnvParserTest.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -28,10 +30,10 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/tests/EnvTest/EnvParserTest.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="441">
-              <caret line="31" column="38" lean-forward="true" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
+            <state relative-caret-position="216">
+              <caret line="8" column="14" lean-forward="true" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
               <folding>
-                <element signature="e#40#86#0#PHP" expanded="true" />
+                <element signature="e#206#1330#0#PHP" expanded="true" />
                 <element signature="e#1336#1527#0#PHP" expanded="true" />
                 <element signature="e#1753#2256#0#PHP" expanded="true" />
               </folding>
@@ -39,25 +41,36 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/composer.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="90">
+              <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/EnvTest/.env">
+        <entry file="file://$PROJECT_DIR$/src/Exceptions/DotEnvSyntaxError.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="251">
-              <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+            <state relative-caret-position="297">
+              <caret line="12" column="21" lean-forward="true" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
+              <folding>
+                <element signature="e#217#397#0#PHP" expanded="true" />
+                <element signature="e#438#514#0#PHP" expanded="true" />
+                <element signature="e#603#731#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/EnvParser.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="283">
-              <caret line="163" column="42" selection-start-line="163" selection-start-column="42" selection-end-line="163" selection-end-column="42" />
+            <state relative-caret-position="162">
+              <caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
               <folding>
-                <element signature="e#58#104#0#PHP" expanded="true" />
-                <element signature="e#808#1239#0#PHP" expanded="true" />
-                <element signature="e#1435#2113#0#PHP" expanded="true" />
-                <element signature="e#2286#3411#0#PHP" expanded="true" />
+                <element signature="e#2302#3427#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -65,6 +78,18 @@
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>Dusan\\DotEnv\\</find>
+      <find>Dusan\DotEnv\</find>
+      <find>Dusan\DotEnv</find>
+    </findStrings>
+    <replaceStrings>
+      <replace>BrosSquad\\DotEnv\\</replace>
+      <replace>BrosSquad\DotEnv\</replace>
+      <replace>BrosSquad\DotEnv</replace>
+    </replaceStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -80,10 +105,10 @@
         <option value="$PROJECT_DIR$/tests/EnvTest/.env-error" />
         <option value="$PROJECT_DIR$/tests/EnvTest/.env.space.error" />
         <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch.php" />
-        <option value="$PROJECT_DIR$/composer.json" />
-        <option value="$PROJECT_DIR$/src/Exceptions/DotEnvSyntaxError.php" />
         <option value="$PROJECT_DIR$/tests/EnvTest/EnvParserTest.php" />
         <option value="$PROJECT_DIR$/tests/EnvTest/.env" />
+        <option value="$PROJECT_DIR$/composer.json" />
+        <option value="$PROJECT_DIR$/src/Exceptions/DotEnvSyntaxError.php" />
         <option value="$PROJECT_DIR$/src/EnvParser.php" />
       </list>
     </option>
@@ -252,7 +277,7 @@
       <updated>1559597724028</updated>
       <workItem from="1559597725494" duration="2363000" />
       <workItem from="1559602585622" duration="39000" />
-      <workItem from="1562931971079" duration="6647000" />
+      <workItem from="1562931971079" duration="7851000" />
     </task>
     <servers />
   </component>
@@ -289,13 +314,13 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9049000" />
+    <option name="totallyTimeSpent" value="10253000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20758355" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20758355" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Tail" />
@@ -400,26 +425,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Exceptions/DotEnvSyntaxError.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-674">
-          <caret line="19" column="56" lean-forward="true" selection-start-line="19" selection-start-column="56" selection-end-line="19" selection-end-column="56" />
-          <folding>
-            <element signature="e#438#514#0#PHP" expanded="true" />
-            <element signature="e#603#731#0#PHP" expanded="true" />
-            <element signature="e#752#826#0#PHP" expanded="true" />
-            <element signature="e#914#1038#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/composer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="30" column="4" lean-forward="true" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tests/EnvTest/.env.space.error">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="216">
@@ -429,17 +434,17 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/tests/EnvTest/.env">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
+        <state relative-caret-position="513">
           <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/tests/EnvTest/EnvParserTest.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="31" column="38" lean-forward="true" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
+        <state relative-caret-position="216">
+          <caret line="8" column="14" lean-forward="true" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
           <folding>
-            <element signature="e#40#86#0#PHP" expanded="true" />
+            <element signature="e#206#1330#0#PHP" expanded="true" />
             <element signature="e#1336#1527#0#PHP" expanded="true" />
             <element signature="e#1753#2256#0#PHP" expanded="true" />
           </folding>
@@ -448,16 +453,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/EnvParser.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="163" column="42" selection-start-line="163" selection-start-column="42" selection-end-line="163" selection-end-column="42" />
+        <state relative-caret-position="162">
+          <caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
+          <folding>
+            <element signature="e#2302#3427#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Exceptions/DotEnvSyntaxError.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="12" column="21" lean-forward="true" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
           <folding>
-            <element signature="e#58#104#0#PHP" expanded="true" />
-            <element signature="e#808#1239#0#PHP" expanded="true" />
-            <element signature="e#1435#2113#0#PHP" expanded="true" />
-            <element signature="e#2286#3411#0#PHP" expanded="true" />
+            <element signature="e#217#397#0#PHP" expanded="true" />
+            <element signature="e#438#514#0#PHP" expanded="true" />
+            <element signature="e#603#731#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/composer.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
index 7908f7c..194ed6d 100644
--- a/.phpunit.result.cache
+++ b/.phpunit.result.cache
@@ -1 +1 @@
-C:37:"PHPUnit\Runner\DefaultTestResultCache":616:{a:2:{s:7:"defects";a:4:{s:49:"Dusan\DotEnv\Tests\EnvParserTest::test_env_parser";i:3;s:53:"Dusan\DotEnv\Tests\EnvParserTest::test_env_with_error";i:4;s:76:"Dusan\DotEnv\Tests\EnvParserTest::test_env_with_space_error_in_variable_name";i:4;s:52:"Dusan\DotEnv\Tests\EnvParserTest::test_interpolation";i:3;}s:5:"times";a:4:{s:49:"Dusan\DotEnv\Tests\EnvParserTest::test_env_parser";d:0.026;s:53:"Dusan\DotEnv\Tests\EnvParserTest::test_env_with_error";d:0.003;s:76:"Dusan\DotEnv\Tests\EnvParserTest::test_env_with_space_error_in_variable_name";d:0.002;s:52:"Dusan\DotEnv\Tests\EnvParserTest::test_interpolation";d:0.003;}}}
\ No newline at end of file
+C:37:"PHPUnit\Runner\DefaultTestResultCache":616:{a:2:{s:7:"defects";a:4:{s:49:"BrosSquad\DotEnv\Tests\EnvParserTest::test_env_parser";i:3;s:53:"BrosSquad\DotEnv\Tests\EnvParserTest::test_env_with_error";i:4;s:76:"BrosSquad\DotEnv\Tests\EnvParserTest::test_env_with_space_error_in_variable_name";i:4;s:52:"BrosSquad\DotEnv\Tests\EnvParserTest::test_interpolation";i:3;}s:5:"times";a:4:{s:49:"BrosSquad\DotEnv\Tests\EnvParserTest::test_env_parser";d:0.026;s:53:"BrosSquad\DotEnv\Tests\EnvParserTest::test_env_with_error";d:0.003;s:76:"BrosSquad\DotEnv\Tests\EnvParserTest::test_env_with_space_error_in_variable_name";d:0.002;s:52:"BrosSquad\DotEnv\Tests\EnvParserTest::test_interpolation";d:0.003;}}}
diff --git a/composer.json b/composer.json
index 2950ac8..1245ffc 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
       "src/functions.php"
     ],
     "psr-4": {
-      "Dusan\\DotEnv\\": "src/"
+      "BrosSquad\\DotEnv\\": "src/"
     }
   },
   "autoload-dev": {
@@ -20,7 +20,7 @@
       "src/functions.php"
     ],
     "psr-4": {
-      "Dusan\\DotEnv\\Tests\\": "tests/"
+      "BrosSquad\\DotEnv\\Tests\\": "tests/"
     }
   },
   "type": "library",
diff --git a/src/EnvParser.php b/src/EnvParser.php
index a30ff68..6a63922 100644
--- a/src/EnvParser.php
+++ b/src/EnvParser.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Dusan\DotEnv;
+namespace BrosSquad\DotEnv;
 
-use Dusan\DotEnv\Exceptions\DotEnvSyntaxError;
-use Dusan\DotEnv\Exceptions\EnvNotParsed;
-use Dusan\DotEnv\Exceptions\EnvVariableNotFound;
+use BrosSquad\DotEnv\Exceptions\DotEnvSyntaxError;
+use BrosSquad\DotEnv\Exceptions\EnvNotParsed;
+use BrosSquad\DotEnv\Exceptions\EnvVariableNotFound;
 use Dusan\PhpMvc\File\File;
 use Exception;
 
@@ -91,7 +91,7 @@ public function parse(bool $raw = false): void
      * @param int    $column
      *
      * @return string
-     * @throws \Dusan\DotEnv\Exceptions\DotEnvSyntaxError
+     * @throws \BrosSquad\DotEnv\Exceptions\DotEnvSyntaxError
      */
     private function extractName(string $startingChar, int & $column): string
     {
@@ -130,7 +130,7 @@ private function extractName(string $startingChar, int & $column): string
      * @param int   $column
      *
      * @return string
-     * @throws \Dusan\DotEnv\Exceptions\EnvVariableNotFound
+     * @throws \BrosSquad\DotEnv\Exceptions\EnvVariableNotFound
      */
     private function extractValue(array $envs, bool $raw, int & $column): string
     {
@@ -180,7 +180,7 @@ private function extractValue(array $envs, bool $raw, int & $column): string
      * @param array $envs
      *
      * @return mixed
-     * @throws \Dusan\DotEnv\Exceptions\EnvVariableNotFound
+     * @throws \BrosSquad\DotEnv\Exceptions\EnvVariableNotFound
      */
     private function interpolation(array $envs)
     {
@@ -198,7 +198,7 @@ private function interpolation(array $envs)
      * Loads ENVs into $_ENV Super global variable
      *
      * @return void
-     * @throws \Dusan\DotEnv\Exceptions\EnvNotParsed
+     * @throws \BrosSquad\DotEnv\Exceptions\EnvNotParsed
      */
     public function loadIntoENV(): void
     {
@@ -216,7 +216,7 @@ public function loadIntoENV(): void
      *
      * @inheritDoc
      * @return void
-     * @throws \Dusan\DotEnv\Exceptions\EnvNotParsed
+     * @throws \BrosSquad\DotEnv\Exceptions\EnvNotParsed
      */
     public function loadUsingPutEnv(): void
     {
diff --git a/src/EnvParserInterface.php b/src/EnvParserInterface.php
index 4267e4a..1e4f9d2 100644
--- a/src/EnvParserInterface.php
+++ b/src/EnvParserInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Dusan\DotEnv;
+namespace BrosSquad\DotEnv;
 
 
 interface EnvParserInterface
diff --git a/src/Exceptions/DotEnvSyntaxError.php b/src/Exceptions/DotEnvSyntaxError.php
index 21001d6..9ea7511 100644
--- a/src/Exceptions/DotEnvSyntaxError.php
+++ b/src/Exceptions/DotEnvSyntaxError.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Dusan\DotEnv\Exceptions;
+namespace BrosSquad\DotEnv\Exceptions;
 
 
 use Exception;
diff --git a/src/Exceptions/EnvNotParsed.php b/src/Exceptions/EnvNotParsed.php
index 5e344b7..bf934f7 100644
--- a/src/Exceptions/EnvNotParsed.php
+++ b/src/Exceptions/EnvNotParsed.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Dusan\DotEnv\Exceptions;
+namespace BrosSquad\DotEnv\Exceptions;
 
 
 use Exception;
diff --git a/src/Exceptions/EnvVariableNotFound.php b/src/Exceptions/EnvVariableNotFound.php
index 1a03916..41b5a66 100644
--- a/src/Exceptions/EnvVariableNotFound.php
+++ b/src/Exceptions/EnvVariableNotFound.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Dusan\DotEnv\Exceptions;
+namespace BrosSquad\DotEnv\Exceptions;
 
 
 use Exception;
diff --git a/src/Tokens.php b/src/Tokens.php
index d6d05dd..f721a07 100644
--- a/src/Tokens.php
+++ b/src/Tokens.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Dusan\DotEnv;
+namespace BrosSquad\DotEnv;
 
 /**
  * ENV Tokens
  * This interfaces holds the tokens used in lexical process
  *
- * @package Dusan\DotEnv
+ * @package BrosSquad\DotEnv
  */
 interface Tokens
 {
diff --git a/tests/EnvTest/EnvParserTest.php b/tests/EnvTest/EnvParserTest.php
index 5e41cb8..52a8b63 100644
--- a/tests/EnvTest/EnvParserTest.php
+++ b/tests/EnvTest/EnvParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Dusan\DotEnv\Tests;
+namespace BrosSquad\DotEnv\Tests;
 
 
-use Dusan\DotEnv\Exceptions\DotEnvSyntaxError;
-use Dusan\DotEnv\EnvParser;
+use BrosSquad\DotEnv\Exceptions\DotEnvSyntaxError;
+use BrosSquad\DotEnv\EnvParser;
 use Exception;
 use PHPUnit\Framework\TestCase;