diff --git a/01-classes.php b/01-classes.php
deleted file mode 100644
index 338cccf..0000000
--- a/01-classes.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 01 - Classes */
-
-// To create classes we use reserved word class.
-class Mobile
-{
-}
-
-// We can instantitate classes like this
-$modernMobile = new Mobile();
-$oldMobile = new Mobile();
-
-// we can use var_dump so we can visualize our new class objects
-
-var_dump($modernMobile);
-echo "<br>";
-var_dump($oldMobile);
diff --git a/02-properties.php b/02-properties.php
deleted file mode 100644
index 010aad5..0000000
--- a/02-properties.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 02 - Properties */
-
-// classes have properties that contain information about that object defined by the class
-class Mobile {
-    public $name; // Public makes sure we can access this properties outside the class.
-    public $chipset;
-    public $internalMemory;
-}
-
-$modernMobile = new Mobile();
-
-// in OOP and PHP we use the arrow operator ( -> ) for accessing properties
-
-// we can assign those public properties in our class with this syntax
-$modernMobile->name = "Samsung s20";
-$modernMobile->chipset = "Exynos";
-$modernMobile->internalMemory = 128;
-
-echo "<br>";
-
-// we can also access properties value by the arrow operator
-echo $modernMobile->chipset;
-
-// what happens if we assign a non existing value or a wrong value?
-$modernMobile->ramMemory = 1;
-$modernMobile->internMemory = 8;
-
-echo "<pre>";
-var_dump($modernMobile);
-echo "</pre>";
-
-echo "<br>";
-
-//-----------------------------------------------------
-// arrow operator is unique in objects and must not be
-// confused with double arrow operator used in arrays
-//-----------------------------------------------------
-
-// this is an example using an array and double arrow operators
-$mobileArray = [
-    'name' => 'Xiaomi Mi10',
-    'chipset' => 'Snapdragon',
-    'internalMemory' => 64
-];
-echo $mobileArray['chipset'];
\ No newline at end of file
diff --git a/03-methods.php b/03-methods.php
deleted file mode 100644
index bf92984..0000000
--- a/03-methods.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 03 - Properties */
-
-// in a class we have properties and methods. This methods act like functions and allow classes to develop tasks and functionalities.
-class Mobile
-{
-    public $name;
-    public $chipset;
-    public $internalMemory;
-
-    // method that returns class properties in a string.
-    public function showSpecs()
-    {
-        return $this->name . " includes a " . $this->chipset . " chipset and " . $this->internalMemory . "GB of internal memory";
-    }
-}
-
-
-$modernMobile = new Mobile();
-$modernMobile->name = "Samsung s20";
-$modernMobile->chipset = "Exynos";
-$modernMobile->internalMemory = 128;
-
-echo $modernMobile->showSpecs();
diff --git a/04-getters.php b/04-getters.php
deleted file mode 100644
index 84cf90c..0000000
--- a/04-getters.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 04 - Getters */
-
-// Encapsulation is one of the principles in OOP, we use getters methods in order to keep information safe.
-class Mobile
-{
-    public $name;
-    public $chipset;
-    public $internalMemory;
-
-    // methods for getting properties
-    public function getName()
-    {
-        return "--- " . $this->name . " ---";
-    }
-
-    public function getChipset()
-    {
-        return $this->chipset;
-    }
-
-    public function getInternalMemory()
-    {
-        return $this->internalMemory;
-    }
-}
-
-
-$modernMobile = new Mobile();
-$modernMobile->name = "Samsung s20";
-$modernMobile->chipset = "Exynos";
-$modernMobile->internalMemory = 128;
-
-echo "--- GETTERS ---";
-echo "<br>";
-echo $modernMobile->getName();
-echo "<br>";
-echo $modernMobile->getChipset();
-echo "<br>";
-echo $modernMobile->getInternalMemory();
-
-
-//-----------------------------------------------------
-// with this scenario where all properties are public
-// there won't be any differences between using getters
-// or accessing  the properties via arrow operator
-//-----------------------------------------------------
-
-echo "<br><br>";
-echo "--- ARROW OPERATOR ---";
-echo "<br>";
-
-echo $modernMobile->name;
-echo "<br>";
-echo $modernMobile->chipset;
-echo "<br>";
-echo $modernMobile->internalMemory;
diff --git a/05-setters.php b/05-setters.php
deleted file mode 100644
index e86c9b6..0000000
--- a/05-setters.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 05 - Setters */
-
-// Setters are methods for modifying properties values
-class Mobile
-{
-    public $name;
-    public $chipset;
-    public $internalMemory;
-
-    public function getInternalMemory()
-    {
-        return $this->internalMemory;
-    }
-
-    // setters are methods for changing properties
-    public function setInternalMemory($internalMemory)
-    {
-        echo "* CHANGED internal memory from " . $this->internalMemory;
-        $this->internalMemory = $internalMemory;
-        echo " to " . $this->internalMemory;
-    }
-}
-
-echo "<br>";
-
-$modernMobile = new Mobile();
-$modernMobile->name = "Samsung s20";
-$modernMobile->chipset = "Exynos";
-$modernMobile->internalMemory = 128;
-
-
-echo "<br>";
-echo $modernMobile->getInternalMemory();
-echo "<br>";
-$modernMobile->setInternalMemory(256);
-echo "<br>";
-echo $modernMobile->getInternalMemory();
diff --git a/06-constructors.php b/06-constructors.php
deleted file mode 100644
index 59831d5..0000000
--- a/06-constructors.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 06 - Constructors & Destructors */
-
-class Mobile
-{
-    public $name;
-    public $chipset;
-    public $internalMemory;
-
-    // in PHP we use __construct to tell our class that this is the constructor method, it will be called automatically when an object of this class is created
-    public function __construct($name, $chipset, $internalMemory)
-    {
-        // when we create a constructor we can add arguments and then initialize the properties with those argument values
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        echo "+ " . $this->name . " CREATED +<br>";
-    }
-
-    // PHP will call __destruct at the end of the script, when the object is destructed or the script is stopped or exited.
-    function __destruct()
-    {
-        echo "- DESTROYED : " . $this->name . " includes a " . $this->chipset . " chipset and " . $this->internalMemory . "GB of internal memory -<br>";
-    }
-}
-
-// Now we can instantiate a mobile object passing arguments in the correct order
-$modernMobile = new Mobile('Samsung s20', 'Exynos', 128);
-$oldMobile = new Mobile('BlackBerry', 'ARM', 1);
-echo "<br>";
diff --git a/07-inheritance-problem.php b/07-inheritance-problem.php
deleted file mode 100644
index 53c6971..0000000
--- a/07-inheritance-problem.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 07 - Why Inheritance?  */
-
-// Inheritance is another basic principle of OOP
-
-class Samsung
-{
-    public $name;
-    public $chipset;
-    public $internalMemory;
-
-    public function __construct($name, $chipset, $internalMemory)
-    {
-        // when we create a constructor we can add arguments and then initialize the properties with those argument values
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        echo "+ " . $this->name . " CREATED +<br>";
-    }
-
-    function __destruct()
-    {
-        echo "- DESTROYED : " . $this->name . " includes a " . $this->chipset . " chipset and " . $this->internalMemory . "GB of internal memory -<br>";
-    }
-}
-
-// We need a class for mobiles with extra properties and methods that won't have every mobile
-// For example we could need a class for a mobile device with physical keyboard so we create a new one
-
-class Blackberry
-{
-    public $name;
-    public $chipset;
-    public $internalMemory;
-    public $keyboard;
-
-
-    public function __construct($name, $chipset, $internalMemory, $keyboard)
-    {
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        $this->keyboard = $keyboard;
-        echo "+ " . $this->name . " CREATED +<br>";
-    }
-
-    //new method for getting keyboard type
-    public function getKeyboard()
-    {
-        return $this->keyboard;
-    }
-
-    function __destruct()
-    {
-        echo "- DESTROYED : " . $this->name . " includes a " . $this->chipset . " chipset and " . $this->internalMemory . "GB of internal memory. It uses " . $this->keyboard . " Keyboard -<br>";
-    }
-}
-
-$samsung = new Samsung('Samsung s20', 'Exynos', 128);
-$blackberry = new BlackBerry('BlackBerry', 'ARM', 1, 'qwerty');
-echo "<br>";
-
-// Seems that we are repeating too much code...
\ No newline at end of file
diff --git a/08-inheritance-solution.php b/08-inheritance-solution.php
deleted file mode 100644
index 6fe6b51..0000000
--- a/08-inheritance-solution.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 08 - Inheritance solution */
-
-// Let's apply inheritance in latest example
-
-class Mobile
-{
-    public $name;
-    public $chipset;
-    public $internalMemory;
-
-    public function __construct($name, $chipset, $internalMemory)
-    {
-        // when we create a constructor we can add arguments and then initialize the properties with those argument values
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getChipset()
-    {
-        return $this->chipset;
-    }
-
-    public function getInternalMemory()
-    {
-        return $this->internalMemory;
-    }
-
-    public function getMobileDetails()
-    {
-        return "Name: $this->name, Chipset: $this->chipset, Internal Memory: $this->internalMemory";
-    }
-}
-
-// When you extend a class, the subclass inherits all of the public and protected methods from the parent class.
-class Blackberry extends Mobile
-{
-    public $keyboard;
-
-    // in php we use __construct to tell our class that this is the constructor method
-    public function __construct($name, $chipset, $internalMemory, $keyboard)
-    {
-        // we use same constructor as father class with parent keyword and double colon
-        parent::__construct($name, $chipset, $internalMemory);
-        // and add new arguments necessary for the new son class
-        $this->keyboard = $keyboard;
-    }
-
-    //new method for getting keyboard type
-    public function getKeyboard()
-    {
-        return $this->keyboard;
-    }
-}
-
-$samsung = new Mobile('Samsung s20', 'Exynos', 128);
-$blackberry = new BlackBerry('BlackBerry', 'ARM', 1, 'qwerty');
-echo $blackberry->getName();
-echo "\n";
-echo $blackberry->getMobileDetails();
diff --git a/09-public-private-protected.php b/09-public-private-protected.php
deleted file mode 100644
index abebdba..0000000
--- a/09-public-private-protected.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 09 - Access modifiers */
-
-// Properties and methods can have access modifiers which control where they can be accessed. 
-// thanks to them we can improve encapsulation to our classes.
-
-class Mobile
-{
-    public $name; // public makes sure we can access this properties outside the class.
-    private $chipset; // private elements may only be accessed by the class that defines the member.
-    protected $internalMemory;
-    private $imei;
-
-    public function __construct($name, $chipset, $internalMemory, $imei)
-    {
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        $this->imei = $imei;
-        echo "+ " . $this->name . " CREATED +<br>";
-    }
-
-    // now getters methods meke more sense because we won't be able to access properties outside the class
-    public function getName()
-    {
-        return "--- " . $this->name . " ---<br>";
-    }
-
-    public function getChipset()
-    {
-        return $this->chipset;
-    }
-
-    public function getInternalMemory()
-    {
-        return $this->internalMemory;
-    }
-
-    // protected elements can be accessed only within the class itself and inside inherited classes.
-    protected function getIMEI()
-    {
-        return $this->imei;
-    }
-}
-
-class Blackberry extends Mobile
-{
-    private $keyboard;
-
-    public function __construct($name, $chipset, $internalMemory, $imei, $keyboard)
-    {
-        parent::__construct($name, $chipset, $internalMemory, $imei);
-        $this->keyboard = $keyboard;
-    }
-
-    // show protected imei
-    public function showIMEI()
-    {
-        return $this->getIMEI();
-    }
-}
-
-$samsung = new Mobile('Samsung s20', 'Exynos', 128, '000111222333');
-$blackberry = new BlackBerry('BlackBerry', 'ARM', 1, '99966688555', 'qwerty');
-
-//-----------------------------------------------------
-// with this scenario we can't access private or protected
-// attributes or methods via arrow operator
-//-----------------------------------------------------
-
-echo "<br>";
-echo $samsung->getName(); // OK | Public method accessing a public property inside the class
-echo "<br>";
-echo $samsung->name; // OK | Public property
-echo "<br>";
-echo $samsung->getChipset(); // OK | Public method accessing a protected property inside the class
-echo "<br>";
-echo $samsung->chipset; // ERROR | Private property so we can't access outside the class and throws: Fatal error: Uncaught Error: Cannot access privated property Mobile::$chipset
-echo "<br>";
-echo $samsung->getIMEI(); // ERROR | Protected method so we can't call it outside our class and throws: Fatal error: Uncaught Error: Call to protected method Mobile::getIMEI() from context
-echo "<br>";
-echo $samsung->imei; // ERROR | Private property so we can't access outside the class and throws: Fatal error: Uncaught Error: Cannot access private property Mobile::$imei
-echo "<br>";
-echo $blackberry->showIMEI(); // OK | Public method accessing a inherited protected method inside the class
-echo "<br>";
-echo $blackberry->getInternalMemory(); // OK | Public method accessing a inherited protected method inside the class
-echo "<br>";
-echo $blackberry->internalMemory; // Uncaught Error: Cannot access protected property Blackberry::$internalMemory
-echo "<br>";
diff --git a/10-static.php b/10-static.php
deleted file mode 100644
index 4e37e3c..0000000
--- a/10-static.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 10 - Static Methods */
-
-// static methods can be called without creating an instance of the class and are declared with the static keyword
-class Internet
-{
-    public static $company = "orange";
-
-    public static function connectInternet()
-    {
-        return "connecting to the internet...";
-    }
-
-    // self word must be used to call static elements inside the same class
-    public function __construct()
-    {
-        echo self::connectInternet();
-    }
-}
-
-class Mobile
-{
-    public $name;
-    protected $chipset;
-    protected $internalMemory;
-    private $imei;
-
-    public function __construct($name, $chipset, $internalMemory, $imei)
-    {
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        $this->imei = $imei;
-        echo "+ CREATED " . $this->name . " WITH " . $this->internalMemory . " INTERNAL MEMORY +<br>";
-    }
-
-    public function connectMobileInternet()
-    {
-        // we can call static methods without instantiating directly with class name and double colon
-        return $this->name . " : " . Internet::connectInternet();
-    }
-}
-
-// we can acces to static properties without instanciating the class
-echo "<br>";
-$company = Internet::$company;
-
-echo $company;
-echo "<br><br>";
-
-
-$samsung = new Mobile('Samsung s20', 'Exynos', 128, '000111222333');
-echo $samsung->connectMobileInternet();
diff --git a/11-const.php b/11-const.php
deleted file mode 100644
index 4c250ab..0000000
--- a/11-const.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 11 - Constants */
-
-// constants are unchangeable, we can use the word const to create them. The default visibility of class constants is public.
-const APPNAME = 'ASSEMBLER APP';
-
-class Internet
-{
-    const SERVER = '122.23.4.5';
-
-    public static function connectInternet()
-    {
-        // We can refer to constants inside our class with self and double colon
-        return "connecting to " . self::SERVER . "...";
-    }
-}
-
-class Mobile
-{
-    public $name;
-    protected $chipset;
-    protected $internalMemory;
-    private $imei;
-
-    public function __construct($name, $chipset, $internalMemory, $imei)
-    {
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        $this->imei = $imei;
-        echo "+ CREATED " . $this->name . " WITH " . $this->internalMemory . " INTERNAL MEMORY +<br>";
-    }
-
-    // We can access constants with just name
-    public function runMobileApp()
-    {
-        return $this->name . " RUNS " . APPNAME . " : " . Internet::connectInternet();
-    }
-}
-
-$samsung = new Mobile('Samsung s20', 'Exynos', 128, '000111222333');
-echo $samsung->runMobileApp();
diff --git a/12-abstract-classes.php b/12-abstract-classes.php
deleted file mode 100644
index b1a9282..0000000
--- a/12-abstract-classes.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 12 - Abstract classes */
-
-// An abstract class cannot be instantiated, only inherited. We can declare an abstract class with the keyword abstract.
-// When inheriting from an abstract class, all methods marked abstract in the parent's class declaration must be defined by the child.
-const APPNAME = 'ASSEMBLER APP';
-
-class Internet
-{
-    const SERVER = '122.23.4.5';
-
-    public static function connectInternet()
-    {
-        return "connecting to " . self::SERVER . "...";
-    }
-}
-
-// We convert Mobile class into an abstract class
-abstract class Mobile
-{
-    public $name;
-    protected $chipset;
-    protected $internalMemory;
-    private $imei;
-
-    public function __construct($name, $chipset, $internalMemory, $imei)
-    {
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        $this->imei = $imei;
-        echo "+ CREATED " . $this->name . " WITH " . $this->internalMemory . " INTERNAL MEMORY +<br>";
-    }
-
-    public function runMobileApp()
-    {
-        return $this->name . " RUNS " . APPNAME . " : " . Internet::connectInternet();
-    }
-}
-
-class Blackberry extends Mobile
-{
-    public $keyboard;
-
-    public function __construct($name, $chipset, $internalMemory, $imei, $keyboard)
-    {
-        parent::__construct($name, $chipset, $internalMemory, $imei);
-        $this->keyboard = $keyboard;
-    }
-}
-
-$blackberry = new BlackBerry('BlackBerry', 'ARM', 1, '99966688555', 'qwerty');
-echo $blackberry->runMobileApp();
-
-// We cannot instantiate an abstract class by itself!!
-$samsung = new Mobile('Samsung s20', 'Exynos', 128, '000111222333'); // Fatal error: Uncaught Error: Cannot instantiate abstract class Mobile
\ No newline at end of file
diff --git a/13-interfaces.php b/13-interfaces.php
deleted file mode 100644
index 0058b06..0000000
--- a/13-interfaces.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 13 - Interfaces */
-
-// Interfaces allows specifying what methods a class should implement.
-// they make it easy to use a variety of different classes in the same way.
-// When one or more classes use the same interface, it is referred to as "polymorphism".
-// Interfaces are declared with the interface keyword
-interface iMobileApp
-{
-    // Interfaces cannot have properties
-
-    // All interface methods must be public
-    public function showSplashScreen();
-    public function login($username, $password);
-    public function saveData();
-    public function logout();
-}
-
-// To implement an interface, the implements operator is used
-class AssemblerApp implements iMobileApp
-{
-
-    const APPNAME = 'ASSEMBLER APP';
-    private $username;
-    private $password;
-    public $data;
-
-    // We have to declare every method described in the interface. If we miss a method we'll get a fatal error:
-    // Fatal error: Class AssemblerApp contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (mobileApp::methodName)
-    public function showSplashScreen()
-    {
-        return "¡Welcome to " . self::APPNAME . "!\n";
-    }
-
-    public function login($username, $password)
-    {
-        $this->username = $username;
-        $this->paassword = $password;
-
-        return "¡Loggin succesful with $this->username!\n";
-    }
-
-    public function saveData()
-    {
-        return "¡The user has successfully saved the information!\n";
-    }
-
-    public function logout()
-    {
-        $this->username = null;
-        $this->paassword = null;
-
-        return "¡The user has successfully logged out the application!\n";
-    }
-
-    // We can add methods not present in the interface
-    public function  exitApp()
-    {
-        echo "Clossing " . self::APPNAME . "...";
-    }
-}
-
-$app = new AssemblerApp();
-
-echo $app->showSplashScreen();
-echo $app->login("XxProAssemblerxX", "123456");
-echo $app->saveData();
-echo $app->logout();
-echo $app->exitApp();
diff --git a/14-overriding.php b/14-overriding.php
deleted file mode 100644
index a61c7ff..0000000
--- a/14-overriding.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 14 - Overriding */
-
-// In function overriding, both parent and child classes should have
-// same function name with and number of arguments. It is used to replace
-// parent method in child class. The purpose of overriding is to change
-// the behavior of parent class method. The two methods with the same
-// name and same parameter is called overriding.
-
-class iPhone
-{
-    public $name;
-    public $internalMemory;
-
-    public function __construct($name, $internalMemory)
-    {
-        $this->name = $name;
-        $this->internalMemory = $internalMemory;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getInternalMemory()
-    {
-        return $this->internalMemory;
-    }
-}
-
-// When you extend a class, the subclass inherits all of the public and protected methods from the parent class.
-class iPhonePlus extends iPhone
-{
-    //Here we are overriding this method adding extra features that the previous "getName" doesn't have.
-    public function getName()
-    {
-        return "¡The name of this iPhone is $this->name!";
-    }
-}
-
-$iPhone = new iPhone("iPhone X", "64");
-echo $iPhone->getName() . "\n";
-
-$iPhonePlus = new iPhonePlus("iPhone X Plus", "128");
-echo $iPhonePlus->getName();
diff --git a/15-overloading.php b/15-overloading.php
deleted file mode 100644
index 391ea8a..0000000
--- a/15-overloading.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 14 - Overloading */
-
-// Function overloading contains same function name and that function performs
-// different task according to number of arguments. Like other OOP languages
-// function overloading can not be done by native approach.
-// In PHP function overloading is done with the help of magic function __call().
-// This function takes function name and arguments.
-
-class App
-{
-    public $dni;
-    public $name;
-
-    // The "__call" method will be called when it cannot find the method that the user is trying to call.
-    function __call($methodName, $arguments)
-    {
-        switch ($methodName) {
-                // Here we see if the method introduced by the user exists in our casuistry
-            case $methodName == "login":
-                if ($arguments != null) {
-                    if (count($arguments) == 2 && is_int($arguments[0])) {
-                        return call_user_func_array(array($this, "loginShortDNI"), $arguments);
-                    } else if (is_string($arguments[0])) {
-                        return call_user_func_array(array($this, "loginFullDNI"), $arguments);
-                    }
-                }
-                break;
-        }
-    }
-
-    public function loginShortDNI(int $dni, string $name)
-    {
-        $this->dni = $dni;
-        $this->name = $name;
-        return "¡Login with short DNI!";
-    }
-
-    public function loginFullDNI(string $dni)
-    {
-        $this->dni = $dni;
-        return "¡Login with full DNI!";
-    }
-}
-
-$app = new App();
-echo $app->login(53123456, "Pau") . "\n";
-echo $app->login("53123456K");
diff --git a/16-namespaces.php b/16-namespaces.php
deleted file mode 100644
index fe5f942..0000000
--- a/16-namespaces.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-//======================================================================
-// ASSEMBLER SCHOOL - PHP Object Oriented Programming
-//======================================================================
-
-/* File 16 - Namespaces */
-
-// Namespaces are designed to solve two problems we encounter when creating re-usable code elements such as classes or functions:
-// - Name collisions between code you create, and internal PHP classes/functions/constants or third-party classes/functions/constants.
-// - Ability to alias (or shorten) Extra_Long_Names designed to alleviate the first problem, improving readability of source code.
-
-// imagine we need an external library for implementing some tasks in our mobile classes
-// inside mobileLibs there's already an interface named iMobileApp so if we run this php we will get an error:
-// Fatal error: Cannot declare interface iMobileApp, because the name is already in use in D:\xampp\htdocs\assembler-school\oop-basics\mobileLibs.php on line 4
-// we have to add a namespace in mobileLibs
-
-include 'mobileLibs.php';
-
-interface iMobileApp
-{
-    public static function showSplashScreen();
-    public static function getData();
-    public static function showData();
-}
-
-class AssemblerApp implements iMobileApp
-{
-
-    const APPNAME = 'ASSEMBLER APP';
-    public static $data;
-
-    public static function showSplashScreen()
-    {
-        echo "@@@ " . self::APPNAME . " @@@";
-    }
-
-    public static function getData()
-    {
-        self::$data = self::APPNAME . " " . Internet::connectInternet();
-    }
-
-    public static function showData()
-    {
-        echo self::$data;
-    }
-
-    public static function  exitApp()
-    {
-        echo "@@@ BYE " . self::APPNAME . " BYE @@@";
-    }
-}
-
-class Internet
-{
-    const SERVER = '122.23.4.5';
-
-    public static function connectInternet()
-    {
-        return "connecting to " . self::SERVER . "...";
-    }
-}
-
-abstract class Mobile
-{
-    public $name;
-    protected $chipset;
-    protected $internalMemory;
-    private $imei;
-
-    public function __construct($name, $chipset, $internalMemory, $imei)
-    {
-        $this->name = $name;
-        $this->chipset = $chipset;
-        $this->internalMemory = $internalMemory;
-        $this->imei = $imei;
-        echo "+ CREATED " . $this->name . " WITH " . $this->internalMemory . " INTERNAL MEMORY +<br>";
-    }
-
-    public function runAssemblerApp()
-    {
-        echo "<br>";
-        AssemblerApp::showSplashScreen();
-        echo "<br>";
-        AssemblerApp::getData();
-        AssemblerApp::showData();
-        echo "<br>";
-        AssemblerApp::exitApp();
-    }
-
-    public function runAssemblerAppLib()
-    {
-        // We use the namespace for calling our library methods
-        Lib\AssemblerApp::showSplashScreen();
-        echo "<br>";
-        Lib\AssemblerApp::getData();
-        Lib\AssemblerApp::showData();
-        echo "<br>";
-        Lib\AssemblerApp::exitApp();
-    }
-}
-
-class Blackberry extends Mobile
-{
-    public $keyboard;
-
-    public function __construct($name, $chipset, $internalMemory, $imei, $keyboard)
-    {
-        parent::__construct($name, $chipset, $internalMemory, $imei);
-        $this->keyboard = $keyboard;
-    }
-}
-
-$blackberry = new BlackBerry('BlackBerry', 'ARM', 1, '99966688555', 'qwerty');
-echo $blackberry->runAssemblerApp();
-echo "<br><br>";
-echo $blackberry->runAssemblerAppLib();
diff --git a/AbsClass_suitableVehicles.php b/AbsClass_suitableVehicles.php
new file mode 100644
index 0000000..889992b
--- /dev/null
+++ b/AbsClass_suitableVehicles.php
@@ -0,0 +1,30 @@
+<?php
+
+    require_once("ClassVehicle.php");
+
+    // Abstract class 
+    abstract class Suitable_circulate_vehicles extends Vehicle {
+        // Parameters of the class
+        protected $intYear;
+        protected $boolElectric;
+
+        // Function contructor
+        function __construct(string $maker, string $model, string $color, string $engine, int $year,  bool $electric) {
+            parent::__construct($maker, $model, $color, $engine);
+            $this->boolElectric = $electric;
+            $this->intYear = $year;
+        }
+
+
+        // Method that switch the status of the vehicle to circulate
+        abstract public function switchStatusCirculation();
+
+        // Method that returns if the car can enter the city if it is electric and if it is not, check that it is less than 5 years old
+        abstract public function checkEnterCity();
+
+        // Method that returns if the car its Electric or no
+        abstract public function GetBoolElectric();
+
+    }
+?>
+
diff --git a/ClassCar.php b/ClassCar.php
new file mode 100644
index 0000000..5577e0c
--- /dev/null
+++ b/ClassCar.php
@@ -0,0 +1,113 @@
+<?php
+
+    require_once("AbsClass_suitableVehicles.php");
+    require_once("Interface.php");
+
+    // Abstract class
+    class Car extends Suitable_circulate_vehicles implements Contamination
+
+    {   // Parameters of the class
+        private $serialNumber;
+        static $status = "Active";
+
+        //Function contructor
+        function __construct(string $maker, string $model, string $color, string $engine, int $year,  bool $electric) {
+            parent::__construct($maker, $model, $color, $engine, $year, $electric);
+            $this->serialNumber = rand();
+        }
+
+        // getting private property(getter).
+        public function getSerialNumber() {
+            return "Serial number: " . $this->serialNumber . "<br>";
+        }
+        // getting static property(getter).
+        public static function getStatus() {
+            echo "Available to circulate: " . self::$status;
+        }
+
+        // Override property(setter).
+        public static function setStatus(string $newStatus) {
+            echo self::$status = $newStatus;
+        }
+        
+        //Override method.
+        public function checkITV() 
+        {   
+            if($this->intYear + 4 < date("Y")) {
+            echo "You need to pass ITV: " . date("Y") - $this->intYear. " years old vehicle <br>" ;
+            }else {
+            echo "You dont need to pass ITV: ". date("Y") - $this->intYear. " years old vehicle <br> ";
+            }
+        }
+
+        
+        // Method that returns the properties of the car
+        public function getChosenCar() 
+        {
+            $data = "
+
+                Maker:  {$this->strMaker} <br>
+                Model:  {$this->strModel} <br>
+                Motor:   {$this->strEngine} <br>
+                Color:  {$this->strColor} <br>
+                Year:  {$this->intYear} <br>
+                
+            ";
+
+            return $data;
+        }
+
+        // Method that switch the status of the vehicle to circulate
+        public function switchStatusCirculation() 
+        {
+            if($this->intYear < date("Y") - 50) {
+                echo Car::setStatus("Available to circulate: Inactive<br>");
+            }else {
+                echo Car::getStatus();
+            }
+        }
+
+
+        // Method that returns if the car can enter the city if it is electric and if it is not, check that it is less than 5 years old
+        public function checkEnterCity() 
+        {
+            if($this->boolElectric === true && $this->intYear >= date("Y") - 5  && $this->intYear > date("Y") - 50) {
+                echo "Movement restriction: You can enter to the city <br>";
+            }elseif ($this->boolElectric === false && $this->intYear >= date("Y") - 5 && $this->intYear > date("Y") - 50) {
+                echo "Movement restriction: You can enter to the city <br>";
+            }else {
+                    echo "Movement restriction: You cant enter to the city <br>";
+                }
+                
+        }
+
+        // Method that returns if the car its Electric or no
+        public function GetBoolElectric() 
+        {
+        
+            if($this->boolElectric === true) {
+                echo "Electric: Yes<br>";
+            }else {
+                echo "Electric: No<br>";
+            }
+
+        }
+
+        public function co2Levels(){
+            if ($this->boolElectric === false){
+                echo "Your CO2 emissions: " . round(100 / rand(2, 100), 2) . " g/km<br>";
+            }
+            
+        }
+        
+        public function noiseLevels(){
+            if ($this->boolElectric === false){
+                echo "Noise emissions: " . rand(30, 90) . " dB <br>";
+            }
+        }
+        
+
+    }
+
+
+?>
\ No newline at end of file
diff --git a/ClassVehicle.php b/ClassVehicle.php
new file mode 100644
index 0000000..57ca363
--- /dev/null
+++ b/ClassVehicle.php
@@ -0,0 +1,48 @@
+<?php
+
+   abstract class Vehicle 
+    {
+        // Parameters of the class
+        protected $strMaker;
+        protected $strModel;
+        protected $strColor;
+        protected $strEngine;
+
+        // Function contructor
+        function __construct(string $maker, string $model, string $color, string $engine) 
+        {
+            $this->strMaker = $maker;
+            $this->strModel = $model;
+            $this->strColor = $color;
+            $this->strEngine = $engine;
+        }
+
+
+
+        // Method that returns if the car has to pass ITV if it is more than 4 years old
+        public function checkITV() 
+        {
+            if($this->intYear + 4 < date("Y")) {
+               echo "You need to pass ITV: " . date("Y") - $this->intYear. " years old car <br>" ;
+            }else {
+               echo "You dont need to pass ITV <br>";
+            }
+        }
+
+
+        
+        // Destructor Function
+        function __destruct() 
+        {
+            $this->strMaker.$this->strModel.$this->strColor.$this->strEngine ;
+        }
+        
+        
+        
+    }   
+
+
+    
+
+
+?>
diff --git a/Interface.php b/Interface.php
new file mode 100644
index 0000000..c9080da
--- /dev/null
+++ b/Interface.php
@@ -0,0 +1,9 @@
+<?php
+
+    interface Contamination{ 
+        public function co2Levels();
+        public function noiseLevels();
+
+    }
+
+?>
\ No newline at end of file
diff --git a/README.md b/README.md
index e644e6a..a92dc6b 100644
--- a/README.md
+++ b/README.md
@@ -1,136 +1,42 @@
-`#php` `#oop` `#master-in-software-engineering`
-
-# Assembler School: OOP Basics with PHP <!-- omit in toc -->
-
-In this project you will learn the basics of OOP using mobile devices as a reference. In the _"Project files"_ section you will find a description of the content to be displayed in each file.
-
-## Table of contents
-
-- [Table of contents](#table-of-contents)
-- [Getting Started](#getting-started)
-- [Dependencies](#dependencies)
-- [Tools](#tools)
-- [OOP Introduction](#oop-introduction)
-- [Project files](#project-files)
-
-## Getting Started
-
-### The repo <!-- omit in toc -->
-
-First, you will need to clone the repo:
-
-```bash
-$ git clone https://github.com/assembler-school/oop-basics.git
-```
-
-### Presentation material <!-- omit in toc -->
-
-- [Slides](https://docs.google.com/presentation/d/1cZxutGPDqUGsLWLVen_ATjd7dEkeoPS_v_fy1y0C5Co/edit?usp=sharing)
-
-## Dependencies
-
-Before we can get started you will need to make sure that all the necessary dependencies are installed in your system.
-
-### PHP <!-- omit in toc -->
-
-You can install it by following the instructions [in the official docs](https://www.php.net/downloads) (we recommend that you install the version that is named _Current_).
-
-To verify that you have installed it correctly, you can run the following command from the terminal that should output the version installed:
-
-```bash
-$ php -version
-```
-
-## Tools
-
-In the event that you prefer to use a tool that installs everything you need to configure and run a PHP server, we recommend using [XAMPP](https://www.apachefriends.org/es/download.html)
-
-### XAMPP <!-- omit in toc -->
-
-XAMPP is a completely free and easy to install Apache distribution that contains MariaDB, PHP, and Perl. The XAMPP installation package has been designed to be incredibly easy to install and use.
-
-<img src='./assets/img/xampp-homepage.png' width='600' alt='xampp homepage'>
-
-You have to go to the [download page](https://www.apachefriends.org/es/download.html) and it will automatically recommend installing the latest version available.
-
-<img src='./assets/img/xampp-download.png' width='600' alt='xampp download'>
-
-Once downloaded and installed, in the case that the Windows operating system you will see the following screen, in which you will only have to start the Apache service.
-
-<img src='./assets/img/xampp-app.png' width='600' alt='xampp app'>
-
-## OOP Introduction
-
-Object-oriented programming (OOP) is a programming paradigm based on the concept of "objects", which can contain data and code: data in the form of fields (often known as attributes or properties), and code, in the form of procedures (often known as methods).
-
-## Project files
-
-### [01 - Classes](./01-classes.php) <!-- omit in toc -->
-
-The OOP paradigm encapsulates concepts of the real world in what is called as Classes which create Objects. In this file you will learn how to create a class and instanciate it.
-
-### [02 - Properties](02-properties.php) <!-- omit in toc -->
-
-Class member variables are called properties. In this file, you will learn how to add properties to a class and get them when the class is instantiated.
-
-### [03 - Methods](03-methods.php) <!-- omit in toc -->
-
-Properties define the characteristics of an object and the methods (functions in a class are called methods) which define the behavior of the Class. In this file you will learn how to create methods inside a class.
-
-### [04 - Getters](04-getters.php) <!-- omit in toc -->
-
-The get method returns the attribute value, usually there is a get method for each attribute of the class. In this file you will learn how to create **getter** methods.
-
-### [05 - Setters](05-setters.php) <!-- omit in toc -->
-
-The set method sets the attribute value, usually there is a get method for each attribute of the class. In this file you will learn how to create **setter** methods.
-
-### [06 - Constructors](06-constructors.php) <!-- omit in toc -->
-
-A constructor allows you to initialize an object's properties upon creation of the object. In this file you will learn how to create the constructor method.
-
-### [07 - Inheritance problem](07-inheritance-problem.php) <!-- omit in toc -->
-
-There are several disadvantages of not applying inheritance in our code. In this file you will lean what's the problem if you don't apply any inheritance in your code.
-
-### [08 - Inheritance soluction](08-inheritance-solution.php) <!-- omit in toc -->
-
-The child class will inherit all the public and protected properties and methods from the parent class. In addition, it can have its own properties and methods. In this file you will learn how to apply the inheritance in your code.
-
-### [09 - Public, private & protected](09-public-private-protected.php) <!-- omit in toc -->
-
-Properties and methods can have access modifiers which control where they can be accessed. In this file you will learn le three access modifiers.
-
-### [10 - Static](10-static.php) <!-- omit in toc -->
-
-Static properties and methods can be called directly - without creating an instance of the class first. In this file you will learn how to use static properties and methods.
-
-### [11 - Const](11-const.php) <!-- omit in toc -->
-
-Constants cannot be changed once it is declared. Class constants can be useful if you need to define some constant data within a class. In this file you will learn how to create constants within a class.
-
-### [12 - Abstract classes](12-abstract-classes.php) <!-- omit in toc -->
-
-Abstract classes and methods are when the parent class has a named method, but need its child class(es) to fill out the tasks. In this file you will learn how to create and use abstract classes.
-
-### [13 - Interfaces](13-interfaces.php) <!-- omit in toc -->
-
-Interfaces allow you to specify what methods a class should implement.
-Interfaces make it easy to use a variety of different classes in the same way. When one or more classes use the same interface, it is referred to as "polymorphism". In this file you will learn how to create and extend interfaces.
-
-### [14 - Overriding](14-overriding.php) <!-- omit in toc -->
-
-In function overriding, both parent and child classes should have same function name with and number of arguments. In this file you will learn how to implement overriding.
-
-### [15 - Overloading](15-overloading.php) <!-- omit in toc -->
-
-Function overloading contains same function name and that function preforms different task according to number of arguments. In this file you will learn how to implement overloading.
-
-### [16 - Namespaces](16-namespaces.php) <!-- omit in toc -->
-
-Namespaces are qualifiers that solve two different problems:
-
-1. They allow for better organization by grouping classes that work together to perform a task
-2. They allow the same name to be used for more than one class
-
-In this file you will learn how to create and use namespaces.
+
+#  OOP Basics with PHP 
+
+In this project the basic concepts of OOP have been implemented with concept examples for Inheritance, Abstraction, Polymorphism, Interfaces, Class Properties, Constructor Methods, Overload, Override and Access Modifiers.
+
+## Prerequisites
+
+Before we can get started you will need to make sure that all the necessary dependencies are installed in your system.
+
+### PHP 
+
+You can install it by following the instructions [in the official docs](https://www.php.net/downloads) (we recommend that you install the version that is named _Current_).
+
+To verify that you have installed it correctly, you can run the following command from the terminal that should output the version installed:
+
+```bash
+$ php -version
+```
+
+In the event that you prefer to use a tool that installs everything you need to configure and run a PHP server, we recommend using [XAMPP](https://www.apachefriends.org/es/download.html)
+
+### XAMPP 
+
+XAMPP is a completely free and easy to install Apache distribution that contains MariaDB, PHP, and Perl. The XAMPP installation package has been designed to be incredibly easy to install and use.
+
+You have to go to the [download page](https://www.apachefriends.org/es/download.html) and it will automatically recommend installing the latest version available.
+
+Once downloaded and installed, in the case that the Windows operating system you will see the following screen, in which you will only have to start the Apache service.
+
+
+## Getting Started
+
+First, you will need to clone the repo:
+
+URL: https://github.com/Psicowar/oop-basics.git
+
+Once cloned you can see the different examples of the basic concepts of OOP in PHP.
+
+## Autors
+
+<li>Dayan Álvarez Martínez</li>
+
diff --git a/assets/img/xampp-app.png b/assets/img/xampp-app.png
deleted file mode 100644
index 144ec73..0000000
Binary files a/assets/img/xampp-app.png and /dev/null differ
diff --git a/assets/img/xampp-download.png b/assets/img/xampp-download.png
deleted file mode 100644
index 0e06cbb..0000000
Binary files a/assets/img/xampp-download.png and /dev/null differ
diff --git a/assets/img/xampp-homepage.png b/assets/img/xampp-homepage.png
deleted file mode 100644
index c33ea9f..0000000
Binary files a/assets/img/xampp-homepage.png and /dev/null differ
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..eee12c3
--- /dev/null
+++ b/index.php
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Vehicle Status</title>
+</head>
+<body>
+    <h1>Car Checker</h1>
+    
+    <?php 
+    require_once("ClassCar.php");
+
+    
+
+    //Instantiate the classes
+    $vehicle1= new Car("Tesla", "Model 3", "Dark Space", "Battery", "2022", true);
+    // Calling methods
+    echo $vehicle1->getChosenCar();
+    echo $vehicle1->getBoolElectric();
+    echo $vehicle1->checkITV();
+    echo $vehicle1->checkEnterCity();
+    echo $vehicle1->getSerialNumber();
+    echo $vehicle1->co2Levels();
+    echo $vehicle1->noiseLevels();
+
+    // Using this method we can call a static method and switch between it and a public one to check if the vehicle can circulate
+    echo $vehicle1->switchStatusCirculation();
+
+    echo "<hr>";
+    $vehicle2= new Car("Opel", "Astra", "Blue", "Diesel", "1957", false);
+    echo $vehicle2->getChosenCar();
+    echo $vehicle2->getBoolElectric();
+    echo $vehicle2->checkITV();
+    echo $vehicle2->checkEnterCity();
+    echo $vehicle2->getSerialNumber();
+    echo $vehicle2->co2Levels();
+    echo $vehicle2->switchStatusCirculation();
+    echo $vehicle2->noiseLevels();
+    
+
+    
+
+    ?>
+</body>
+</html>
diff --git a/mobileLibs.php b/mobileLibs.php
deleted file mode 100644
index 3b4fa8f..0000000
--- a/mobileLibs.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php 
-
-//we set namespace name
-namespace Lib;
-
-// External library interface with same name as main one
-interface mobileApp {
-    // Interfaces cannot have properties
-
-    // All interface methods must be public
-    public static function showSplashScreen();
-    public static function getData();
-    public static function showData();
-}
-
-// External library classes with also same name
-class assemblerApp implements mobileApp{
-
-    const APPNAME = 'LIB APP';
-    public static $data;
-
-    public static function showSplashScreen()
-    {
-        echo "@@@ " . self::APPNAME . " @@@";
-    }
-
-    public static function getData()
-    {
-        self::$data = self::APPNAME . " " . Internet::connectInternet();
-    }
-
-    public static function showData()
-    {
-        echo self::$data;
-    }
-
-    public static function  exitApp()
-    {
-        echo "@@@ BYE " . self::APPNAME . " BYE @@@";
-    }
-}
-
-
-class Internet {
-    const SERVER = '122.23.4.9';
-
-    public static function connectInternet()
-    {
-        return "connecting to " . self::SERVER . "...";
-    }
-}
\ No newline at end of file