diff --git a/sisr1/README.md b/bts_annee_1/README.md
similarity index 100%
rename from sisr1/README.md
rename to bts_annee_1/README.md
diff --git a/sisr1/tp01-02_dhcp_dns/README.md b/bts_annee_1/tp01-02_dhcp_dns/README.md
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/README.md
rename to bts_annee_1/tp01-02_dhcp_dns/README.md
diff --git a/sisr1/tp01-02_dhcp_dns/TP01_DHCP_routage.odt b/bts_annee_1/tp01-02_dhcp_dns/TP01_DHCP_routage.odt
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/TP01_DHCP_routage.odt
rename to bts_annee_1/tp01-02_dhcp_dns/TP01_DHCP_routage.odt
diff --git a/sisr1/tp01-02_dhcp_dns/TP02_bind.odt b/bts_annee_1/tp01-02_dhcp_dns/TP02_bind.odt
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/TP02_bind.odt
rename to bts_annee_1/tp01-02_dhcp_dns/TP02_bind.odt
diff --git a/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/README.md b/bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/README.md
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dhcp_vm/README.md
rename to bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/README.md
diff --git a/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/dhcpd.conf b/bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/dhcpd.conf
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dhcp_vm/dhcpd.conf
rename to bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/dhcpd.conf
diff --git a/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/hosts b/bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/hosts
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dhcp_vm/hosts
rename to bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/hosts
diff --git a/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/interfaces b/bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/interfaces
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dhcp_vm/interfaces
rename to bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/interfaces
diff --git a/bts_annee_2/sisr2/pxe/DHCP/isc-dhcp-server b/bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/isc-dhcp-server
similarity index 100%
rename from bts_annee_2/sisr2/pxe/DHCP/isc-dhcp-server
rename to bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/isc-dhcp-server
diff --git a/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/nat.sh b/bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/nat.sh
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dhcp_vm/nat.sh
rename to bts_annee_1/tp01-02_dhcp_dns/files_dhcp_vm/nat.sh
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/README.md b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/README.md
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/README.md
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/README.md
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan.rev b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan.rev
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan.rev
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/db.sio1lab.lan.rev
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/hosts b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/hosts
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/hosts
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/hosts
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/interfaces b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/interfaces
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/interfaces
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/interfaces
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.local b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.local
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.local
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.local
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.options b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.options
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.options
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/named.conf.options
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns1_vm/resolv.conf b/bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/resolv.conf
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns1_vm/resolv.conf
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns1_vm/resolv.conf
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/README.md b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/README.md
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/README.md
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/README.md
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan.rev b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan.rev
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan.rev
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/db.sio1lab.lan.rev
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/hosts b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/hosts
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/hosts
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/hosts
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/interfaces b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/interfaces
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/interfaces
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/interfaces
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.local b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.local
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.local
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.local
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.options b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.options
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.options
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/named.conf.options
diff --git a/sisr1/tp01-02_dhcp_dns/files_dns2_vm/resolv.conf b/bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/resolv.conf
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dns2_vm/resolv.conf
rename to bts_annee_1/tp01-02_dhcp_dns/files_dns2_vm/resolv.conf
diff --git a/sisr1/tp03_reseau_prive_creation/README.md b/bts_annee_1/tp03_reseau_prive_creation/README.md
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/README.md
rename to bts_annee_1/tp03_reseau_prive_creation/README.md
diff --git a/sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.odt b/bts_annee_1/tp03_reseau_prive_creation/TP03_reseau_prive.odt
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.odt
rename to bts_annee_1/tp03_reseau_prive_creation/TP03_reseau_prive.odt
diff --git a/sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.pdf b/bts_annee_1/tp03_reseau_prive_creation/TP03_reseau_prive.pdf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/TP03_reseau_prive.pdf
rename to bts_annee_1/tp03_reseau_prive_creation/TP03_reseau_prive.pdf
diff --git a/sisr1/tp03_reseau_prive_creation/files_admin_vm/README.md b/bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/README.md
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_admin_vm/README.md
rename to bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/README.md
diff --git a/sisr1/tp03_reseau_prive_creation/files_admin_vm/hostname b/bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/hostname
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_admin_vm/hostname
rename to bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/hostname
diff --git a/sisr1/tp03_reseau_prive_creation/files_admin_vm/hosts b/bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/hosts
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_admin_vm/hosts
rename to bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/hosts
diff --git a/sisr1/tp03_reseau_prive_creation/files_admin_vm/interfaces b/bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/interfaces
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_admin_vm/interfaces
rename to bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/interfaces
diff --git a/sisr1/tp03_reseau_prive_creation/files_admin_vm/nat.sh b/bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/nat.sh
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_admin_vm/nat.sh
rename to bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/nat.sh
diff --git a/sisr1/tp03_reseau_prive_creation/files_admin_vm/resolv.conf b/bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/resolv.conf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_admin_vm/resolv.conf
rename to bts_annee_1/tp03_reseau_prive_creation/files_admin_vm/resolv.conf
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/README.md b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/README.md
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/README.md
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/README.md
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan.rev b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan.rev
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan.rev
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/db.monlabo.lan.rev
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/hostname b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/hostname
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/hostname
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/hostname
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/hosts b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/hosts
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/hosts
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/hosts
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/named.conf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/named.conf
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.local b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.local
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.local
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.local
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.options b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.options
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.options
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/named.conf.options
diff --git a/sisr1/tp03_reseau_prive_creation/files_dns2_vm/resolv.conf b/bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/resolv.conf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_dns2_vm/resolv.conf
rename to bts_annee_1/tp03_reseau_prive_creation/files_dns2_vm/resolv.conf
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/README.md b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/README.md
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/README.md
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/README.md
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan.rev b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan.rev
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan.rev
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/db.monlabo.lan.rev
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/dhclient.conf b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/dhclient.conf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/dhclient.conf
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/dhclient.conf
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/dhcpd.conf b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/dhcpd.conf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/dhcpd.conf
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/dhcpd.conf
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/hostname b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/hostname
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/hostname
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/hostname
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/hosts b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/hosts
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/hosts
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/hosts
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/interfaces b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/interfaces
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/interfaces
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/interfaces
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/isc-dhcp-server b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/isc-dhcp-server
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/isc-dhcp-server
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/isc-dhcp-server
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/named.conf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/named.conf
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.local b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/named.conf.local
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.local
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/named.conf.local
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.options b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/named.conf.options
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/named.conf.options
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/named.conf.options
diff --git a/sisr1/tp03_reseau_prive_creation/files_service_vm/resolv.conf b/bts_annee_1/tp03_reseau_prive_creation/files_service_vm/resolv.conf
similarity index 100%
rename from sisr1/tp03_reseau_prive_creation/files_service_vm/resolv.conf
rename to bts_annee_1/tp03_reseau_prive_creation/files_service_vm/resolv.conf
diff --git a/sisr1/tp04_reseau_prive_administration/README.md b/bts_annee_1/tp04_reseau_prive_administration/README.md
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/README.md
rename to bts_annee_1/tp04_reseau_prive_administration/README.md
diff --git a/sisr1/tp04_reseau_prive_administration/auto_nat/README.md b/bts_annee_1/tp04_reseau_prive_administration/auto_nat/README.md
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/auto_nat/README.md
rename to bts_annee_1/tp04_reseau_prive_administration/auto_nat/README.md
diff --git a/sisr1/tp04_reseau_prive_administration/auto_nat/nat.service b/bts_annee_1/tp04_reseau_prive_administration/auto_nat/nat.service
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/auto_nat/nat.service
rename to bts_annee_1/tp04_reseau_prive_administration/auto_nat/nat.service
diff --git a/sisr1/tp04_reseau_prive_administration/scripts_and_files/README.md b/bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/README.md
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/scripts_and_files/README.md
rename to bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/README.md
diff --git a/sisr1/tp04_reseau_prive_administration/scripts_and_files/Users.csv b/bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/Users.csv
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/scripts_and_files/Users.csv
rename to bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/Users.csv
diff --git a/sisr1/tp04_reseau_prive_administration/scripts_and_files/createLogins.sh b/bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/createLogins.sh
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/scripts_and_files/createLogins.sh
rename to bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/createLogins.sh
diff --git a/sisr1/tp04_reseau_prive_administration/scripts_and_files/createUsers.sh b/bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/createUsers.sh
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/scripts_and_files/createUsers.sh
rename to bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/createUsers.sh
diff --git a/sisr1/tp04_reseau_prive_administration/scripts_and_files/logins.csv b/bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/logins.csv
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/scripts_and_files/logins.csv
rename to bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/logins.csv
diff --git a/sisr1/tp04_reseau_prive_administration/scripts_and_files/remoteCreation.sh b/bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/remoteCreation.sh
similarity index 100%
rename from sisr1/tp04_reseau_prive_administration/scripts_and_files/remoteCreation.sh
rename to bts_annee_1/tp04_reseau_prive_administration/scripts_and_files/remoteCreation.sh
diff --git a/sisr1/tp05_samba/README.md b/bts_annee_1/tp05_samba/README.md
similarity index 100%
rename from sisr1/tp05_samba/README.md
rename to bts_annee_1/tp05_samba/README.md
diff --git a/sisr1/tp05_samba/deployment_samba.sh b/bts_annee_1/tp05_samba/deployment_samba.sh
similarity index 100%
rename from sisr1/tp05_samba/deployment_samba.sh
rename to bts_annee_1/tp05_samba/deployment_samba.sh
diff --git a/sisr1/tp05_samba/smb.conf b/bts_annee_1/tp05_samba/smb.conf
similarity index 100%
rename from sisr1/tp05_samba/smb.conf
rename to bts_annee_1/tp05_samba/smb.conf
diff --git a/sisr1/tp06_proxy/README.md b/bts_annee_1/tp06_proxy/README.md
similarity index 100%
rename from sisr1/tp06_proxy/README.md
rename to bts_annee_1/tp06_proxy/README.md
diff --git a/sisr1/tp06_proxy/files_admin_vm/README.md b/bts_annee_1/tp06_proxy/files_admin_vm/README.md
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/README.md
rename to bts_annee_1/tp06_proxy/files_admin_vm/README.md
diff --git a/sisr1/tp06_proxy/files_admin_vm/dnsfwd.service b/bts_annee_1/tp06_proxy/files_admin_vm/dnsfwd.service
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/dnsfwd.service
rename to bts_annee_1/tp06_proxy/files_admin_vm/dnsfwd.service
diff --git a/sisr1/tp06_proxy/files_admin_vm/dnsfwd.sh b/bts_annee_1/tp06_proxy/files_admin_vm/dnsfwd.sh
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/dnsfwd.sh
rename to bts_annee_1/tp06_proxy/files_admin_vm/dnsfwd.sh
diff --git a/sisr1/tp06_proxy/files_admin_vm/squid_v1.conf b/bts_annee_1/tp06_proxy/files_admin_vm/squid_v1.conf
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/squid_v1.conf
rename to bts_annee_1/tp06_proxy/files_admin_vm/squid_v1.conf
diff --git a/sisr1/tp06_proxy/files_admin_vm/squid_v2.conf b/bts_annee_1/tp06_proxy/files_admin_vm/squid_v2.conf
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/squid_v2.conf
rename to bts_annee_1/tp06_proxy/files_admin_vm/squid_v2.conf
diff --git a/sisr1/tp06_proxy/files_admin_vm/squid_v3.conf b/bts_annee_1/tp06_proxy/files_admin_vm/squid_v3.conf
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/squid_v3.conf
rename to bts_annee_1/tp06_proxy/files_admin_vm/squid_v3.conf
diff --git a/sisr1/tp06_proxy/files_admin_vm/squid_v4.conf b/bts_annee_1/tp06_proxy/files_admin_vm/squid_v4.conf
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/squid_v4.conf
rename to bts_annee_1/tp06_proxy/files_admin_vm/squid_v4.conf
diff --git a/sisr1/tp06_proxy/files_admin_vm/squid_v5_auth.conf b/bts_annee_1/tp06_proxy/files_admin_vm/squid_v5_auth.conf
similarity index 100%
rename from sisr1/tp06_proxy/files_admin_vm/squid_v5_auth.conf
rename to bts_annee_1/tp06_proxy/files_admin_vm/squid_v5_auth.conf
diff --git a/sisr1/tp07_firewall/README.md b/bts_annee_1/tp07_firewall/README.md
similarity index 100%
rename from sisr1/tp07_firewall/README.md
rename to bts_annee_1/tp07_firewall/README.md
diff --git a/sisr1/tp07_firewall/files_firewall_vm/README.md b/bts_annee_1/tp07_firewall/files_firewall_vm/README.md
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/README.md
rename to bts_annee_1/tp07_firewall/files_firewall_vm/README.md
diff --git a/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_1.nft b/bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_1.nft
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_1.nft
rename to bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_1.nft
diff --git a/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_2.nft b/bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_2.nft
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_2.nft
rename to bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_2.nft
diff --git a/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_3.nft b/bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_3.nft
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_3.nft
rename to bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_3.nft
diff --git a/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_4.nft b/bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_4.nft
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_4.nft
rename to bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_4.nft
diff --git a/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_5.nft b/bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_5.nft
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_5.nft
rename to bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_5.nft
diff --git a/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_6.nft b/bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_6.nft
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_6.nft
rename to bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_6.nft
diff --git a/sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_7.nft b/bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_7.nft
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/current_ruleset_partie_7.nft
rename to bts_annee_1/tp07_firewall/files_firewall_vm/current_ruleset_partie_7.nft
diff --git a/sisr1/tp07_firewall/files_firewall_vm/interfaces b/bts_annee_1/tp07_firewall/files_firewall_vm/interfaces
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/interfaces
rename to bts_annee_1/tp07_firewall/files_firewall_vm/interfaces
diff --git a/sisr1/tp07_firewall/files_firewall_vm/proxy.conf b/bts_annee_1/tp07_firewall/files_firewall_vm/proxy.conf
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/proxy.conf
rename to bts_annee_1/tp07_firewall/files_firewall_vm/proxy.conf
diff --git a/sisr1/tp07_firewall/files_firewall_vm/refresh_firewall.sh b/bts_annee_1/tp07_firewall/files_firewall_vm/refresh_firewall.sh
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/refresh_firewall.sh
rename to bts_annee_1/tp07_firewall/files_firewall_vm/refresh_firewall.sh
diff --git a/sisr1/tp07_firewall/files_firewall_vm/resolv.conf b/bts_annee_1/tp07_firewall/files_firewall_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07_firewall/files_firewall_vm/resolv.conf
rename to bts_annee_1/tp07_firewall/files_firewall_vm/resolv.conf
diff --git a/sisr1/tp07_firewall/files_pclan_vm/README.md b/bts_annee_1/tp07_firewall/files_pclan_vm/README.md
similarity index 100%
rename from sisr1/tp07_firewall/files_pclan_vm/README.md
rename to bts_annee_1/tp07_firewall/files_pclan_vm/README.md
diff --git a/sisr1/tp07_firewall/files_pclan_vm/interfaces b/bts_annee_1/tp07_firewall/files_pclan_vm/interfaces
similarity index 100%
rename from sisr1/tp07_firewall/files_pclan_vm/interfaces
rename to bts_annee_1/tp07_firewall/files_pclan_vm/interfaces
diff --git a/sisr1/tp07_firewall/files_pclan_vm/resolv.conf b/bts_annee_1/tp07_firewall/files_pclan_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07_firewall/files_pclan_vm/resolv.conf
rename to bts_annee_1/tp07_firewall/files_pclan_vm/resolv.conf
diff --git a/sisr1/tp07_firewall/files_pcnet_vm/README.md b/bts_annee_1/tp07_firewall/files_pcnet_vm/README.md
similarity index 100%
rename from sisr1/tp07_firewall/files_pcnet_vm/README.md
rename to bts_annee_1/tp07_firewall/files_pcnet_vm/README.md
diff --git a/sisr1/tp07_firewall/files_pcnet_vm/interfaces b/bts_annee_1/tp07_firewall/files_pcnet_vm/interfaces
similarity index 100%
rename from sisr1/tp07_firewall/files_pcnet_vm/interfaces
rename to bts_annee_1/tp07_firewall/files_pcnet_vm/interfaces
diff --git a/sisr1/tp07_firewall/files_pcnet_vm/resolv.conf b/bts_annee_1/tp07_firewall/files_pcnet_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07_firewall/files_pcnet_vm/resolv.conf
rename to bts_annee_1/tp07_firewall/files_pcnet_vm/resolv.conf
diff --git a/sisr1/tp07_firewall/files_srvweb_vm/README.md b/bts_annee_1/tp07_firewall/files_srvweb_vm/README.md
similarity index 100%
rename from sisr1/tp07_firewall/files_srvweb_vm/README.md
rename to bts_annee_1/tp07_firewall/files_srvweb_vm/README.md
diff --git a/sisr1/tp07_firewall/files_srvweb_vm/interfaces b/bts_annee_1/tp07_firewall/files_srvweb_vm/interfaces
similarity index 100%
rename from sisr1/tp07_firewall/files_srvweb_vm/interfaces
rename to bts_annee_1/tp07_firewall/files_srvweb_vm/interfaces
diff --git a/sisr1/tp07_firewall/files_srvweb_vm/resolv.conf b/bts_annee_1/tp07_firewall/files_srvweb_vm/resolv.conf
similarity index 100%
rename from sisr1/tp07_firewall/files_srvweb_vm/resolv.conf
rename to bts_annee_1/tp07_firewall/files_srvweb_vm/resolv.conf
diff --git a/sisr1/tp08_evolution_infrastructure/README.md b/bts_annee_1/tp08_evolution_infrastructure/README.md
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/README.md
rename to bts_annee_1/tp08_evolution_infrastructure/README.md
diff --git a/sisr1/tp08_evolution_infrastructure/rules_original/README.md b/bts_annee_1/tp08_evolution_infrastructure/rules_original/README.md
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_original/README.md
rename to bts_annee_1/tp08_evolution_infrastructure/rules_original/README.md
diff --git a/sisr1/tp08_evolution_infrastructure/rules_original/firewall_compiled.txt b/bts_annee_1/tp08_evolution_infrastructure/rules_original/firewall_compiled.txt
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_original/firewall_compiled.txt
rename to bts_annee_1/tp08_evolution_infrastructure/rules_original/firewall_compiled.txt
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/README.md b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/README.md
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/README.md
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/README.md
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_1-2 b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_1-2
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_1-2
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_1-2
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_3 b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_3
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_3
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_3
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_4 b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_4
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_4
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_4
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_5 b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_5
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_5
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_5
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_6 b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_6
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_6
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_6
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_7 b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_7
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_7
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_7
diff --git a/sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_8-9 b/bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_8-9
similarity index 100%
rename from sisr1/tp08_evolution_infrastructure/rules_progressive/firewall_8-9
rename to bts_annee_1/tp08_evolution_infrastructure/rules_progressive/firewall_8-9
diff --git a/bts_annee_2/README.md b/bts_annee_2/README.md
index eb24aff..1669325 100644
--- a/bts_annee_2/README.md
+++ b/bts_annee_2/README.md
@@ -1,2 +1,2 @@
 Dépôt de seconde année de BTS.
