diff --git a/workshop3/.idea/workshop3.iml b/.idea/PHPStorm Repo.iml
similarity index 100%
rename from workshop3/.idea/workshop3.iml
rename to .idea/PHPStorm Repo.iml
diff --git a/workshop3/.idea/modules.xml b/.idea/modules.xml
similarity index 56%
rename from workshop3/.idea/modules.xml
rename to .idea/modules.xml
index 3b4dc68..fca11d0 100644
--- a/workshop3/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/workshop3.iml" filepath="$PROJECT_DIR$/.idea/workshop3.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/PHPStorm Repo.iml" filepath="$PROJECT_DIR$/.idea/PHPStorm Repo.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/workshop3/.idea/php.xml b/.idea/php.xml
similarity index 98%
rename from workshop3/.idea/php.xml
rename to .idea/php.xml
index 57a5904..a85fe78 100644
--- a/workshop3/.idea/php.xml
+++ b/.idea/php.xml
@@ -10,7 +10,7 @@
     <option name="highlightLevel" value="WARNING" />
     <option name="transferred" value="true" />
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.3" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
   <component name="PhpStanOptionsConfiguration">
     <option name="transferred" value="true" />
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index d843f34..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="VcsDirectoryMappings" defaultProject="true" />
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/MVCtemplate-23-24/.idea/.gitignore b/MVCtemplate-23-24/.idea/.gitignore
deleted file mode 100644
index 4aa91ea..0000000
--- a/MVCtemplate-23-24/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/MVCtemplate-23-24/css/my-style.css b/MVCtemplate-23-24/css/my-style.css
deleted file mode 100644
index 8631d6b..0000000
--- a/MVCtemplate-23-24/css/my-style.css
+++ /dev/null
@@ -1,38 +0,0 @@
-#title {
-    margin-top: 12px;
-    background-color: #fff;
-    color: #000;
-
-}
-#menu {
-    border-top: solid 6px #f00;
-    background-color: #f00;
-    color: #fff;
-    /*height: 400px;*/
-}
-
-#menu a {
-    background-color: #f00;
-    color: #fff;
-    text-decoration: none;
-    display: block;
-}
-#menu a:hover {
-    background-color: #f00;
-    color: #ddd;
-    text-decoration:underline;
-    display: block;
-}
-
-#content {
-    background-color: #fff;
-    border-top: solid 6px #f00;
-
-}
-
-#footer {
-    margin_top: 20px;
-    text-align: center;
-    background-color: #000;
-    color: #fff;
-}
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/access.log b/access.log
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100755
index 0000000..65b9bc8
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,26 @@
+services:
+  nginx-web:
+    container_name: nginx-web
+    image: nginx
+    volumes:
+     - ./nginx/configs/:/etc/nginx/conf.d
+     - /home/boris/OneDrive/CSCS-Y2/Client Server Systems/PHPStorm Repo/nginx/nginx.conf:/etc/nginx/nginx.conf
+     - ./:/var/www/
+     - /home/boris/OneDrive/CSCS-Y2/Client Server Systems/PHPStorm Repo/access.log:/var/log/nginx/access.log
+     - /home/boris/OneDrive/CSCS-Y2/Client Server Systems/PHPStorm Repo/error.log:/var/log/nginx/error.log
+    ports:
+     - "8088:80"
+    environment:
+     - NGINX_HOST=localhost
+     - NGINX_PORT=8088
+    links:
+     - php-fpm
+    depends_on:
+     - php-fpm
+  php-fpm:
+    container_name: php-fpm
+    image: php:8-fpm
+    volumes:
+      - ./:/var/www/
+      - /home/boris/OneDrive/CSCS-Y2/Client Server Systems/PHPStorm Repo/nginx/php/config/www.conf:/usr/local/etc/php-fpm.d/www.conf
+      - /home/boris/OneDrive/CSCS-Y2/Client Server Systems/PHPStorm Repo/nginx/php/fpm-php.www.log:/var/log/fpm-php.www.log
diff --git a/error.log b/error.log
new file mode 100644
index 0000000..db8269f
--- /dev/null
+++ b/error.log
@@ -0,0 +1,42 @@
+2024/10/16 16:06:31 [notice] 1#1: using the "epoll" event method
+2024/10/16 16:06:31 [notice] 1#1: nginx/1.27.2
+2024/10/16 16:06:31 [notice] 1#1: built by gcc 12.2.0 (Debian 12.2.0-14) 
+2024/10/16 16:06:31 [notice] 1#1: OS: Linux 6.8.0-45-generic
+2024/10/16 16:06:31 [notice] 1#1: getrlimit(RLIMIT_NOFILE): 1048576:1048576
+2024/10/16 16:06:31 [notice] 1#1: start worker processes
+2024/10/16 16:06:31 [notice] 1#1: start worker process 28
+2024/10/16 16:06:31 [notice] 1#1: start worker process 29
+2024/10/16 16:06:31 [notice] 1#1: start worker process 30
+2024/10/16 16:06:31 [notice] 1#1: start worker process 31
+2024/10/16 16:06:31 [notice] 1#1: start worker process 32
+2024/10/16 16:06:31 [notice] 1#1: start worker process 33
+2024/10/16 16:06:31 [notice] 1#1: start worker process 34
+2024/10/16 16:06:31 [notice] 1#1: start worker process 35
+2024/10/16 16:14:04 [notice] 1#1: using the "epoll" event method
+2024/10/16 16:14:04 [notice] 1#1: nginx/1.27.2
+2024/10/16 16:14:04 [notice] 1#1: built by gcc 12.2.0 (Debian 12.2.0-14) 
+2024/10/16 16:14:04 [notice] 1#1: OS: Linux 6.8.0-45-generic
+2024/10/16 16:14:04 [notice] 1#1: getrlimit(RLIMIT_NOFILE): 1048576:1048576
+2024/10/16 16:14:04 [notice] 1#1: start worker processes
+2024/10/16 16:14:04 [notice] 1#1: start worker process 28
+2024/10/16 16:14:04 [notice] 1#1: start worker process 29
+2024/10/16 16:14:04 [notice] 1#1: start worker process 30
+2024/10/16 16:14:04 [notice] 1#1: start worker process 31
+2024/10/16 16:14:04 [notice] 1#1: start worker process 32
+2024/10/16 16:14:04 [notice] 1#1: start worker process 33
+2024/10/16 16:14:04 [notice] 1#1: start worker process 34
+2024/10/16 16:14:04 [notice] 1#1: start worker process 35
+2024/10/16 16:15:27 [notice] 1#1: using the "epoll" event method
+2024/10/16 16:15:27 [notice] 1#1: nginx/1.27.2
+2024/10/16 16:15:27 [notice] 1#1: built by gcc 12.2.0 (Debian 12.2.0-14) 
+2024/10/16 16:15:27 [notice] 1#1: OS: Linux 6.8.0-45-generic
+2024/10/16 16:15:27 [notice] 1#1: getrlimit(RLIMIT_NOFILE): 1048576:1048576
+2024/10/16 16:15:27 [notice] 1#1: start worker processes
+2024/10/16 16:15:27 [notice] 1#1: start worker process 28
+2024/10/16 16:15:27 [notice] 1#1: start worker process 29
+2024/10/16 16:15:27 [notice] 1#1: start worker process 30
+2024/10/16 16:15:27 [notice] 1#1: start worker process 31
+2024/10/16 16:15:27 [notice] 1#1: start worker process 32
+2024/10/16 16:15:27 [notice] 1#1: start worker process 33
+2024/10/16 16:15:27 [notice] 1#1: start worker process 34
+2024/10/16 16:15:27 [notice] 1#1: start worker process 35
diff --git a/nginx/configs/default.conf b/nginx/configs/default.conf
new file mode 100755
index 0000000..6eeffc2
--- /dev/null
+++ b/nginx/configs/default.conf
@@ -0,0 +1,39 @@
+server {
+	listen 80;
+	listen [::]:80;
+
+	server_name cdn.localhost.dev;
+	root /var/www;
+	index index.html index.php;
+
+	location / {
+		try_files $uri $uri/ /index.php$query_string;
+		autoindex on;
+	}
+
+	location = /favicon.ico { access_log off; log_not_found off; }  
+	location = /robots.txt { access_log off; log_not_found off; }  
+
+	access_log off;  
+	error_log /var/log/nginx/error.log error;  
+
+	sendfile off;  
+
+	client_max_body_size 100m;  
+
+	location ~ .php$ {  
+	      fastcgi_split_path_info ^(.+.php)(/.+)$;  
+	      fastcgi_pass php-fpm:9000;  
+	      fastcgi_index index.php;  
+	      include fastcgi_params;
+	      fastcgi_read_timeout 300;
+	      fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;  
+	      fastcgi_intercept_errors off;  
+	      fastcgi_buffer_size 16k;  
+	      fastcgi_buffers 4 16k;  
+	}  
+
+	location ~ /.ht {  
+	      deny all;  
+	}  
+ }
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
new file mode 100755
index 0000000..5e076aa
--- /dev/null
+++ b/nginx/nginx.conf
@@ -0,0 +1,32 @@
+
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}
diff --git a/nginx/php/config/www.conf b/nginx/php/config/www.conf
new file mode 100755
index 0000000..bbbbc94
--- /dev/null
+++ b/nginx/php/config/www.conf
@@ -0,0 +1,490 @@
+; Start a new pool named 'www'.
+; the variable $pool can be used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or NONE) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of the child processes. This can be used only if the master
+; process running user is root. It is set after the child process is created.
+; The user and group can be specified either by their name or by their numeric
+; IDs.
+; Note: If the user is root, the executable needs to be started with
+;       --allow-to-run-as-root option to work.
+; Default Values: The user is set to master process running user by default.
+;                 If the group is not set, the user's group is used.
+user = 101
+group = 101
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog.
+; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD)
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions. The owner
+; and group can be specified either by name or by their numeric IDs.
+; Default Values: Owner is set to the master process running user. If the group
+;                 is not set, the owner's group is used. Mode is set to 0660.
+;listen.owner = www-data
+;listen.group = www-data
+;listen.mode = 0660
+
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Set the associated the route table (FIB). FreeBSD only
+; Default Value: -1
+;listen.setfib = 1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool processes will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or
+; PROC_TRACE_CTL procctl for FreeBSD) even if the process user
+; or group is different than the master process user. It allows to create process
+; core dump and ptrace the process for the pool user.
+; Default Value: no
+; process.dumpable = yes
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives. With this process management, there will be
+;             always at least 1 children.
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+;             pm.max_spawn_rate    - the maximum number of rate to spawn child
+;                                    processes at once.
+;  ondemand - no children are created at startup. Children will be forked when
+;             new requests will connect. The following parameter are used:
+;             pm.max_children           - the maximum number of children that
+;                                         can be alive at the same time.
+;             pm.process_idle_timeout   - The number of seconds after which
+;                                         an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 5
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: (min_spare_servers + max_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+; The number of rate to spawn child processes at once.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+; Default Value: 32
+;pm.max_spawn_rate = 32
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following information:
+;   pool                 - the name of the pool;
+;   process manager      - static, dynamic or ondemand;
+;   start time           - the date and time FPM has started;
+;   start since          - number of seconds since FPM has started;
+;   accepted conn        - the number of request accepted by the pool;
+;   listen queue         - the number of request in the queue of pending
+;                          connections (see backlog in listen(2));
+;   max listen queue     - the maximum number of requests in the queue
+;                          of pending connections since FPM has started;
+;   listen queue len     - the size of the socket queue of pending connections;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes;
+;   max active processes - the maximum number of active processes since FPM
+;                          has started;
+;   max children reached - number of times, the process limit has been reached,
+;                          when pm tries to start more children (works only for
+;                          pm 'dynamic' and 'ondemand');
+; Value are updated in real time.
+; Example output:
+;   pool:                 www
+;   process manager:      static
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          62636
+;   accepted conn:        190460
+;   listen queue:         0
+;   max listen queue:     1
+;   listen queue len:     42
+;   idle processes:       4
+;   active processes:     11
+;   total processes:      15
+;   max active processes: 12
+;   max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
+;
+; By default the status page only outputs short status. Passing 'full' in the
+; query string will also return status for each pool process.
+; Example:
+;   http://www.foo.bar/status?full
+;   http://www.foo.bar/status?json&full
+;   http://www.foo.bar/status?html&full
+;   http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+;   pid                  - the PID of the process;
+;   state                - the state of the process (Idle, Running, ...);
+;   start time           - the date and time the process has started;
+;   start since          - the number of seconds since the process has started;
+;   requests             - the number of requests the process has served;
+;   request duration     - the duration in µs of the requests;
+;   request method       - the request method (GET, POST, ...);
+;   request URI          - the request URI with the query string;
+;   content length       - the content length of the request (only with POST);
+;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
+;   script               - the main script called (or '-' if not set);
+;   last request cpu     - the %cpu the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because CPU calculation is done when the request
+;                          processing has terminated;
+;   last request memory  - the max amount of memory the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because memory calculation is done when the request
+;                          processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+;   ************************
+;   pid:                  31330
+;   state:                Running
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          63087
+;   requests:             12808
+;   request duration:     1250261
+;   request method:       GET
+;   request URI:          /test_mem.php?N=10000
+;   content length:       0
+;   user:                 -
+;   script:               /home/fat/web/docs/php/test_mem.php
+;   last request cpu:     0.00
+;   last request memory:  0
+;
+; Note: There is a real-time FPM status monitoring sample web page available
+;       It's available in: /usr/local/share/php/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The address on which to accept FastCGI status request. This creates a new
+; invisible pool that can handle requests independently. This is useful
+; if the main pool is busy with long running requests because it is still possible
+; to get the status before finishing the long running requests.
+;
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Default Value: value of the listen option
+;pm.status_listen = 127.0.0.1:9001
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+;  %%: the '%' character
+;  %C: %CPU used by the request
+;      it can accept the following format:
+;      - %{user}C for user CPU only
+;      - %{system}C for system CPU only
+;      - %{total}C  for user + system CPU (default)
+;  %d: time taken to serve the request
+;      it can accept the following format:
+;      - %{seconds}d (default)
+;      - %{milliseconds}d
+;      - %{milli}d
+;      - %{microseconds}d
+;      - %{micro}d
+;  %e: an environment variable (same as $_ENV or $_SERVER)
+;      it must be associated with embraces to specify the name of the env
+;      variable. Some examples:
+;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+;  %f: script filename
+;  %l: content-length of the request (for POST request only)
+;  %m: request method
+;  %M: peak of memory allocated by PHP
+;      it can accept the following format:
+;      - %{bytes}M (default)
+;      - %{kilobytes}M
+;      - %{kilo}M
+;      - %{megabytes}M
+;      - %{mega}M
+;  %n: pool name
+;  %o: output header
+;      it must be associated with embraces to specify the name of the header:
+;      - %{Content-Type}o
+;      - %{X-Powered-By}o
+;      - %{Transfert-Encoding}o
+;      - ....
+;  %p: PID of the child that serviced the request
+;  %P: PID of the parent of the child that serviced the request
+;  %q: the query string
+;  %Q: the '?' character if query string exists
+;  %r: the request URI (without the query string, see %q and %Q)
+;  %R: remote IP address
+;  %s: status (response code)
+;  %t: server time the request was received
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %T: time the log has been written (the request has finished)
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
+
+; A list of request_uri values which should be filtered from the access log.
+;
+; As a security precuation, this setting will be ignored if:
+;     - the request method is not GET or HEAD; or
+;     - there is a request body; or
+;     - there are query parameters; or
+;     - the response code is outwith the successful range of 200 to 299
+;
+; Note: The paths are matched against the output of the access.format tag "%r".
+;       On common configurations, this may look more like SCRIPT_NAME than the
+;       expected pre-rewrite URI.
+;
+; Default Value: not set
+;access.suppress_path[] = /ping
+;access.suppress_path[] = /health_check.php
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; Depth of slow log stack trace.
+; Default Value: 20
+;request_slowlog_trace_depth = 20
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; The timeout set by 'request_terminate_timeout' ini option is not engaged after
+; application calls 'fastcgi_finish_request' or when application has finished and
+; shutdown functions are being called (registered via register_shutdown_function).
+; This option will enable timeout limit to be applied unconditionally
+; even in such cases.
+; Default Value: no
+;request_terminate_timeout_track_finished = no
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environment, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Decorate worker output with prefix and suffix containing information about
+; the child that writes to the log and if stdout or stderr is used as well as
+; log level and time. This options is used only if catch_workers_output is yes.
+; Settings to "no" will output data as written to the stdout or stderr.
+; Default value: yes
+;decorate_workers_output = no
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; execute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr/local)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+php_flag[display_errors] = off
+php_admin_value[error_log] = /var/log/fpm-php.www.log
+php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M
diff --git a/nginx/php/fpm-php.www.log b/nginx/php/fpm-php.www.log
new file mode 100644
index 0000000..e69de29
diff --git a/test/.idea/.gitignore b/test/.idea/.gitignore
old mode 100644
new mode 100755
diff --git a/test/.idea/modules.xml b/test/.idea/modules.xml
old mode 100644
new mode 100755
diff --git a/test/.idea/php.xml b/test/.idea/php.xml
old mode 100644
new mode 100755
diff --git a/test/.idea/test.iml b/test/.idea/test.iml
old mode 100644
new mode 100755
diff --git a/test/composer.json b/test/composer.json
old mode 100644
new mode 100755
diff --git a/workshop1/.idea/.gitignore b/workshop1/.idea/.gitignore
old mode 100644
new mode 100755
diff --git a/workshop1/.idea/modules.xml b/workshop1/.idea/modules.xml
old mode 100644
new mode 100755
diff --git a/workshop1/.idea/php.xml b/workshop1/.idea/php.xml
old mode 100644
new mode 100755
diff --git a/workshop1/.idea/workshop1.iml b/workshop1/.idea/workshop1.iml
old mode 100644
new mode 100755
diff --git a/workshop1/composer.json b/workshop1/composer.json
old mode 100644
new mode 100755
diff --git a/workshop1/index.php b/workshop1/index.php
old mode 100644
new mode 100755
diff --git a/workshop2/.idea/.gitignore b/workshop2/.idea/.gitignore
old mode 100644
new mode 100755
diff --git a/workshop2/.idea/inspectionProfiles/Project_Default.xml b/workshop2/.idea/inspectionProfiles/Project_Default.xml
old mode 100644
new mode 100755
diff --git a/workshop2/.idea/jsLibraryMappings.xml b/workshop2/.idea/jsLibraryMappings.xml
old mode 100644
new mode 100755
diff --git a/workshop2/.idea/modules.xml b/workshop2/.idea/modules.xml
old mode 100644
new mode 100755
diff --git a/workshop2/.idea/php.xml b/workshop2/.idea/php.xml
old mode 100644
new mode 100755
diff --git a/workshop2/.idea/workshop2.iml b/workshop2/.idea/workshop2.iml
old mode 100644
new mode 100755
diff --git a/workshop2/index.css b/workshop2/index.css
old mode 100644
new mode 100755
diff --git a/workshop2/index.html b/workshop2/index.html
old mode 100644
new mode 100755
index 9e0fd56..aaa9d1f
--- a/workshop2/index.html
+++ b/workshop2/index.html
@@ -1,9 +1,9 @@
+<head>
+    <link rel="stylesheet" href="index.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
+    <title>Passing Data</title>
+</head>
 <body>
