diff --git a/sisr1/tp01-02/README.md b/sisr1/tp01-02_dhcp_dns/README.md
similarity index 100%
rename from sisr1/tp01-02/README.md
rename to sisr1/tp01-02_dhcp_dns/README.md
diff --git a/sisr1/tp01-02/TP01_DHCP_routage.odt b/sisr1/tp01-02_dhcp_dns/TP01_DHCP_routage.odt
similarity index 100%
rename from sisr1/tp01-02/TP01_DHCP_routage.odt
rename to sisr1/tp01-02_dhcp_dns/TP01_DHCP_routage.odt
diff --git a/sisr1/tp01-02/TP02_bind.odt b/sisr1/tp01-02_dhcp_dns/TP02_bind.odt
similarity index 100%
rename from sisr1/tp01-02/TP02_bind.odt
rename to sisr1/tp01-02_dhcp_dns/TP02_bind.odt
diff --git a/sisr1/tp01-02/files_dhcp_vm/README.md b/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/README.md
similarity index 100%
rename from sisr1/tp01-02/files_dhcp_vm/README.md
rename to sisr1/tp01-02_dhcp_dns/files_dhcp_vm/README.md
diff --git a/sisr1/tp01-02/files_dhcp_vm/dhcpd.conf b/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/dhcpd.conf
similarity index 100%
rename from sisr1/tp01-02/files_dhcp_vm/dhcpd.conf
rename to sisr1/tp01-02_dhcp_dns/files_dhcp_vm/dhcpd.conf
diff --git a/sisr1/tp01-02/files_dhcp_vm/hosts b/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/hosts
similarity index 100%
rename from sisr1/tp01-02/files_dhcp_vm/hosts
rename to sisr1/tp01-02_dhcp_dns/files_dhcp_vm/hosts
diff --git a/sisr1/tp01-02/files_dhcp_vm/interfaces b/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/interfaces
similarity index 100%
rename from sisr1/tp01-02/files_dhcp_vm/interfaces
rename to sisr1/tp01-02_dhcp_dns/files_dhcp_vm/interfaces
diff --git a/sisr1/tp01-02/files_dhcp_vm/isc-dhcp-server b/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/isc-dhcp-server
similarity index 100%
rename from sisr1/tp01-02/files_dhcp_vm/isc-dhcp-server
rename to sisr1/tp01-02_dhcp_dns/files_dhcp_vm/isc-dhcp-server
diff --git a/sisr1/tp01-02/files_dhcp_vm/nat.sh b/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/nat.sh
similarity index 100%
rename from sisr1/tp01-02/files_dhcp_vm/nat.sh
rename to sisr1/tp01-02_dhcp_dns/files_dhcp_vm/nat.sh
diff --git a/sisr1/tp01-02/files_dns1_vm/README.md b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/README.md
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/README.md
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/README.md
diff --git a/sisr1/tp01-02/files_dns1_vm/db.sio1lab.lan b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/db.sio1lab.lan
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan
diff --git a/sisr1/tp01-02/files_dns1_vm/db.sio1lab.lan.rev b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan.rev
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/db.sio1lab.lan.rev
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan.rev
diff --git a/sisr1/tp01-02/files_dns1_vm/hosts b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/hosts
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/hosts
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/hosts
diff --git a/sisr1/tp01-02/files_dns1_vm/interfaces b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/interfaces
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/interfaces
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/interfaces
diff --git a/sisr1/tp01-02/files_dns1_vm/named.conf.local b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.local
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/named.conf.local
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.local
diff --git a/sisr1/tp01-02/files_dns1_vm/named.conf.options b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.options
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/named.conf.options
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.options
diff --git a/sisr1/tp01-02/files_dns1_vm/resolv.conf b/sisr1/tp01-02_dhcp_dns/files_dns1_vm/resolv.conf
similarity index 100%
rename from sisr1/tp01-02/files_dns1_vm/resolv.conf
rename to sisr1/tp01-02_dhcp_dns/files_dns1_vm/resolv.conf
diff --git a/sisr1/tp01-02/files_dns2_vm/README.md b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/README.md
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/README.md
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/README.md
diff --git a/sisr1/tp01-02/files_dns2_vm/db.sio1lab.lan b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/db.sio1lab.lan
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan
diff --git a/sisr1/tp01-02/files_dns2_vm/db.sio1lab.lan.rev b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan.rev
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/db.sio1lab.lan.rev
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan.rev
diff --git a/sisr1/tp01-02/files_dns2_vm/hosts b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/hosts
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/hosts
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/hosts
diff --git a/sisr1/tp01-02/files_dns2_vm/interfaces b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/interfaces
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/interfaces
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/interfaces
diff --git a/sisr1/tp01-02/files_dns2_vm/named.conf.local b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.local
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/named.conf.local
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.local
diff --git a/sisr1/tp01-02/files_dns2_vm/named.conf.options b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.options
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/named.conf.options
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.options
diff --git a/sisr1/tp01-02/files_dns2_vm/resolv.conf b/sisr1/tp01-02_dhcp_dns/files_dns2_vm/resolv.conf
similarity index 100%
rename from sisr1/tp01-02/files_dns2_vm/resolv.conf
rename to sisr1/tp01-02_dhcp_dns/files_dns2_vm/resolv.conf
diff --git a/sisr1/tp03/README.md b/sisr1/tp03_reseau_prive_creation/README.md
similarity index 100%
rename from sisr1/tp03/README.md
rename to sisr1/tp03_reseau_prive_creation/README.md
diff --git a/sisr1/tp03/TP03_reseau_prive.odt b/sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.odt
similarity index 100%
rename from sisr1/tp03/TP03_reseau_prive.odt
rename to sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.odt
diff --git a/sisr1/tp03/TP03_reseau_prive.pdf b/sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.pdf
similarity index 100%
rename from sisr1/tp03/TP03_reseau_prive.pdf
rename to sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.pdf
diff --git a/sisr1/tp03/files_admin_vm/README.md b/sisr1/tp03_reseau_prive_creation/files_admin_vm/README.md
similarity index 100%
rename from sisr1/tp03/files_admin_vm/README.md
rename to sisr1/tp03_reseau_prive_creation/files_admin_vm/README.md
diff --git a/sisr1/tp03/files_admin_vm/hostname b/sisr1/tp03_reseau_prive_creation/files_admin_vm/hostname
similarity index 100%
rename from sisr1/tp03/files_admin_vm/hostname
rename to sisr1/tp03_reseau_prive_creation/files_admin_vm/hostname
diff --git a/sisr1/tp03/files_admin_vm/hosts b/sisr1/tp03_reseau_prive_creation/files_admin_vm/hosts
similarity index 100%
rename from sisr1/tp03/files_admin_vm/hosts
rename to sisr1/tp03_reseau_prive_creation/files_admin_vm/hosts
diff --git a/sisr1/tp03/files_admin_vm/interfaces b/sisr1/tp03_reseau_prive_creation/files_admin_vm/interfaces
similarity index 100%
rename from sisr1/tp03/files_admin_vm/interfaces
rename to sisr1/tp03_reseau_prive_creation/files_admin_vm/interfaces
diff --git a/sisr1/tp03/files_admin_vm/nat.sh b/sisr1/tp03_reseau_prive_creation/files_admin_vm/nat.sh
similarity index 100%
rename from sisr1/tp03/files_admin_vm/nat.sh
rename to sisr1/tp03_reseau_prive_creation/files_admin_vm/nat.sh
diff --git a/sisr1/tp03/files_admin_vm/resolv.conf b/sisr1/tp03_reseau_prive_creation/files_admin_vm/resolv.conf
similarity index 100%
rename from sisr1/tp03/files_admin_vm/resolv.conf
rename to sisr1/tp03_reseau_prive_creation/files_admin_vm/resolv.conf
diff --git a/sisr1/tp03/files_dns2_vm/README.md b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/README.md
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/README.md
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/README.md
diff --git a/sisr1/tp03/files_dns2_vm/db.monlabo.lan b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/db.monlabo.lan
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan
diff --git a/sisr1/tp03/files_dns2_vm/db.monlabo.lan.rev b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan.rev
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/db.monlabo.lan.rev
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan.rev
diff --git a/sisr1/tp03/files_dns2_vm/hostname b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/hostname
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/hostname
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/hostname
diff --git a/sisr1/tp03/files_dns2_vm/hosts b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/hosts
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/hosts
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/hosts
diff --git a/sisr1/tp03/files_dns2_vm/named.conf b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/named.conf
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf
diff --git a/sisr1/tp03/files_dns2_vm/named.conf.local b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.local
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/named.conf.local
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.local
diff --git a/sisr1/tp03/files_dns2_vm/named.conf.options b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.options
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/named.conf.options
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.options
diff --git a/sisr1/tp03/files_dns2_vm/resolv.conf b/sisr1/tp03_reseau_prive_creation/files_dns2_vm/resolv.conf
similarity index 100%
rename from sisr1/tp03/files_dns2_vm/resolv.conf
rename to sisr1/tp03_reseau_prive_creation/files_dns2_vm/resolv.conf
diff --git a/sisr1/tp03/files_service_vm/README.md b/sisr1/tp03_reseau_prive_creation/files_service_vm/README.md
similarity index 100%
rename from sisr1/tp03/files_service_vm/README.md
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/README.md
diff --git a/sisr1/tp03/files_service_vm/db.monlabo.lan b/sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan
similarity index 100%
rename from sisr1/tp03/files_service_vm/db.monlabo.lan
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan
diff --git a/sisr1/tp03/files_service_vm/db.monlabo.lan.rev b/sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan.rev
similarity index 100%
rename from sisr1/tp03/files_service_vm/db.monlabo.lan.rev
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan.rev
diff --git a/sisr1/tp03/files_service_vm/dhclient.conf b/sisr1/tp03_reseau_prive_creation/files_service_vm/dhclient.conf
similarity index 100%
rename from sisr1/tp03/files_service_vm/dhclient.conf
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/dhclient.conf
diff --git a/sisr1/tp03/files_service_vm/dhcpd.conf b/sisr1/tp03_reseau_prive_creation/files_service_vm/dhcpd.conf
similarity index 100%
rename from sisr1/tp03/files_service_vm/dhcpd.conf
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/dhcpd.conf
diff --git a/sisr1/tp03/files_service_vm/hostname b/sisr1/tp03_reseau_prive_creation/files_service_vm/hostname
similarity index 100%
rename from sisr1/tp03/files_service_vm/hostname
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/hostname
diff --git a/sisr1/tp03/files_service_vm/hosts b/sisr1/tp03_reseau_prive_creation/files_service_vm/hosts
similarity index 100%
rename from sisr1/tp03/files_service_vm/hosts
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/hosts
diff --git a/sisr1/tp03/files_service_vm/interfaces b/sisr1/tp03_reseau_prive_creation/files_service_vm/interfaces
similarity index 100%
rename from sisr1/tp03/files_service_vm/interfaces
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/interfaces
diff --git a/sisr1/tp03/files_service_vm/isc-dhcp-server b/sisr1/tp03_reseau_prive_creation/files_service_vm/isc-dhcp-server
similarity index 100%
rename from sisr1/tp03/files_service_vm/isc-dhcp-server
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/isc-dhcp-server
diff --git a/sisr1/tp03/files_service_vm/named.conf b/sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf
similarity index 100%
rename from sisr1/tp03/files_service_vm/named.conf
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf
diff --git a/sisr1/tp03/files_service_vm/named.conf.local b/sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.local
similarity index 100%
rename from sisr1/tp03/files_service_vm/named.conf.local
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.local
diff --git a/sisr1/tp03/files_service_vm/named.conf.options b/sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.options
similarity index 100%
rename from sisr1/tp03/files_service_vm/named.conf.options
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.options
diff --git a/sisr1/tp03/files_service_vm/resolv.conf b/sisr1/tp03_reseau_prive_creation/files_service_vm/resolv.conf
similarity index 100%
rename from sisr1/tp03/files_service_vm/resolv.conf
rename to sisr1/tp03_reseau_prive_creation/files_service_vm/resolv.conf
diff --git a/sisr1/tp04/README.md b/sisr1/tp04_reseau_prive_administration/README.md
similarity index 100%
rename from sisr1/tp04/README.md
rename to sisr1/tp04_reseau_prive_administration/README.md
diff --git a/sisr1/tp04/auto_nat/README.md b/sisr1/tp04_reseau_prive_administration/auto_nat/README.md
similarity index 100%
rename from sisr1/tp04/auto_nat/README.md
rename to sisr1/tp04_reseau_prive_administration/auto_nat/README.md
diff --git a/sisr1/tp04/auto_nat/nat.service b/sisr1/tp04_reseau_prive_administration/auto_nat/nat.service
similarity index 100%
rename from sisr1/tp04/auto_nat/nat.service
rename to sisr1/tp04_reseau_prive_administration/auto_nat/nat.service
diff --git a/sisr1/tp04/scripts_and_files/README.md b/sisr1/tp04_reseau_prive_administration/scripts_and_files/README.md
similarity index 100%
rename from sisr1/tp04/scripts_and_files/README.md
rename to sisr1/tp04_reseau_prive_administration/scripts_and_files/README.md
diff --git a/sisr1/tp04/scripts_and_files/Users.csv b/sisr1/tp04_reseau_prive_administration/scripts_and_files/Users.csv
similarity index 100%
rename from sisr1/tp04/scripts_and_files/Users.csv
rename to sisr1/tp04_reseau_prive_administration/scripts_and_files/Users.csv
diff --git a/sisr1/tp04/scripts_and_files/createLogins.sh b/sisr1/tp04_reseau_prive_administration/scripts_and_files/createLogins.sh
similarity index 100%
rename from sisr1/tp04/scripts_and_files/createLogins.sh
rename to sisr1/tp04_reseau_prive_administration/scripts_and_files/createLogins.sh
diff --git a/sisr1/tp04/scripts_and_files/createUsers.sh b/sisr1/tp04_reseau_prive_administration/scripts_and_files/createUsers.sh
similarity index 100%
rename from sisr1/tp04/scripts_and_files/createUsers.sh
rename to sisr1/tp04_reseau_prive_administration/scripts_and_files/createUsers.sh
diff --git a/sisr1/tp04/scripts_and_files/logins.csv b/sisr1/tp04_reseau_prive_administration/scripts_and_files/logins.csv
similarity index 100%
rename from sisr1/tp04/scripts_and_files/logins.csv
rename to sisr1/tp04_reseau_prive_administration/scripts_and_files/logins.csv
diff --git a/sisr1/tp04/scripts_and_files/remoteCreation.sh b/sisr1/tp04_reseau_prive_administration/scripts_and_files/remoteCreation.sh
similarity index 100%
rename from sisr1/tp04/scripts_and_files/remoteCreation.sh
rename to sisr1/tp04_reseau_prive_administration/scripts_and_files/remoteCreation.sh
diff --git a/sisr1/tp05/README.md b/sisr1/tp05_samba/README.md
similarity index 100%
rename from sisr1/tp05/README.md
rename to sisr1/tp05_samba/README.md
diff --git a/sisr1/tp05/deployment_samba.sh b/sisr1/tp05_samba/deployment_samba.sh
similarity index 100%
rename from sisr1/tp05/deployment_samba.sh
rename to sisr1/tp05_samba/deployment_samba.sh
diff --git a/sisr1/tp05/smb.conf b/sisr1/tp05_samba/smb.conf
similarity index 100%
rename from sisr1/tp05/smb.conf
rename to sisr1/tp05_samba/smb.conf
diff --git a/sisr1/tp06/README.md b/sisr1/tp06_proxy/README.md
similarity index 100%
rename from sisr1/tp06/README.md
rename to sisr1/tp06_proxy/README.md
diff --git a/sisr1/tp06/files_admin_vm/README.md b/sisr1/tp06_proxy/files_admin_vm/README.md
similarity index 100%
rename from sisr1/tp06/files_admin_vm/README.md
rename to sisr1/tp06_proxy/files_admin_vm/README.md
diff --git a/sisr1/tp06/files_admin_vm/dnsfwd.service b/sisr1/tp06_proxy/files_admin_vm/dnsfwd.service
similarity index 100%
rename from sisr1/tp06/files_admin_vm/dnsfwd.service
rename to sisr1/tp06_proxy/files_admin_vm/dnsfwd.service
diff --git a/sisr1/tp06/files_admin_vm/dnsfwd.sh b/sisr1/tp06_proxy/files_admin_vm/dnsfwd.sh
similarity index 100%
rename from sisr1/tp06/files_admin_vm/dnsfwd.sh
rename to sisr1/tp06_proxy/files_admin_vm/dnsfwd.sh
diff --git a/sisr1/tp06/files_admin_vm/squid_v1.conf b/sisr1/tp06_proxy/files_admin_vm/squid_v1.conf
similarity index 100%
rename from sisr1/tp06/files_admin_vm/squid_v1.conf
rename to sisr1/tp06_proxy/files_admin_vm/squid_v1.conf
diff --git a/sisr1/tp06/files_admin_vm/squid_v2.conf b/sisr1/tp06_proxy/files_admin_vm/squid_v2.conf
similarity index 100%
rename from sisr1/tp06/files_admin_vm/squid_v2.conf
rename to sisr1/tp06_proxy/files_admin_vm/squid_v2.conf
diff --git a/sisr1/tp06/files_admin_vm/squid_v3.conf b/sisr1/tp06_proxy/files_admin_vm/squid_v3.conf
similarity index 100%
rename from sisr1/tp06/files_admin_vm/squid_v3.conf
rename to sisr1/tp06_proxy/files_admin_vm/squid_v3.conf
diff --git a/sisr1/tp06/files_admin_vm/squid_v4.conf b/sisr1/tp06_proxy/files_admin_vm/squid_v4.conf
similarity index 100%
rename from sisr1/tp06/files_admin_vm/squid_v4.conf
rename to sisr1/tp06_proxy/files_admin_vm/squid_v4.conf
diff --git a/sisr1/tp06/files_admin_vm/squid_v5_auth.conf b/sisr1/tp06_proxy/files_admin_vm/squid_v5_auth.conf
similarity index 100%
rename from sisr1/tp06/files_admin_vm/squid_v5_auth.conf
rename to sisr1/tp06_proxy/files_admin_vm/squid_v5_auth.conf
diff --git a/sisr1/tp07/README.md b/sisr1/tp07_firewall/README.md
similarity index 100%
rename from sisr1/tp07/README.md
rename to sisr1/tp07_firewall/README.md
diff --git a/sisr1/tp07/files_firewall_vm/README.md b/sisr1/tp07_firewall/files_firewall_vm/README.md
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/README.md
rename to sisr1/tp07_firewall/files_firewall_vm/README.md
diff --git a/sisr1/tp07/files_firewall_vm/current_ruleset_partie_1.nft b/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_1.nft
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/current_ruleset_partie_1.nft
rename to sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_1.nft
diff --git a/sisr1/tp07/files_firewall_vm/current_ruleset_partie_2.nft b/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_2.nft
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/current_ruleset_partie_2.nft
rename to sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_2.nft
diff --git a/sisr1/tp07/files_firewall_vm/current_ruleset_partie_3.nft b/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_3.nft
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/current_ruleset_partie_3.nft
rename to sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_3.nft
diff --git a/sisr1/tp07/files_firewall_vm/current_ruleset_partie_4.nft b/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_4.nft
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/current_ruleset_partie_4.nft
rename to sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_4.nft
diff --git a/sisr1/tp07/files_firewall_vm/current_ruleset_partie_5.nft b/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_5.nft
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/current_ruleset_partie_5.nft
rename to sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_5.nft
diff --git a/sisr1/tp07/files_firewall_vm/current_ruleset_partie_6.nft b/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_6.nft
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/current_ruleset_partie_6.nft
rename to sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_6.nft
diff --git a/sisr1/tp07/files_firewall_vm/current_ruleset_partie_7.nft b/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_7.nft
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/current_ruleset_partie_7.nft
rename to sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_7.nft
diff --git a/sisr1/tp07/files_firewall_vm/interfaces b/sisr1/tp07_firewall/files_firewall_vm/interfaces
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/interfaces
rename to sisr1/tp07_firewall/files_firewall_vm/interfaces
diff --git a/sisr1/tp07/files_firewall_vm/proxy.conf b/sisr1/tp07_firewall/files_firewall_vm/proxy.conf
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/proxy.conf
rename to sisr1/tp07_firewall/files_firewall_vm/proxy.conf
diff --git a/sisr1/tp07/files_firewall_vm/refresh_firewall.sh b/sisr1/tp07_firewall/files_firewall_vm/refresh_firewall.sh
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/refresh_firewall.sh
rename to sisr1/tp07_firewall/files_firewall_vm/refresh_firewall.sh
diff --git a/sisr1/tp07/files_firewall_vm/resolv.conf b/sisr1/tp07_firewall/files_firewall_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07/files_firewall_vm/resolv.conf
rename to sisr1/tp07_firewall/files_firewall_vm/resolv.conf
diff --git a/sisr1/tp07/files_pclan_vm/README.md b/sisr1/tp07_firewall/files_pclan_vm/README.md
similarity index 100%
rename from sisr1/tp07/files_pclan_vm/README.md
rename to sisr1/tp07_firewall/files_pclan_vm/README.md
diff --git a/sisr1/tp07/files_pclan_vm/interfaces b/sisr1/tp07_firewall/files_pclan_vm/interfaces
similarity index 100%
rename from sisr1/tp07/files_pclan_vm/interfaces
rename to sisr1/tp07_firewall/files_pclan_vm/interfaces
diff --git a/sisr1/tp07/files_pclan_vm/resolv.conf b/sisr1/tp07_firewall/files_pclan_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07/files_pclan_vm/resolv.conf
rename to sisr1/tp07_firewall/files_pclan_vm/resolv.conf
diff --git a/sisr1/tp07/files_pcnet_vm/README.md b/sisr1/tp07_firewall/files_pcnet_vm/README.md
similarity index 100%
rename from sisr1/tp07/files_pcnet_vm/README.md
rename to sisr1/tp07_firewall/files_pcnet_vm/README.md
diff --git a/sisr1/tp07/files_pcnet_vm/interfaces b/sisr1/tp07_firewall/files_pcnet_vm/interfaces
similarity index 100%
rename from sisr1/tp07/files_pcnet_vm/interfaces
rename to sisr1/tp07_firewall/files_pcnet_vm/interfaces
diff --git a/sisr1/tp07/files_pcnet_vm/resolv.conf b/sisr1/tp07_firewall/files_pcnet_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07/files_pcnet_vm/resolv.conf
rename to sisr1/tp07_firewall/files_pcnet_vm/resolv.conf
diff --git a/sisr1/tp07/files_srvweb_vm/README.md b/sisr1/tp07_firewall/files_srvweb_vm/README.md
similarity index 100%
rename from sisr1/tp07/files_srvweb_vm/README.md
rename to sisr1/tp07_firewall/files_srvweb_vm/README.md
diff --git a/sisr1/tp07/files_srvweb_vm/interfaces b/sisr1/tp07_firewall/files_srvweb_vm/interfaces
similarity index 100%
rename from sisr1/tp07/files_srvweb_vm/interfaces
rename to sisr1/tp07_firewall/files_srvweb_vm/interfaces
diff --git a/sisr1/tp07/files_srvweb_vm/resolv.conf b/sisr1/tp07_firewall/files_srvweb_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07/files_srvweb_vm/resolv.conf
rename to sisr1/tp07_firewall/files_srvweb_vm/resolv.conf
diff --git a/sisr1/tp08/README.md b/sisr1/tp08_evolution_infrastructure/README.md
similarity index 100%
rename from sisr1/tp08/README.md
rename to sisr1/tp08_evolution_infrastructure/README.md
diff --git a/sisr1/tp08/rules_original/firewall_compiled.txt b/sisr1/tp08_evolution_infrastructure/rules_original/firewall_compiled.txt
similarity index 100%
rename from sisr1/tp08/rules_original/firewall_compiled.txt
rename to sisr1/tp08_evolution_infrastructure/rules_original/firewall_compiled.txt
diff --git a/sisr1/tp08/rules_progressive/firewall_1-2 b/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_1-2
similarity index 100%
rename from sisr1/tp08/rules_progressive/firewall_1-2
rename to sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_1-2
diff --git a/sisr1/tp08/rules_progressive/firewall_3 b/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_3
similarity index 100%
rename from sisr1/tp08/rules_progressive/firewall_3
rename to sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_3
diff --git a/sisr1/tp08/rules_progressive/firewall_4 b/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_4
similarity index 100%
rename from sisr1/tp08/rules_progressive/firewall_4
rename to sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_4
diff --git a/sisr1/tp08/rules_progressive/firewall_5 b/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_5
similarity index 100%
rename from sisr1/tp08/rules_progressive/firewall_5
rename to sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_5
diff --git a/sisr1/tp08/rules_progressive/firewall_6 b/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_6
similarity index 100%
rename from sisr1/tp08/rules_progressive/firewall_6
rename to sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_6
diff --git a/sisr1/tp08/rules_progressive/firewall_7 b/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_7
similarity index 100%
rename from sisr1/tp08/rules_progressive/firewall_7
rename to sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_7
diff --git a/sisr1/tp08/rules_progressive/firewall_8-9 b/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_8-9
similarity index 100%
rename from sisr1/tp08/rules_progressive/firewall_8-9
rename to sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_8-9