-Divisé en deux, un côté SISR, un côté Cybersécurité.
+Un répertoire est dédié au côté SISR, un autre est dédié au côté Cybersécurité.
diff --git a/bts_annee_2/cyber2/README.md b/bts_annee_2/cyber2/README.md
index 2872d52..2ac75b1 100644
--- a/bts_annee_2/cyber2/README.md
+++ b/bts_annee_2/cyber2/README.md
@@ -1,2 +1,2 @@
 Dépôt de seconde année de Cybersécurité.
-Chaque dossier porte le numéro de la séance associée.
+Chaque dossier porte un nom descriptif, qu'on peut relier à une ou plusieurs séances.
diff --git a/bts_annee_2/sisr2/README.md b/bts_annee_2/sisr2/README.md
index 6a1fcbd..100b720 100644
--- a/bts_annee_2/sisr2/README.md
+++ b/bts_annee_2/sisr2/README.md
@@ -1,2 +1,2 @@
 Dépôt de seconde année de SISR.
-Chaque dossier porte le nom du sujet associé.
+Chaque dossier porte un nom descriptif, qu'on peut relier à une ou plusieurs séances.
\ No newline at end of file
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/README.md b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/README.md
new file mode 100644
index 0000000..ad486bb
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/README.md
@@ -0,0 +1,16 @@
+# Ansible
+Dans ce répertoire se situent les *playbooks* Ansible.
+
+## Dossier Wireguard : 
+Dans le dossier se trouvent le *playbook* ainsi que les fichiers de configuration.
+
+## Playbook de déploiement des **ap31-prod** et **ap31-test** : 
+
+### apbase.yml :
+Ce *playbook* se charge de mettre à jour les paquets, configurer APT pour passer par le proxy, définit une *timezone* correcte, et se charge d'installer les paquets sur les deux machines.
+
+### apdb.yml :
+Ce *playbook* se charge d'installer un module crucial sur la machine **ap31-test**, puis créé une base de données vide, un utilisateur avec l'accès total sur la BDD, puis importe le fichier .sql de base pour rendre la BDD utilisable.
+
+### apdbdump.yml :
+Ce *playbook* se charge de créer un dump de la BDD avant de l'envoyer sur la machine qui exécute le *playbook* Ansible.
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apbase.yml b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apbase.yml
new file mode 100644
index 0000000..5c70e8b
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apbase.yml
@@ -0,0 +1,34 @@
+---
+#- name: Install prod/test
+- hosts: all
+  become: true
+
+  tasks:
+  - name: Parametrage Timezone Europe/Paris
+    community.general.timezone:
+      name: Europe/Paris
+
+  - name: Copie apt.conf
+    copy:
+      content: |
+        Acquire::http::Proxy "http://10.121.38.1:8080/";
+        Acquire::https::Proxy "http://10.121.38.1:8080/";        
+      dest: /etc/apt/apt.conf
+
+  - name: Update and upgrade apt packages
+    apt:
+      upgrade: yes
+      update_cache: yes
+      cache_valid_time: 86400 #One day
+
+
+  - name: Installation paquets
+    apt:
+      name: "{{ item }}"
+      state: present
+    with_items:
+       - tomcat10
+       - mariadb-server
+       - ant
+       - qemu-guest-agent
+    
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apdb.yml b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apdb.yml
new file mode 100644
index 0000000..fdb4633
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apdb.yml
@@ -0,0 +1,47 @@
+# apdb.yml
+---
+- hosts: all
+  become: true
+  tasks:
+    - name: 1. Installe une des dépendances d'une extension Ansible.
+      apt:
+        name: python3-pymysql
+        state: present
+
+    - name: 2. Créé la base de données vide.
+      community.mysql.mysql_db:
+        check_implicit_admin: true
+        name: sdis29
+        state: present
+        login_unix_socket: /run/mysqld/mysqld.sock
+
+    - name: 3. Créé l'utilisateur pour la BDD.
+      community.mysql.mysql_user:
+        name: reseau
+        password: Ilona21?
+        priv: 'sdis29.*:ALL,GRANT'
+        state: present
+        login_unix_socket: /run/mysqld/mysqld.sock
+
+    - name: 4. Vérifie si un répertoire db existe.
+      stat:
+        path: /home/debian/db
+      register: rept_stat
+
+    - name: 5. Créé le répertoire db pour le fichier sql.
+      command: mkdir /home/debian/db
+      when: rept_stat.stat.exists == false
+
+    - name: 6. Copie le fichier d'import de la base de données
+      template:
+        src: db/sdis29.sql
+        dest: /home/debian/db/sdis29.sql
+
+    - name: 7. Import de la base de données.
+      run_once: true
+      community.mysql.mysql_db:
+        state: import
+        name: all
+        encoding: utf8
+        target: db/sdis29.sql
+        login_unix_socket: /run/mysqld/mysqld.sock
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apdbdump.yml b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apdbdump.yml
new file mode 100644
index 0000000..298eb6d
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/apdbdump.yml
@@ -0,0 +1,17 @@
+# apbddump.yml
+---
+- hosts: all
+  become: true
+  tasks:
+    - name: 1. Exécute le dump de la BDD.
+      community.mysql.mysql_db:
+        check_implicit_admin: true
+        state: dump
+        name: sdis29
+        target: /home/debian/db/sdis29-backup.sql.gz
+        login_unix_socket: /run/mysqld/mysqld.sock
+
+    - name: 2. Envoie le dump sur la machine Ansible.
+      ansible.builtin.fetch:
+        src: /home/debian/db/sdis29-backup.sql.gz
+        dest: /home/debian/
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/hosts b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/hosts
new file mode 100644
index 0000000..fc3fe0d
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_bdd/hosts
@@ -0,0 +1,2 @@
+[pt]
+ap31-pt
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/README.md b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/README.md
new file mode 100644
index 0000000..f353e35
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/README.md
@@ -0,0 +1,7 @@
+# Ansible pour Wireguard
+
+## Description du playbook : 
+
+Ce *playbook* se charge d'installer les outils Wireguard et le paquet Wireguard sur chacune des machines, avant de copier le script pour générer les fichiers de configuration sur la machine **ap31-mon**, puis exécute le script, avant de récupérer chacun des trois fichiers de configuration pour les copier sur **ap31-ans**.
+
+Ensuite, le *playbook* se charge de copier les fichiers de configuration à chaque machine de manière individuelle sans possibilité d'erreur, avant d'activer le service Wireguard au démarrage, et de le relancer. 
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-mon.conf b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-mon.conf
new file mode 100644
index 0000000..6761a44
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-mon.conf
@@ -0,0 +1,17 @@
+# local settings for ap31-mon
+[Interface]
+PrivateKey = qNrA3qizZyJ7iPfXQepwA6/g5kkabijifGUW61OO4G4=
+Address = 10.0.0.1/32
+ListenPort = 51820
+
+# remote settings for ap31-prod
+[Peer]
+PublicKey = mnWYL52q8bzvvary6s81ROHV1hohu3nlQN0YQkTZTzg=
+Endpoint = 172.16.0.100:51820
+AllowedIPs = 10.0.0.2/32
+
+# remote settings for ap31-test
+[Peer]
+PublicKey= Amfx3tgY9WyjhVH8gQJWZpbQVNYwpIt3OFZokMqq43M=
+Endpoint = 172.16.0.101:51820
+AllowedIPs = 10.0.0.3/32
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-prod.conf b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-prod.conf
new file mode 100644
index 0000000..2c80d85
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-prod.conf
@@ -0,0 +1,11 @@
+# local settings for ap31-prod
+[Interface]
+PrivateKey = ENtiBbOg56P0DQJhoYe61mNLF06Vtv601rbAAvyKz2M=
+Address = 10.0.0.2/32
+ListenPort = 51820
+
+# remote settings for ap31-mon
+[Peer]
+PublicKey = LEkM9UVt21zq7PS8sX+SBihuXr5k9bjAbwSN0dChmAk=
+Endpoint = 172.16.0.102:51820
+AllowedIPs = 10.0.0.1/32
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-test.conf b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-test.conf
new file mode 100644
index 0000000..75767dd
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/config_files/wg0-test.conf
@@ -0,0 +1,11 @@
+# local settings for ap31-test
+[Interface]
+PrivateKey = 6Hq3I9MdSB/O8xiXxf1ekysWR2GQgYBss9VNDngbZE4=
+Address = 10.0.0.3/32
+ListenPort = 51820
+
+# remote settings for ap31-mon
+[Peer]
+PublicKey = LEkM9UVt21zq7PS8sX+SBihuXr5k9bjAbwSN0dChmAk=
+Endpoint = 172.16.0.102:51820
+AllowedIPs = 10.0.0.1/32
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/hosts b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/hosts
new file mode 100644
index 0000000..d7b10a9
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/hosts
@@ -0,0 +1,6 @@
+[wg]
+ap31-prod
+ap31-test
+ap31-mon
+[wg_srv]
+ap31-mon
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/mkwgconf-p2p.sh b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/mkwgconf-p2p.sh
new file mode 100644
index 0000000..b72af12
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/mkwgconf-p2p.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+set -u
+set -e
+
+AddressAwg=10.0.0.1/32  # Adresse VPN Wireguard MON
+EndpointA=172.16.0.102  # Adresse extremite MON
+PortA=51820             # Port ecoute extremite MON
+AddressBwg=10.0.0.2/32  # Adresse VPN Wireguard PROD
+EndpointB=172.16.0.100  # Adresse extremite PROD
+PortB=51820             # Port ecoute extremite PROD
+AddressCwg=10.0.0.3/32	# Adresse VPN Wireguard TEST
+EndpointC=172.16.0.101	# Adresse extremite TEST
+PortC=51820		# Port ecoute extremite TEST
+
+umask 077 ;  
+wg genkey > endpoint-a.key
+wg pubkey < endpoint-a.key > endpoint-a.pub
+
+wg genkey > endpoint-b.key
+wg pubkey < endpoint-b.key > endpoint-b.pub
+
+wg genkey > endpoint-c.key
+wg pubkey < endpoint-c.key > endpoint-c.pub
+
+PKA=$(cat endpoint-a.key)
+pKA=$(cat endpoint-a.pub)
+PKB=$(cat endpoint-b.key)
+pKB=$(cat endpoint-b.pub)
+PKC=$(cat endpoint-c.key)
+pKC=$(cat endpoint-c.pub)
+
+cat <<FINI > wg0-mon.conf
+# local settings for ap31-mon
+[Interface]
+PrivateKey = $PKA
+Address = $AddressAwg
+ListenPort = $PortA
+
+# remote settings for ap31-prod
+[Peer]
+PublicKey = $pKB
+Endpoint = ${EndpointB}:$PortB
+AllowedIPs = $AddressBwg
+
+# remote settings for ap31-test
+[Peer]
+PublicKey= $pKC
+Endpoint = ${EndpointC}:$PortC
+AllowedIPs = $AddressCwg
+FINI
+
+
+cat <<FINI > wg0-prod.conf
+# local settings for ap31-prod
+[Interface]
+PrivateKey = $PKB
+Address = $AddressBwg
+ListenPort = $PortB
+
+# remote settings for ap31-mon
+[Peer]
+PublicKey = $pKA
+Endpoint = ${EndpointA}:$PortA
+AllowedIPs = $AddressAwg
+FINI
+
+
+cat <<FINI > wg0-test.conf
+# local settings for ap31-test
+[Interface]
+PrivateKey = $PKC
+Address = $AddressCwg
+ListenPort = $PortC
+
+# remote settings for ap31-mon
+[Peer]
+PublicKey = $pKA
+Endpoint = ${EndpointA}:$PortA
+AllowedIPs = $AddressAwg
+FINI
diff --git a/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/wg.yml b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/wg.yml
new file mode 100644
index 0000000..38cbb31
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/ansible_wireguard/wg.yml
@@ -0,0 +1,74 @@
+# wg.yml
+---
+- hosts: wg
+  become: true
+  tasks:
+    - name: 1. Installe le paquet Wireguard.
+      apt: 
+        name: wireguard
+        state: present
+
+    - name: 2. Installe les outils Wireguard.
+      apt:
+        name: wireguard-tools
+        state: present
+
+- hosts: wg_srv
+  become: true
+  tasks:
+    - name: 3. Envoie le script Wireguard.
+      copy:
+        src: mkwgconf-p2p.sh
+        dest: mkwgconf-p2p.sh
+
+    - name: 4. Exécute le script Wireguard.
+      command: bash mkwgconf-p2p.sh
+
+    - name: 5. Copie le fichier de configuration Wireguard C sur cette machine.
+      ansible.builtin.fetch:
+        src: wg0-mon.conf
+        dest: wg0-mon.conf
+        flat: yes
+    
+    - name: 6. Récupère le fichier de conf A.
+      ansible.builtin.fetch:
+        src: wg0-prod.conf
+        dest: wg0-prod.conf
+        flat: yes
+
+    - name: 7. Récupère le fichier de conf B.
+      ansible.builtin.fetch:
+        src: wg0-test.conf
+        dest: wg0-test.conf
+        flat: yes
+
+- hosts: wg
+  become: true
+  tasks:
+    - name: 8. Envoie le fichier de conf A vers la machine prod.
+      copy:
+        src: wg0-prod.conf
+        dest: /etc/wireguard/wg0.conf
+      when: ansible_hostname == "ap31-prod"
+
+    - name: 9. Envoie le fichier de conf B vers la machine test.
+      copy:
+        src: wg0-test.conf
+        dest: /etc/wireguard/wg0.conf
+      when: ansible_hostname == "ap31-test"
+
+    - name: 10. Envoie le fichier de conf C vers la machine mon.
+      copy:
+        src: wg0-mon.conf
+        dest: /etc/wireguard/wg0.conf
+      when: ansible_hostname == "ap31-mon"
+
+    - name: 11. Active le service Wireguard.
+      ansible.builtin.service:
+        service: wg-quick@wg0.service
+        enabled: true
+
+    - name: 12. Lance le service Wireguard.
+      ansible.builtin.service:
+        service: wg-quick@wg0.service
+        state: restarted
diff --git a/bts_annee_2/sisr2/ap_sdis29/documentation/README.md b/bts_annee_2/sisr2/ap_sdis29/documentation/README.md
new file mode 100644
index 0000000..fd0cb2e
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/documentation/README.md
@@ -0,0 +1,2 @@
+Ce fichier README_docu.md contient la documentation complète du projet excepté les parties sur Ansible, avec la syntaxe Markdown.
+Pour les fichiers de documentation, allez dans les répertoires Ansible de ce projet.
\ No newline at end of file
diff --git a/bts_annee_2/sisr2/ap_sdis29/documentation/README_docu.md b/bts_annee_2/sisr2/ap_sdis29/documentation/README_docu.md
new file mode 100644
index 0000000..737962a
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/documentation/README_docu.md
@@ -0,0 +1,58 @@
+# sdis29-1
+## Dépôt Git des programmes sources - SDIS 29.
+
+Version: v.0.0.2b-ge
+
+### Création initiale des serveurs :
+
+  * Création des serveurs **ap31-prod** et **ap31-test** via un clone intégral d'une template sur pxlab1.
+  * Disques redimensionnés de 2Go a 10Go.
+  * Définition des IPs et ajout des clés SSH dans les machines.
+  * Création du serveur **ap31-mon** via un clone intégral d'une template.
+  * Définition de l'IP et ajout des clés SSH.
+  * Disque redimensionné de 2G à 10Go.
+  * Doublement de la RAM sur **ap31-mon**. (1024Mo --> 2048Mo)
+  * Machines définies sur la *timezone* Europe/Paris (UTC +1)
+
+### Installation des paquets :
+
+  * Ajout du fichier `/etc/apt/apt.conf` récupéré depuis depl, pour pouvoir passer à travers le proxy.
+  * Commande `apt update` effectuée sur chaque machine.
+  * **ap31-prod** : mariadb-server, tomcat10, zabbix-agent2, qemu-guest-agent, wget, goss
+  * **ap31-test** : mariadb-server, tomcat10, phpmyadmin, zabbix-agent2, qemu-guest-agent, wget, goss, git
+  * **ap31-mon**  : apache2, mariadb-server, zabbix-server-mysql, zabbix-frontend-php, zabbix-apache-conf, zabbix-sql-scripts, zabbix-agent, journald-remote
+  * Ajout de goss sur **ap31-test** et **ap31-prod**, et création de fichiers de test fonctionnels pour les deux machines.
+
+### Configuration de Zabbix :
+
+  * Pour **ap31-mon**, installation de Zabbix avec un script, et configuration initiale de Zabbix via l'interface web.
+  * Pour **ap31-prod** et **ap31-test**, modification des fichiers `/etc/zabbix/zabbix_agent2.conf` pour ajouter l'IP du serveur Zabbix et le *hostname* avec un script.
+  * Une fois fait, ajout de **ap31-prod** et **ap31-test** dans Zabbix sur le *template* `Linux by Zabbix agent`.
+  * Une fois les serveurs ajoutés avec une interface de détection de type `agent` sur l'IP de la machine correspondante, détection sur Zabbix et la supervision est complétée.
+  * Ajout de la passerelle **gwsio3** avec une *template* `ICMP Ping` sur une interface SNMP avec l'IP de la passerelle, et supervision des temps de réponse et du status possible.
+
+### Centralisation de la gestion des logs :
+
+  * Installation du paquet `systemd-journal-remote` sur chaque serveur.
+  * **ap31-mon** : utilisation d'un script journald-rcv.sh configuré du côté récepteur.
+  * **ap31-test, ap31-prod** : utilisation d'un script `journald-snd.sh` configuré du côté émetteur.
+
+### Importation de la base de données : 
+
+  * Création d'un utilisateur `reseau` pour modifier la BDD sans utiliser le compte root si nécessaire.  
+  * Import du fichier `sdis29.sql` sur MariaDB sur la machine **ap31-test**.
+  * Une fois fait, base de données disponible sur la machine et visible sur phpmyadmin une fois les privilèges requis donnés au compte.
+
+### Création de playbooks Ansible pour **ap31-prod** et **ap31-test** : 
+
+  * Création du *playbook* `apbase.yml` qui prépare les machines **ap31-prod** et **ap31-test** en installant les paquets nécessaires, en configurant le proxy pour *APT*, et en définissant la *timezone*.
+  * Création du *playbook* `apdb.yml` qui installe les dépendances utilisées dans le *playbook*, puis se charge de créer la BDD, un utilisateur, et qui peut être exécuté plusieurs fois sans soucis.
+  * Exécution des deux *playbooks* et résultats corrects, sans erreurs. Les *playbooks* `apbase.yml` et `apdb.yml` sont terminés.
+  * Création du *playbook* `apdbdump.yml` qui récupère le dump de la BDD une fois celui-ci créé.
+  * Exécution du *playbook* et résultats corrects, sans erreurs. Le *playbook* est terminé.
+
+### Établissement d'un tunnel VPN entre les machines **ap31-mon**, **ap31-prod** et **ap31-test** :
+
+  * Création d'un *playbook* `wg.yml` qui se charge d'installer Wireguard et ses outils sur les trois machines, puis qui exécute un script modifié pour générer les clés et les fichiers de configuration, avant de les mettre au bon endroit.
+  * Une fois cela fait, et le tunnel fonctionnel, la centralisation des logs peut se faire via le tunnel Wireguard. Les IPs des fichiers de configuration sont donc modifiées pour fonctionner.
+  * Pour plus de détails, se rendre dans le dossier `ansible`, puis le répertoire `wireguard`.
diff --git a/bts_annee_2/sisr2/ap_sdis29/scripts_logs/README.md b/bts_annee_2/sisr2/ap_sdis29/scripts_logs/README.md
new file mode 100644
index 0000000..b3d9c8b
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/scripts_logs/README.md
@@ -0,0 +1,2 @@
+Ce dossier contient les scripts utilisés pour configurer les envois et la réception de logs.
+Le script `snd` est à exécuter sur les machines qui envoient, et le fichier `rcv` est à exécuter sur la machine réceptrice.
\ No newline at end of file
diff --git a/bts_annee_2/sisr2/ap_sdis29/scripts_logs/journald-rcv.sh b/bts_annee_2/sisr2/ap_sdis29/scripts_logs/journald-rcv.sh
new file mode 100644
index 0000000..6f4c5d5
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/scripts_logs/journald-rcv.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+sudo timedatectl set-timezone Europe/Paris
+sudo apt-get update
+sudo apt-get install -y systemd-journal-remote
+sudo systemctl enable --now systemd-journal-remote.socket
+sudo cp /lib/systemd/system/systemd-journal-remote.service /etc/systemd/system
+sudo sed -i 's/--listen-https=-3/--listen-http=-3/' /etc/systemd/system/systemd-journal-remote.service
+[[ -d /var/log/journal/remote ]] || sudo mkdir /var/log/journal/remote
+sudo chown systemd-journal-remote /var/log/journal/remote
+sudo systemctl daemon-reload
+sudo systemctl restart systemd-journal-remote
\ No newline at end of file
diff --git a/bts_annee_2/sisr2/ap_sdis29/scripts_logs/journald-snd.sh b/bts_annee_2/sisr2/ap_sdis29/scripts_logs/journald-snd.sh
new file mode 100644
index 0000000..d436b2b
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/scripts_logs/journald-snd.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+sudo timedatectl set-timezone Europe/Paris
+sudo apt-get update
+sudo apt-get install -y systemd-journal-remote
+rpl="s/^# URL=/URL=http:\/\/ap31-mon:19532/"
+sudo sed -i "$rpl" /etc/systemd/journal-upload.conf
+sudo systemctl enable --now systemd-journal-upload.service
+sudo systemctl restart systemd-journal-upload.service
diff --git a/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/README.md b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/README.md
new file mode 100644
index 0000000..ff15310
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/README.md
@@ -0,0 +1,2 @@
+Ces scripts permettent de paramétrer Zabbix initialement. Pour les détails, il faut aller lire le `README_docu.md` dans le répertoire de documentation.
+Chaque script est associé de nom aux machines utilisées dans l'atelier, ou à défaut, un nom générique descriptif.
\ No newline at end of file
diff --git a/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-client-prod.sh b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-client-prod.sh
new file mode 100644
index 0000000..8f3d0d8
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-client-prod.sh
@@ -0,0 +1,8 @@
+apt install -y wget curl   
+wget https://repo.zabbix.com/zabbix/7.0/debian/pool/main/z/zabbix-release/zabbix-release_7.0-2+debian12_all.deb
+dpkg -i zabbix-release_7.0-2+debian12_all.deb
+apt install -y zabbix-agent2
+echo "Server=172.16.0.102" >> /etc/zabbix/zabbix_agent2.conf
+echo "ServerActive=172.16.0.102" >> /etc/zabbix/zabbix_agent2.conf
+echo "Hostname=ap31-prod" >> /etc/zabbix/zabbix_agent2.conf
+systemctl restart zabbix-agent2
diff --git a/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-client-test.sh b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-client-test.sh
new file mode 100644
index 0000000..9e05719
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-client-test.sh
@@ -0,0 +1,8 @@
+apt install -y wget curl   
+wget https://repo.zabbix.com/zabbix/7.0/debian/pool/main/z/zabbix-release/zabbix-release_7.0-2+debian12_all.deb
+dpkg -i zabbix-release_7.0-2+debian12_all.deb
+apt install -y zabbix-agent2
+echo "Server=172.16.0.102" >> /etc/zabbix/zabbix_agent2.conf
+echo "ServerActive=172.16.0.102" >> /etc/zabbix/zabbix_agent2.conf
+echo "Hostname=ap31-test" >> /etc/zabbix/zabbix_agent2.conf
+systemctl restart zabbix-agent2
diff --git a/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-server.sh b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-server.sh
new file mode 100644
index 0000000..45177e1
--- /dev/null
+++ b/bts_annee_2/sisr2/ap_sdis29/scripts_zabbix/zabbix-install-server.sh
@@ -0,0 +1,17 @@
+export http_proxy="http://10.121.38.1:8080/"
+export https_proxy="http://10.121.38.1:8080/"
+wget https://repo.zabbix.com/zabbix/7.0/debian/pool/main/z/zabbix-release/zabbix-release_7.0-2+debian12_all.deb
+dpkg -i zabbix-release_7.0-2+debian12_all.deb
+apt-get install -y apache2 mariadb-server
+apt-get  install -y zabbix-server-mysql zabbix-frontend-php zabbix-apache-conf zabbix-sql-scripts zabbix-agent
+echo 'create database zabbix character set utf8mb4 collate utf8mb4_bin;' | mysql -u root
+echo "create user zabbix@localhost identified by 'password';" | mysql -u root 
+echo 'grant all privileges on zabbix.* to zabbix@localhost;' | mysql -u root 
+echo 'set global log_bin_trust_function_creators = 1;' | mysql -u root 
+zcat /usr/share/zabbix-sql-scripts/mysql/server.sql.gz | mysql --default-character-set=utf8mb4 -u zabbix -ppassword zabbix
+echo 'set global log_bin_trust_function_creators = 0;' | mysql -u root 
+sed -i 's/# DBPassword=/DBPassword=password/' /etc/zabbix/zabbix_server.conf
+systemctl restart zabbix-server zabbix-agent apache2
+systemctl enable zabbix-server zabbix-agent apache2
+localectl set-locale LANG=en_US.UTF-8
+systemctl restart zabbix-server zabbix-agent apache2
diff --git a/bts_annee_2/sisr2/heartbeat_repa_charge/README.md b/bts_annee_2/sisr2/heartbeat_repartition_charge/README.md
similarity index 100%
rename from bts_annee_2/sisr2/heartbeat_repa_charge/README.md
rename to bts_annee_2/sisr2/heartbeat_repartition_charge/README.md
diff --git a/bts_annee_2/sisr2/heartbeat_repa_charge/hb1/inst-hb1.sh b/bts_annee_2/sisr2/heartbeat_repartition_charge/hb1/inst-hb1.sh
similarity index 100%
rename from bts_annee_2/sisr2/heartbeat_repa_charge/hb1/inst-hb1.sh
rename to bts_annee_2/sisr2/heartbeat_repartition_charge/hb1/inst-hb1.sh
diff --git a/bts_annee_2/sisr2/heartbeat_repa_charge/hb2/inst-hb2.sh b/bts_annee_2/sisr2/heartbeat_repartition_charge/hb2/inst-hb2.sh
similarity index 100%
rename from bts_annee_2/sisr2/heartbeat_repa_charge/hb2/inst-hb2.sh
rename to bts_annee_2/sisr2/heartbeat_repartition_charge/hb2/inst-hb2.sh
diff --git a/bts_annee_2/sisr2/heartbeat_repa_charge/vagrant/Vagrantfile_bookworm b/bts_annee_2/sisr2/heartbeat_repartition_charge/vagrant/Vagrantfile_bookworm
similarity index 100%
rename from bts_annee_2/sisr2/heartbeat_repa_charge/vagrant/Vagrantfile_bookworm
rename to bts_annee_2/sisr2/heartbeat_repartition_charge/vagrant/Vagrantfile_bookworm
diff --git a/bts_annee_2/sisr2/heartbeat_repa_charge/vagrant/Vagrantfile_rsync b/bts_annee_2/sisr2/heartbeat_repartition_charge/vagrant/Vagrantfile_rsync
similarity index 100%
rename from bts_annee_2/sisr2/heartbeat_repa_charge/vagrant/Vagrantfile_rsync
rename to bts_annee_2/sisr2/heartbeat_repartition_charge/vagrant/Vagrantfile_rsync
diff --git a/bts_annee_2/sisr2/pxe/DHCP/README.md b/bts_annee_2/sisr2/intel_pxe_boot/DHCP/README.md
similarity index 100%
rename from bts_annee_2/sisr2/pxe/DHCP/README.md
rename to bts_annee_2/sisr2/intel_pxe_boot/DHCP/README.md
diff --git a/bts_annee_2/sisr2/pxe/DHCP/dhcpd.conf b/bts_annee_2/sisr2/intel_pxe_boot/DHCP/dhcpd.conf
similarity index 100%
rename from bts_annee_2/sisr2/pxe/DHCP/dhcpd.conf
rename to bts_annee_2/sisr2/intel_pxe_boot/DHCP/dhcpd.conf
diff --git a/sisr1/tp01-02_dhcp_dns/files_dhcp_vm/isc-dhcp-server b/bts_annee_2/sisr2/intel_pxe_boot/DHCP/isc-dhcp-server
similarity index 100%
rename from sisr1/tp01-02_dhcp_dns/files_dhcp_vm/isc-dhcp-server
rename to bts_annee_2/sisr2/intel_pxe_boot/DHCP/isc-dhcp-server
diff --git a/bts_annee_2/sisr2/pxe/Interfaces/README.md b/bts_annee_2/sisr2/intel_pxe_boot/Interfaces/README.md
similarity index 100%
rename from bts_annee_2/sisr2/pxe/Interfaces/README.md
rename to bts_annee_2/sisr2/intel_pxe_boot/Interfaces/README.md
diff --git a/bts_annee_2/sisr2/pxe/Interfaces/enp0s3 b/bts_annee_2/sisr2/intel_pxe_boot/Interfaces/enp0s3
similarity index 100%
rename from bts_annee_2/sisr2/pxe/Interfaces/enp0s3
rename to bts_annee_2/sisr2/intel_pxe_boot/Interfaces/enp0s3
diff --git a/bts_annee_2/sisr2/pxe/Interfaces/enp0s8 b/bts_annee_2/sisr2/intel_pxe_boot/Interfaces/enp0s8
similarity index 100%
rename from bts_annee_2/sisr2/pxe/Interfaces/enp0s8
rename to bts_annee_2/sisr2/intel_pxe_boot/Interfaces/enp0s8
diff --git a/bts_annee_2/sisr2/pxe/README.md b/bts_annee_2/sisr2/intel_pxe_boot/README.md
similarity index 100%
rename from bts_annee_2/sisr2/pxe/README.md
rename to bts_annee_2/sisr2/intel_pxe_boot/README.md
diff --git a/bts_annee_2/sisr2/pxe/nftables/README.md b/bts_annee_2/sisr2/intel_pxe_boot/nftables/README.md
similarity index 100%
rename from bts_annee_2/sisr2/pxe/nftables/README.md
rename to bts_annee_2/sisr2/intel_pxe_boot/nftables/README.md
diff --git a/bts_annee_2/sisr2/pxe/nftables/nftables.conf b/bts_annee_2/sisr2/intel_pxe_boot/nftables/nftables.conf
similarity index 100%
rename from bts_annee_2/sisr2/pxe/nftables/nftables.conf
rename to bts_annee_2/sisr2/intel_pxe_boot/nftables/nftables.conf
diff --git a/bts_annee_2/sisr2/pxe/routing_command b/bts_annee_2/sisr2/intel_pxe_boot/routing_command
similarity index 100%
rename from bts_annee_2/sisr2/pxe/routing_command
rename to bts_annee_2/sisr2/intel_pxe_boot/routing_command
diff --git a/bts_annee_2/sisr2/ansible/README.md b/bts_annee_2/sisr2/playbooks_ansible/README.md
similarity index 100%
rename from bts_annee_2/sisr2/ansible/README.md
rename to bts_annee_2/sisr2/playbooks_ansible/README.md
diff --git a/bts_annee_2/sisr2/ansible/doku/README.md b/bts_annee_2/sisr2/playbooks_ansible/doku/README.md
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku/README.md
rename to bts_annee_2/sisr2/playbooks_ansible/doku/README.md
diff --git a/bts_annee_2/sisr2/ansible/doku/hosts b/bts_annee_2/sisr2/playbooks_ansible/doku/hosts
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku/hosts
rename to bts_annee_2/sisr2/playbooks_ansible/doku/hosts
diff --git a/bts_annee_2/sisr2/ansible/doku/local.yml b/bts_annee_2/sisr2/playbooks_ansible/doku/local.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku/local.yml
rename to bts_annee_2/sisr2/playbooks_ansible/doku/local.yml
diff --git a/bts_annee_2/sisr2/ansible/doku/main_doku.yml b/bts_annee_2/sisr2/playbooks_ansible/doku/main_doku.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku/main_doku.yml
rename to bts_annee_2/sisr2/playbooks_ansible/doku/main_doku.yml
diff --git a/bts_annee_2/sisr2/ansible/doku/main_web.yml b/bts_annee_2/sisr2/playbooks_ansible/doku/main_web.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku/main_web.yml
rename to bts_annee_2/sisr2/playbooks_ansible/doku/main_web.yml
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_provision b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_provision
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_provision
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_provision
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_set_name b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_set_name
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_set_name
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/action_set_name
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/box_meta b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/box_meta
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/box_meta
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/box_meta
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/creator_uid b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/creator_uid
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/creator_uid
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/creator_uid
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/id b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/id
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/id
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/id
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/index_uuid b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/index_uuid
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/index_uuid
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/index_uuid
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/private_key b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/private_key
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/private_key
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/private_key
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/synced_folders b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/synced_folders
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/synced_folders
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/synced_folders
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/vagrant_cwd b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/vagrant_cwd
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/machines/default/virtualbox/vagrant_cwd
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/machines/default/virtualbox/vagrant_cwd
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/rgloader/loader.rb b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/rgloader/loader.rb
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/.vagrant/rgloader/loader.rb
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/.vagrant/rgloader/loader.rb
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/README.md b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/README.md
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/README.md
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/README.md
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/Vagrantfile b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/Vagrantfile
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/Vagrantfile
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/Vagrantfile
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/hosts b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/hosts
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/hosts
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/hosts
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/local.yml b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/local.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/local.yml
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/local.yml
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/roles/doku/tasks/main.yml b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/roles/doku/tasks/main.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/roles/doku/tasks/main.yml
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/roles/doku/tasks/main.yml
diff --git a/bts_annee_2/sisr2/ansible/doku_vagrant/roles/web/tasks/main.yml b/bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/roles/web/tasks/main.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/doku_vagrant/roles/web/tasks/main.yml
rename to bts_annee_2/sisr2/playbooks_ansible/doku_vagrant/roles/web/tasks/main.yml
diff --git a/bts_annee_2/sisr2/ansible/hosts b/bts_annee_2/sisr2/playbooks_ansible/hosts
similarity index 100%
rename from bts_annee_2/sisr2/ansible/hosts
rename to bts_annee_2/sisr2/playbooks_ansible/hosts
diff --git a/bts_annee_2/sisr2/ansible/squid.yml b/bts_annee_2/sisr2/playbooks_ansible/squid.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/squid.yml
rename to bts_annee_2/sisr2/playbooks_ansible/squid.yml
diff --git a/bts_annee_2/sisr2/ansible/syslog-cli.yml b/bts_annee_2/sisr2/playbooks_ansible/syslog-cli.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/syslog-cli.yml
rename to bts_annee_2/sisr2/playbooks_ansible/syslog-cli.yml
diff --git a/bts_annee_2/sisr2/ansible/syslog.yml b/bts_annee_2/sisr2/playbooks_ansible/syslog.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/syslog.yml
rename to bts_annee_2/sisr2/playbooks_ansible/syslog.yml
diff --git a/bts_annee_2/sisr2/ansible/web.yml b/bts_annee_2/sisr2/playbooks_ansible/web.yml
similarity index 100%
rename from bts_annee_2/sisr2/ansible/web.yml
rename to bts_annee_2/sisr2/playbooks_ansible/web.yml
diff --git a/bts_annee_2/sisr2/python/README.md b/bts_annee_2/sisr2/scripts_python/README.md
similarity index 100%
rename from bts_annee_2/sisr2/python/README.md
rename to bts_annee_2/sisr2/scripts_python/README.md
diff --git a/bts_annee_2/sisr2/python/createusers.py b/bts_annee_2/sisr2/scripts_python/createusers.py
similarity index 100%
rename from bts_annee_2/sisr2/python/createusers.py
rename to bts_annee_2/sisr2/scripts_python/createusers.py
diff --git a/bts_annee_2/sisr2/python/occurences.py b/bts_annee_2/sisr2/scripts_python/occurences.py
similarity index 100%
rename from bts_annee_2/sisr2/python/occurences.py
rename to bts_annee_2/sisr2/scripts_python/occurences.py
diff --git a/bts_annee_2/sisr2/python/perimetre.py b/bts_annee_2/sisr2/scripts_python/perimetre.py
similarity index 100%
rename from bts_annee_2/sisr2/python/perimetre.py
rename to bts_annee_2/sisr2/scripts_python/perimetre.py
diff --git a/bts_annee_2/sisr2/python/tableau.py b/bts_annee_2/sisr2/scripts_python/tableau.py
similarity index 100%
rename from bts_annee_2/sisr2/python/tableau.py
rename to bts_annee_2/sisr2/scripts_python/tableau.py
diff --git a/bts_annee_2/sisr2/python/users.txt b/bts_annee_2/sisr2/scripts_python/users.txt
similarity index 100%
rename from bts_annee_2/sisr2/python/users.txt
rename to bts_annee_2/sisr2/scripts_python/users.txt