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/InterfaceUser.php b/InterfaceUser.php
new file mode 100644
index 0000000..9ee572e
--- /dev/null
+++ b/InterfaceUser.php
@@ -0,0 +1,9 @@
+<?php
+    interface userIntf
+    {
+        public function getName();
+
+        public function getLastName();
+
+        public function getAge();
+    }
\ No newline at end of file
diff --git a/admin.php b/admin.php
new file mode 100644
index 0000000..ff6fe40
--- /dev/null
+++ b/admin.php
@@ -0,0 +1,35 @@
+<?php
+
+    require_once('role.php');
+
+    class Admin extends role
+    {
+        public $role;
+        static public $isEmployee = true;
+        public function __construct(string $name, string $lastName, int $age, string $country, string $gender, int $post, string $role)
+        {
+            parent::__construct($name, $lastName, $age, $country, $gender, $post);
+            $this->role = $role;
+            $this->country = "Private Country";
+        }
+
+        public function getRole()
+        {
+            return $this->role;
+        }
+
+        public function getName()
+        {
+            return "Name: " . role::getName();
+        }
+        
+        public function getCountry()
+        {
+            return $this->country;
+        }
+
+        public function __destruct()
+        {
+            echo "<br><br>DESTR: <br>", role::getName();
+        }
+    }
\ No newline at end of file
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..e9e75b9
--- /dev/null
+++ b/index.php
@@ -0,0 +1,16 @@
+<?php
+
+    require_once('admin.php');
+
+    $Ynohe = new role("Ynohe", "Sandoval", 27, "Spain", "Male", 380008);
+    echo "Name: ".$Ynohe->getName()."<br>";
+    echo "Last Name: ".$Ynohe->getLastName()."<br>";
+    echo "Age: ".$Ynohe->getAge()."<br>";
+    echo $Ynohe->getInfo()."<br>";
+
+    $Berta = new Admin("Berta", "Garcia", 29, "Spain", "Female", 65054321, "Admin");
+    echo $Berta->getName()."<br>";
+    echo "Last Name: ".$Berta->getLastName()."<br>";
+    echo "Age: ".$Berta->getAge()."<br>";
+    echo "Country: ".$Berta->getCountry()."<br>";
+    echo "Role: ".$Berta->getRole()."<br>";
\ No newline at end of file
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
diff --git a/role.php b/role.php
new file mode 100644
index 0000000..306af35
--- /dev/null
+++ b/role.php
@@ -0,0 +1,41 @@
+<?php
+
+    require_once("user.php");
+
+    class role extends user
+    {  
+
+        public $country;
+        public $gender;
+        public $post;
+
+        public function __construct(string $name, string $lastName, int $age, string $country, string $gender, int $post)
+        {
+            parent::__construct($name, $lastName, $age);
+            $this->country = $country;
+            $this->gender = $gender;
+            $this->postCode = $post;
+        }
+
+        public function getInfo()
+        {            
+            return $this->country."<br>".$this->gender."<br>".$this->post;
+        }
+
+        public function getName()
+        {
+            return $this->name;
+        }
+
+
+        public function getLastName()
+        {
+            return $this->lastName;
+        }
+
+        public function getAge()
+        {
+            return $this->age;
+        }
+
+    }
\ No newline at end of file
diff --git a/user.php b/user.php
new file mode 100644
index 0000000..0278b62
--- /dev/null
+++ b/user.php
@@ -0,0 +1,25 @@
+<?php
+
+    require_once("interfaceUser.php");
+
+    abstract class user implements userIntf
+    {
+        protected string $name;
+        protected string $lastName;
+        protected int $age;
+
+        public function __construct(string $name, string $lastName, int $age)
+        {
+            $this->name = $name;
+            $this->lastName = $lastName;
+            $this->age = $age;
+        }
+
+        abstract public function getName();
+
+        abstract public function getLastName();
+
+        abstract public function getAge();
+
+    }
+?>
\ No newline at end of file