-    <head>
-        <link rel="stylesheet" href="index.css">
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-        <title>Passing Data</title>
-    </head>
     <p><strong>Please enter your details below:</strong></p>
     <form name="form1" method="post" action="passingdata.php">
         <div id="main">
diff --git a/workshop2/index.php b/workshop2/index.php
old mode 100644
new mode 100755
diff --git a/workshop2/passingdata.php b/workshop2/passingdata.php
old mode 100644
new mode 100755
diff --git a/workshop3/.idea/vcs.xml b/workshop3/.idea/vcs.xml
deleted file mode 100644
index c2365ab..0000000
--- a/workshop3/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/workshop3/emoji.php b/workshop3/Emoji/index.php
old mode 100644
new mode 100755
similarity index 100%
rename from workshop3/emoji.php
rename to workshop3/Emoji/index.php
diff --git a/workshop3/operators.php b/workshop3/Operators/index.php
old mode 100644
new mode 100755
similarity index 100%
rename from workshop3/operators.php
rename to workshop3/Operators/index.php
diff --git a/workshop3/strings.php b/workshop3/Strings/index.php
old mode 100644
new mode 100755
similarity index 90%
rename from workshop3/strings.php
rename to workshop3/Strings/index.php
index 605115d..473bab8
--- a/workshop3/strings.php
+++ b/workshop3/Strings/index.php
@@ -1,4 +1,4 @@
-<html>
+<html lang="en">
     <head>
         <title>Train Listings</title>
     </head>
