diff --git a/composer.json b/composer.json
index a092fef..edd84c6 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Wepesi\\app\\":"class/"
+            "Wepesi\\app\\":"src/"
         }
     },
     "require": {}
diff --git a/index.php b/index.php
index d3466a6..160ad47 100644
--- a/index.php
+++ b/index.php
@@ -1,8 +1,4 @@
 <?php
 
-include('./class/Validate.php');
-include('./class/VString.php');
-include('./class/VNumber.php');
-include('./class/VBoolean.php');
-include('./class/VDate.php');
+require_once "./vendor/autoload.php";
 include('./test/index.php');
\ No newline at end of file
diff --git a/class/VBoolean.php b/src/VBoolean.php
similarity index 100%
rename from class/VBoolean.php
rename to src/VBoolean.php
diff --git a/class/VDate.php b/src/VDate.php
similarity index 99%
rename from class/VDate.php
rename to src/VDate.php
index 6ec8e20..a3d8305 100644
--- a/class/VDate.php
+++ b/src/VDate.php
@@ -6,7 +6,7 @@
 /**
  * Description of VNumber
  *
- * @author Lenovo
+ * @author Boss Ibrahim Mussa
  */
 class VDate
 {
diff --git a/class/VNumber.php b/src/VNumber.php
similarity index 99%
rename from class/VNumber.php
rename to src/VNumber.php
index 6e85f50..6c30f66 100644
--- a/class/VNumber.php
+++ b/src/VNumber.php
@@ -11,7 +11,7 @@
 /**
  * Description of VNumber
  *
- * @author Lenovo
+ * @author Boss Ibrahim Mussa
  */
 class VNumber {
     //put your code here
diff --git a/class/VString.php b/src/VString.php
similarity index 99%
rename from class/VString.php
rename to src/VString.php
index 11e7541..bf0730f 100644
--- a/class/VString.php
+++ b/src/VString.php
@@ -9,7 +9,7 @@
 /**
  * Description of String
  *
- * @author Ibrahim
+ * @author Boss Ibrahim Mussa
  */
 class VString {
     private $string_value;
diff --git a/class/Validate.php b/src/Validate.php
similarity index 99%
rename from class/Validate.php
rename to src/Validate.php
index c446c43..c9f7f0d 100644
--- a/class/Validate.php
+++ b/src/Validate.php
@@ -4,7 +4,7 @@
 /**
  * Description of validate
  *
- * @author Lenovo
+ * @author Boss Ibrahim Mussa
  */
 class Validate {
     private $_passed;