@@ -9,7 +9,8 @@
                 <th>Price</th>
             </tr>
             <?php
-            $url = "http://www.classifiedsteam.co.uk/index.php?page=search&sCategory=10";
+            #error_reporting(0);
+            $url = "https://www.classifiedsteam.co.uk/index.php?page=search&sCategory=10";
             $string = file_get_contents($url);
             $dom = new DOMDocument();
             $dom->loadHTML($string);
diff --git a/workshop3/.idea/.gitignore b/workshop4/.idea/.gitignore
old mode 100644
new mode 100755
similarity index 100%
rename from workshop3/.idea/.gitignore
rename to workshop4/.idea/.gitignore
index 13566b8..73f69e0
--- a/workshop3/.idea/.gitignore
+++ b/workshop4/.idea/.gitignore
@@ -1,8 +1,8 @@
 # Default ignored files
 /shelf/
 /workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/MVCtemplate-23-24/.idea/.name b/workshop4/.idea/.name
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/.name
rename to workshop4/.idea/.name
diff --git a/MVCtemplate-23-24/.idea/MVCtemplate.iml b/workshop4/.idea/MVCtemplate.iml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/MVCtemplate.iml
rename to workshop4/.idea/MVCtemplate.iml
diff --git a/MVCtemplate-23-24/.idea/deployment.xml b/workshop4/.idea/deployment.xml
old mode 100644
new mode 100755
similarity index 96%
rename from MVCtemplate-23-24/.idea/deployment.xml
rename to workshop4/.idea/deployment.xml
index 0f51193..f80f8c8
--- a/MVCtemplate-23-24/.idea/deployment.xml
+++ b/workshop4/.idea/deployment.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
-    <serverData>
-      <paths name="workshop1">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
+    <serverData>
+      <paths name="workshop1">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+    </serverData>
+  </component>
 </project>
\ No newline at end of file
diff --git a/MVCtemplate-23-24/.idea/encodings.xml b/workshop4/.idea/encodings.xml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/encodings.xml
rename to workshop4/.idea/encodings.xml
diff --git a/MVCtemplate-23-24/.idea/misc.xml b/workshop4/.idea/misc.xml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/misc.xml
rename to workshop4/.idea/misc.xml
diff --git a/MVCtemplate-23-24/.idea/modules.xml b/workshop4/.idea/modules.xml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/modules.xml
rename to workshop4/.idea/modules.xml
diff --git a/MVCtemplate-23-24/.idea/php.xml b/workshop4/.idea/php.xml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/php.xml
rename to workshop4/.idea/php.xml
diff --git a/MVCtemplate-23-24/.idea/scopes/scope_settings.xml b/workshop4/.idea/scopes/scope_settings.xml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/scopes/scope_settings.xml
rename to workshop4/.idea/scopes/scope_settings.xml
diff --git a/MVCtemplate-23-24/.idea/vcs.xml b/workshop4/.idea/vcs.xml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/.idea/vcs.xml
rename to workshop4/.idea/vcs.xml
diff --git a/workshop4/Models/Converter.php b/workshop4/Models/Converter.php
new file mode 100644
index 0000000..a6a73eb
--- /dev/null
+++ b/workshop4/Models/Converter.php
@@ -0,0 +1,69 @@
+<?php
+class Converter {
+    /*
+     * Class for converting miles to kilometers, and vice versa
+     */
+    var $number = 0, $fromUnit = '', $toUnit = '';
+    /*
+     * Constructor takes number and unit, then assigns
+     * them to corresponding properties
+     * @param int $number Number to be converted
+     * @param string $unit Conversion unit
+     */
+    public function __construct($number = 0, $fromUnit = '', $toUnit = '') {
+        $this->number = $number;
+        $this->toUnit = $toUnit;
+        $this->fromUnit = $fromUnit;
+    }
+    /*
+     * Converts number and returns result
+     * @return string Result of conversion
+     */
+    public function convert(): string {
+        if (is_numeric($this->number)) {
+            $result = $this->number;
+            switch ($this->fromUnit) {
+                case "KM":
+                    switch ($this->toUnit) {
+                        case "KM":
+                            break;
+                        case "Miles":
+                            $result = $this->number * 0.621;
+                            break;
+                        case "Parsec":
+                            $result = $this->number / 30856775812800;
+                            break;
+                    }
+                    break;
+                case "Miles":
+                    switch ($this->toUnit) {
+                        case "KM":
+                            $result = $this->number * 1.609;
+                            break;
+                        case "Miles":
+                            break;
+                        case "Parsec":
+                            $result = $this->number / 19173511575400;
+                            break;
+                    }
+                    break;
+                case "Parsec":
+                    switch ($this->toUnit) {
+                        case "KM":
+                            $result = $this->number * 30856775812800;
+                            break;
+                        case "Miles":
+                            $result = $this->number * 19173511575400;
+                            break;
+                        case "Parsec";
+                            break;
+                    }
+                    break;
+            }
+        }
+        else {
+            $result = false;
+        }
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/workshop4/Views/abouttemplate.phtml b/workshop4/Views/abouttemplate.phtml
new file mode 100755
index 0000000..cdb20d6
--- /dev/null
+++ b/workshop4/Views/abouttemplate.phtml
@@ -0,0 +1,7 @@
+<?php require('template/header.phtml') ?>
+<h3> How this MVC Template works </h3>
+<p>Model-View-Controller (MVC) is an architectural pattern used in software engineering.</p><br>
+<p>This MVC template takes a <i>Controller</i>, which responds to user inputs by gathering data, validating it, and passing to a <i>Model</i></p>
+<p>The Model is typical to the function of a class, taking the inputs and manipulating it for the desired output to the <i>View</i></p>
+<p>The View is what is then rendered to the user to return the results of the Model</p>
+<?php require('template/footer.phtml') ?>
diff --git a/workshop4/Views/converter.phtml b/workshop4/Views/converter.phtml
new file mode 100755
index 0000000..a203a08
--- /dev/null
+++ b/workshop4/Views/converter.phtml
@@ -0,0 +1,47 @@
+<?php require('template/header.phtml') ?>
+<form action="<?php echo $_SERVER['PHP_SELF'] ?>" method="POST">
+    <div class="form-row align-items-center">
+        <div class="col-auto">
+            <label class="visually-hidden" for="convert">Convert</label>
+            <div class="input-group mb-2">
+                <div class="input-group-prepend">
+                    <div class="input-group-text">Convert</div>
+                </div>
+                <input class="form-control" id="convert" placeholder="Convert" type="text" name="number" value="<?php if(isset($_POST['number'])) echo $_POST['number'] ?>"/>
+            </div>
+        </div>
+        <div class="col-auto">
+            <label class="visually-hidden" for="fromUnit">From</label>
+            <div class="input-group mb-2">
+                <div class="input-group-prepend">
+                    <div class="input-group-text">From</div>
+                </div>
+                <select class="form-control" id="fromUnit" name="fromUnit">
+                    <option>KM</option>
+                    <option>Miles</option>
+                    <option>Parsec</option>
+                </select>
+            </div>
+        </div>
+        <div class="col-auto">
+            <label class="visually-hidden" for="toUnit">To</label>
+            <div class="input-group mb-2">
+                <div class="input-group-prepend">
+                    <div class="input-group-text">To</div>
+                </div>
+                <select class="form-control" id="toUnit" name="toUnit">
+                    <option>KM</option>
+                    <option>Miles</option>
+                    <option>Parsec</option>
+                </select>
+            </div>
+        </div>
+        <div class="col-auto">
+            <input class="btn btn-primary" type="submit" value="Submit" name="submit" />
+        </div>
+    </div>
+</form>
+<?php if(isset($view->result)) : ?>
+<p><?php echo $view->result; ?></p>
+<?php endif; ?>
+<?php require('template/footer.phtml') ?>
diff --git a/MVCtemplate-23-24/Views/page1.phtml b/workshop4/Views/page1.phtml
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/Views/page1.phtml
rename to workshop4/Views/page1.phtml
diff --git a/MVCtemplate-23-24/Views/template/footer.phtml b/workshop4/Views/template/footer.phtml
old mode 100644
new mode 100755
similarity index 63%
rename from MVCtemplate-23-24/Views/template/footer.phtml
rename to workshop4/Views/template/footer.phtml
index 8098198..73a9f64
--- a/MVCtemplate-23-24/Views/template/footer.phtml
+++ b/workshop4/Views/template/footer.phtml
@@ -1,15 +1,15 @@
     </main>
 
 
-    <footer class-"row">
-        <div id="footer" class="col-xs-12">
+    <footer class="row">
+        <div id="footer"> <!--class="col-xs-12"-->
             <p>Web-site development using the MVC design pattern and the Bootstrap CSS framework</p>
         </div>
     </footer>
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/workshop4/Views/template/header.phtml b/workshop4/Views/template/header.phtml
new file mode 100755
index 0000000..4e183c8
--- /dev/null
+++ b/workshop4/Views/template/header.phtml
@@ -0,0 +1,52 @@
+<!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">
+
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Bootstrap core CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
+
+    <link href="./css/my-style.css" rel="stylesheet">
+
+    <title>Server-Side Programming - <?php echo $view->pageTitle; ?></title>
+</head>
+
+<body role="document">
+
+<div class="container">
+
+    <div class="row">
+
+        <nav class="navbar navbar-expand-lg navbar-dark bg-dark p-3 border rounded">
+            <a class="navbar-brand" href="#"><img src="images/new_uos_logo.jpg" alt="Salford University" /></a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target='#navbarToggle' aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle Navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+
+            <div class="collapse navbar-collapse" id="navbarToggle">
+                <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
+                    <li class="nav-item <?php if(str_contains($view->pageTitle, 'Home')) echo "active" ?>">
+                        <a class="nav-link" href='index.php'>Home <?php if(str_contains($view->pageTitle, "Home")) echo "<span class='sr-only'>(Current)</span>" ?></a>
+                    </li>
+                    <li class="nav-item <?php if(str_contains($view->pageTitle, "Page1")) echo "active" ?>">
+                        <a class="nav-link" href='page1.php'>Page 1 <?php if(str_contains($view->pageTitle, "Page1")) echo "<span class='sr-only'>(Current)</span>" ?></a>
+                    </li>
+                    <li class="nav-item <?php if(str_contains($view->pageTitle, 'Converter')) echo "active" ?>">
+                        <a class="nav-link" href='converter.php'>Converter <?php if(str_contains($view->pageTitle, "Converter")) echo "<span class='sr-only'>(Current)</span>" ?></a>
+                    </li>
+                    <li class="nav-item <?php if(str_contains($view->pageTitle, 'Abouttemplate')) echo "active" ?>">
+                        <a class="nav-link" href='abouttemplate.php'>About MVC <?php if(str_contains($view->pageTitle, "Abouttemplate")) echo "<span class='sr-only'>(Current)</span>" ?></a>
+                    </li>
+                </ul>
+            </div>
+        </nav>
+
+       <main id="content"> <!--class="col-xs-6 col-sm-9 col-md-10"-->
+
+
+
diff --git a/MVCtemplate-23-24/Views/template/header.phtml b/workshop4/Views/template/oldheader.phtml
old mode 100644
new mode 100755
similarity index 66%
rename from MVCtemplate-23-24/Views/template/header.phtml
rename to workshop4/Views/template/oldheader.phtml
index e59835b..3774d19
--- a/MVCtemplate-23-24/Views/template/header.phtml
+++ b/workshop4/Views/template/oldheader.phtml
@@ -11,17 +11,17 @@
     <!-- Bootstrap core CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
 
-    <link href="/css/my-style.css" rel="stylesheet">
+    <link href="./css/my-style.css" rel="stylesheet">
 
     <title>Server-Side Programming - <?php echo $view->pageTitle; ?></title>
 </head>
 
-<body role=""document">
+<body role="document">
 
 <div class="container">
         <div  class="row">
             <div id="title" class="col-xs-12">
-                <img src="images/new_uos_logo.jpg" alt="Salford University" />
+                <img src="../../images/new_uos_logo.jpg" alt="Salford University" />
                     <div class="pull-right"> <h1><?php echo $view->pageTitle ?> </h1></div>
 
             </div>
@@ -30,11 +30,13 @@
 
     <div class="row">
         <nav id="menu" class="col-xs-6 col-sm-3 col-md-2">
-            <h2>Menu</h2>
-        <ul class="nav flex-column">
-            <li><a href="index.php">Home</a></li>
-            <li><a href="page1.php">Page1</a></li>
-        </ul>
+            <h2 class="pb-2">Menu</h2>
+            <ul class="nav flex-column">
+                <li><a href="./index.php">Home</a></li>
+                <li><a href="./page1.php">Page 1</a></li>
+                <li><a href="./converter.php">Converter</a></li>
+                <li><a href="./abouttemplate.php">About MVC</a></li>
+            </ul>
        </nav>
 
        <main id="content" class="col-xs-6 col-sm-9 col-md-10">
diff --git a/workshop4/abouttemplate.php b/workshop4/abouttemplate.php
new file mode 100755
index 0000000..51b329e
--- /dev/null
+++ b/workshop4/abouttemplate.php
@@ -0,0 +1,5 @@
+<?php
+
+$view = new stdClass();
+$view->pageTitle = 'MVC Template';
+require_once('Views/abouttemplate.phtml');
\ No newline at end of file
diff --git a/workshop4/converter.php b/workshop4/converter.php
new file mode 100755
index 0000000..7b745ae
--- /dev/null
+++ b/workshop4/converter.php
@@ -0,0 +1,18 @@
+<?php
+
+$view = new stdClass();
+$view->pageTitle = 'Converter';
+require_once('Models/Converter.php');
+
+if(isset($_POST['submit'])) {
+    $converter = new Converter($_POST['number'],$_POST['fromUnit'],$_POST['toUnit']);
+    $value = $converter->convert();
+    if (!$value) {
+        $view->value = "Invalid Number";
+    }
+    else {
+        $view->result = $_POST['number'] . ' ' . $_POST['fromUnit'] . ' is ' . $value . ' ' . $_POST['toUnit'] . '.';
+    }
+}
+
+require_once('Views/converter.phtml');
\ No newline at end of file
diff --git a/workshop4/css/my-style.css b/workshop4/css/my-style.css
new file mode 100755
index 0000000..c3784a3
--- /dev/null
+++ b/workshop4/css/my-style.css
@@ -0,0 +1,18 @@
+#title {
+    margin-top: 12px;
+    background-color: #fff;
+    color: #000;
+
+}
+
+#content {
+    background-color: #fff;
+    padding-top: 20px;
+}
+
+#footer {
+    margin-top: 20px;
+    text-align: center;
+    background-color: #000;
+    color: #fff;
+}
diff --git a/MVCtemplate-23-24/fonts/glyphicons-halflings-regular.eot b/workshop4/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/fonts/glyphicons-halflings-regular.eot
rename to workshop4/fonts/glyphicons-halflings-regular.eot
diff --git a/MVCtemplate-23-24/fonts/glyphicons-halflings-regular.svg b/workshop4/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/fonts/glyphicons-halflings-regular.svg
rename to workshop4/fonts/glyphicons-halflings-regular.svg
diff --git a/MVCtemplate-23-24/fonts/glyphicons-halflings-regular.ttf b/workshop4/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/fonts/glyphicons-halflings-regular.ttf
rename to workshop4/fonts/glyphicons-halflings-regular.ttf
diff --git a/MVCtemplate-23-24/fonts/glyphicons-halflings-regular.woff b/workshop4/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/fonts/glyphicons-halflings-regular.woff
rename to workshop4/fonts/glyphicons-halflings-regular.woff
diff --git a/MVCtemplate-23-24/images/new_uos_logo.jpg b/workshop4/images/new_uos_logo.jpg
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/images/new_uos_logo.jpg
rename to workshop4/images/new_uos_logo.jpg
diff --git a/MVCtemplate-23-24/index.php b/workshop4/index.php
old mode 100644
new mode 100755
similarity index 68%
rename from MVCtemplate-23-24/index.php
rename to workshop4/index.php
index 94430b4..b091cf2
--- a/MVCtemplate-23-24/index.php
+++ b/workshop4/index.php
@@ -1,5 +1,5 @@
 <?php
 
 $view = new stdClass();
-$view->pageTitle = 'Homepage';
+$view->pageTitle = 'Home';
 require_once('Views/index.phtml');
diff --git a/MVCtemplate-23-24/js/bootstrap.js b/workshop4/js/bootstrap.js
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/js/bootstrap.js
rename to workshop4/js/bootstrap.js
diff --git a/MVCtemplate-23-24/js/bootstrap.min.js b/workshop4/js/bootstrap.min.js
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/js/bootstrap.min.js
rename to workshop4/js/bootstrap.min.js
diff --git a/MVCtemplate-23-24/page1.php b/workshop4/page1.php
old mode 100644
new mode 100755
similarity index 100%
rename from MVCtemplate-23-24/page1.php
rename to workshop4/page1.php
diff --git a/MVCtemplate-23-24/phpinfo.php b/workshop4/phpinfo.php
old mode 100644
new mode 100755
similarity index 89%
rename from MVCtemplate-23-24/phpinfo.php
rename to workshop4/phpinfo.php
index ab4e0a2..61ace19
--- a/MVCtemplate-23-24/phpinfo.php
+++ b/workshop4/phpinfo.php
@@ -1,2 +1,2 @@
-<?php
-phpinfo();
+<?php
+phpinfo();
diff --git a/workshop5/Models/Calculator.php b/workshop5/Models/Calculator.php
new file mode 100644
index 0000000..b4d44f4
--- /dev/null
+++ b/workshop5/Models/Calculator.php
@@ -0,0 +1,50 @@
+<?php
+class Calculator
+{
+    /*
+     * Class for calculating 2 numbers
+     */
+    var $expression;
+
+    /*
+     * Constructor takes 2 numbers and an operator
+     * @param int $number Number to be converted
+     * @param string $unit Conversion unit
+     */
+    public function __construct($expression = '')
+    {
+        $this->expression = $expression;
+    }
+
+    /*
+     * Calculates number and returns result
+     * @return string Result of calculation
+     */
+    public function calculate(): string
+    {
+        $result = false;
+        $this->expression = preg_replace('/\s+/', '', $this->expression);
+        if(preg_match('/(\d+)([x\*\-\+\/])(\d+)/', $this->expression, $matches)) {
+            $number1 = $matches[1];
+            $operator = $matches[2];
+            $number2 = $matches[3];
+            if (is_numeric($number1) && is_numeric($number2)) {
+                switch ($operator) {
+                    case '+':
+                        $result = ($number1 + $number2);
+                        break;
+                    case '-':
+                        $result = ($number1 - $number2);
+                        break;
+                    case '*':
+                    case 'x':
+                        $result = ($number1 * $number2);
+                        break;
+                    case '/':
+                        $result = ($number1 / $number2);
+                        break;
+                }
+            }
+        } return $result;
+    }
+}
\ No newline at end of file
diff --git a/workshop5/Views/calculator.phtml b/workshop5/Views/calculator.phtml
new file mode 100755
index 0000000..1252561
--- /dev/null
+++ b/workshop5/Views/calculator.phtml
@@ -0,0 +1,20 @@
+<?php require('template/header.phtml') ?>
+<form action="<?php echo $_SERVER['PHP_SELF'] ?>" method="POST">
+    <div class="form-row align-items-center">
+        <div class="col-auto">
+            <label class="visually-hidden" for="exp">Expression</label>
+            <div class="input-group mb-2">
+                <div class="input-group-prepend">
+                    <div class="input-group-text">Exp</div>
+                </div>
+                <input class="form-control" id="exp" placeholder="Expression" type="text" name="expression" value="<?php if(isset($_POST['expression'])) echo $_POST['expression'] ?>"/>
+        </div>
+        <div class="col-auto">
+            <input class="btn btn-primary" type="submit" value="Submit" name="submit" />
+        </div>
+    </div>
+</form>
+<?php if(isset($view->result)) : ?>
+<p><?php echo $view->result; ?></p>
+<?php endif; ?>
+<?php require('template/footer.phtml') ?>
diff --git a/workshop5/Views/template/header.phtml b/workshop5/Views/template/header.phtml
new file mode 100644
index 0000000..de8da9d
--- /dev/null
+++ b/workshop5/Views/template/header.phtml
@@ -0,0 +1,76 @@
+<!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">
+
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Bootstrap core CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
+
+    <link href="/css/my-style.css" rel="stylesheet">
+
+    <title>Server-Side Programming - <?php echo $view->pageTitle; ?></title>
+</head>
+
+
+<body class="d-flex flex-column h-100">
+
+<!--<body role=""document"> -->
+
+
+    <header>
+        <!-- Fixed navbar -->
+        <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+            <div class="container-fluid">
+                <a class="navbar-brand" href="#">Fixed navbar</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse" id="navbarCollapse">
+                    <ul class="navbar-nav me-auto mb-2 mb-md-0">
+                        <li class="nav-item">
+                            <a class="nav-link active" aria-current="page" href="index.php">Home</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="page1.php">Page1</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="calculator.php">Calculator</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link disabled">Disabled</a>
+                        </li>
+                    </ul>
+                    <form class="d-flex" role="search">
+                        <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
+                        <button class="btn btn-outline-success" type="submit">Search</button>
+                    </form>
+                </div>
+            </div>
+        </nav>
+    </header>
+
+
+    <!-- Begin page content -->
+    <main class="flex-shrink-0">
+
+        <div class="container">
+            <div  class="row">
+                <div id="title" class="col-xs-12">
+                    <img src="images/new_uos_logo.jpg" alt="Salford University" />
+                    <h1><?php echo $view->pageTitle ?> </h1>
+
+                    <!-- https://getbootstrap.com/docs/5.2/examples/sticky-footer-navbar/ -->
+
+                </div>
+            </div>
+
+            <div class="row">
+               <section id="content" class="col-xs-6 col-sm-9 col-md-10">
+
+
+
diff --git a/workshop5/calculator.php b/workshop5/calculator.php
new file mode 100755
index 0000000..f354a56
--- /dev/null
+++ b/workshop5/calculator.php
@@ -0,0 +1,18 @@
+<?php
+
+$view = new stdClass();
+$view->pageTitle = 'Calculator';
+require_once('Models/Calculator.php');
+
+if(isset($_POST['submit'])) {
+    $calculator = new Calculator($_POST['expression']);
+    $value = $calculator->calculate();
+    if (!$value) {
+        $view->value = "Invalid Number";
+    }
+    else {
+        $view->result = 'The result is ' . $value;
+    }
+}
+
+require_once('Views/calculator.phtml');
\ No newline at end of file
diff --git a/workshop5/css/my-style.css b/workshop5/css/my-style.css
new file mode 100644
index 0000000..1089759
--- /dev/null
+++ b/workshop5/css/my-style.css
@@ -0,0 +1,30 @@
+main > .container {
+    padding: 60px 15px 0;
+}
+
+
+
+
+
+
+
+#title {
+    margin-top: 12px;
+    background-color: #fff;
+    color: #000;
+
+}
+
+
+#content {
+    background-color: #fff;
+    border-top: solid 6px #f00;
+
+}
+
+#footer {
+    /*margin_top: 20px;
+    text-align: center;
+    background-color: #000;
+    color: #fff; */
+}