diff --git a/src/main/java/net/itsthesky/projetbut2/Main.java b/src/main/java/net/itsthesky/projetbut2/Main.java
index 189ddc1..cdd73e6 100644
--- a/src/main/java/net/itsthesky/projetbut2/Main.java
+++ b/src/main/java/net/itsthesky/projetbut2/Main.java
@@ -1,5 +1,5 @@
-import net.itsthesky.projetbut2.qualdev.FindInstrumentTester_v_Et;
+import net.itsthesky.projetbut2.qualdev.FindInstrumentTester;
 
 void main() {
-    FindInstrumentTester_v_Et.main(new String[]{});
+    FindInstrumentTester.main(new String[]{});
 }
\ No newline at end of file
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/ClientGuitar.java b/src/main/java/net/itsthesky/projetbut2/qualdev/ClientGuitar.java
deleted file mode 100644
index 37ac763..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/ClientGuitar.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.itsthesky.projetbut2.qualdev;
-
-/**
- * Classe représentant un client de guitare.
- */
-public class ClientGuitar {
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/FindInstrumentTester.java b/src/main/java/net/itsthesky/projetbut2/qualdev/FindInstrumentTester.java
new file mode 100644
index 0000000..ded9398
--- /dev/null
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/FindInstrumentTester.java
@@ -0,0 +1,115 @@
+package net.itsthesky.projetbut2.qualdev;
+
+import net.itsthesky.projetbut2.qualdev.model.Specification;
+import net.itsthesky.projetbut2.qualdev.model.Instrument;
+import net.itsthesky.projetbut2.qualdev.model.InstrumentSpec;
+import net.itsthesky.projetbut2.qualdev.model.specs.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class FindInstrumentTester {
+
+    public static void main(String[] args) {
+        // Set up Rick's inventory
+        Inventory inventory = new Inventory();
+        initializeInventory(inventory);
+
+
+        InstrumentSpec whatBryanLikes = new InstrumentSpec(Arrays.asList(
+                Specification.INSTRUMENT_TYPE, InstrumentType.MANDOLIN,
+                Specification.STYLE, Style.F));
+
+        whatBryanLikes = new InstrumentSpec(Arrays.asList(
+                Specification.INSTRUMENT_TYPE, InstrumentType.BANJO));
+
+        List matchingInstruments = inventory.search(whatBryanLikes);
+        if (!matchingInstruments.isEmpty())
+            System.out.println("Here's what we have for you:\n" + matchingInstruments);
+        else
+            System.out.println("Sorry, we have nothing for you.");
+    }
+
+
+    public static void initializeInventory(Inventory inventory) {
+        inventory.addInstrument(new Instrument("82765501", 1890.95,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.GUITAR,
+                        Specification.TYPE, Type.ELECTRIC,
+                        Specification.MODEL, "SG '61 Reissue",
+                        Specification.BACKWOOD, Wood.MAHOGANY,
+                        Specification.TOPWOOD, Wood.MAHOGANY))));
+
+        inventory.addInstrument(new Instrument("9019920", 5495.99,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.MANDOLIN,
+                        Specification.TYPE, Type.ACOUSTIC,
+                        Specification.MODEL, "DRSM-008 E",
+                        Specification.BACKWOOD, Wood.MAPLE,
+                        Specification.TOPWOOD, Wood.MAPLE,
+                        Specification.BUILDER, Builder.PRS,
+                        Specification.STYLE, Style.A
+                ))));
+
+        inventory.addInstrument(new Instrument("7819920", 549,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.MANDOLIN,
+                        Specification.TYPE, Type.ACOUSTIC,
+                        Specification.MODEL, "F-5G",
+                        Specification.BACKWOOD, Wood.MAPLE,
+                        Specification.TOPWOOD, Wood.MAPLE,
+                        Specification.BUILDER, Builder.GIBSON,
+                        Specification.STYLE, Style.F
+                ))));
+        inventory.addInstrument(new Instrument("8900231", 2945.95,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.BANJO,
+                        Specification.MODEL, "RB-3 Wreath",
+                        Specification.YEAR_OF_MANUFACTURE, 1967
+                ))));
+        inventory.addInstrument(new Instrument("70108276", 2295.95,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.GUITAR,
+                        Specification.BUILDER, Builder.GIBSON,
+                        Specification.MODEL, "Les Paul",
+                        Specification.BACKWOOD, Wood.MAPLE,
+                        Specification.TOPWOOD, Wood.MAPLE
+                ))));
+        inventory.addInstrument(new Instrument("V95693", 1499.95,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.GUITAR,
+                        Specification.BUILDER, Builder.FENDER,
+                        Specification.MODEL, "Stratocastor",
+                        Specification.BACKWOOD, Wood.ALDER,
+                        Specification.TOPWOOD, Wood.ALDER,
+                        Specification.TYPE, Type.ELECTRIC
+                ))));
+        inventory.addInstrument(new Instrument("V9512", 1549.95,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.GUITAR,
+                        Specification.BUILDER, Builder.FENDER,
+                        Specification.MODEL, "Stratocastor",
+                        Specification.BACKWOOD, Wood.ALDER,
+                        Specification.TOPWOOD, Wood.ALDER,
+                        Specification.TYPE, Type.ELECTRIC
+                ))));
+        inventory.addInstrument(new Instrument("122784", 5495.95,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.GUITAR,
+                        Specification.BUILDER, Builder.MARTIN,
+                        Specification.MODEL, "D-18",
+                        Specification.BACKWOOD, Wood.MAHOGANY,
+                        Specification.TOPWOOD, Wood.ADIRONDACK
+                ))));
+        inventory.addInstrument(new Instrument("11277", 3999.95,
+                new InstrumentSpec(Arrays.asList(
+                        Specification.INSTRUMENT_TYPE, InstrumentType.GUITAR,
+                        Specification.BUILDER, Builder.COLLINGS,
+                        Specification.MODEL, "CJ",
+                        Specification.BACKWOOD, Wood.INDIAN_ROSEWOOD,
+                        Specification.TOPWOOD, Wood.SITKA,
+                        Specification.TYPE, Type.ACOUSTIC,
+                        Specification.NUMBER_OF_STRINGS, 6
+                ))));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/FindInstrumentTester_v_Et.java b/src/main/java/net/itsthesky/projetbut2/qualdev/FindInstrumentTester_v_Et.java
deleted file mode 100644
index e613894..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/FindInstrumentTester_v_Et.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package net.itsthesky.projetbut2.qualdev;
-
-import net.itsthesky.projetbut2.qualdev.model.common.Builder;
-import net.itsthesky.projetbut2.qualdev.model.common.Style;
-import net.itsthesky.projetbut2.qualdev.model.common.Type;
-import net.itsthesky.projetbut2.qualdev.model.common.Wood;
-import net.itsthesky.projetbut2.qualdev.model.guitar.GuitarSpec;
-import net.itsthesky.projetbut2.qualdev.model.mandoline.MandolineSpec;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Classe de test pour rechercher des instruments dans l'inventaire.
- */
-public class FindInstrumentTester_v_Et {
-
-    /**
-     * Point d'entrée principal du programme de test.
-     * @param args arguments de ligne de commande
-     */
-    public static void main(String[] args) {
-        // Set up Rick's guitar inventory
-        Inventory inventory = new Inventory();
-        initializeInventory(inventory);
-
-        GuitarSpec whatErinLikes= new GuitarSpec(  Builder.FENDER,  "Stratocastor", Type.ELECTRIC,
-                Wood.ALDER, Wood.ALDER, 6);
-        MandolineSpec whatErinLikes2 = new MandolineSpec(Builder.PRS, "F-5G", Type.ACOUSTIC, Wood.MAPLE,
-                Wood.MAPLE, Style.A);
-        List matchingInstruments = inventory.search (whatErinLikes);
-
-        if (!matchingInstruments.isEmpty()) {
-            System.out.println( matchingInstruments);
-        }
-        else {
-            System.out.println("Sorry, Erin, we have nothing for you.");
-        }
-    }
-
-    /**
-     * Initialise l'inventaire avec des guitares et mandolines de test.
-     * @param inventory l'inventaire à initialiser
-     */
-    public static void initializeInventory(Inventory inventory) {
-
-        // Ajout des guitares à l'inventaire
-        inventory.addInstrument("11277", 3999.95,
-                new GuitarSpec(Builder.COLLINGS, "CJ",  Type.ACOUSTIC,
-                        Wood.INDIAN_ROSEWOOD, Wood.SITKA, 6));
-        inventory.addInstrument("V95693", 1499.95,
-                new GuitarSpec(Builder.FENDER, "Stratocastor",Type.ELECTRIC,
-                        Wood.ALDER, Wood.ALDER, 12));
-        inventory.addInstrument("V9512", 1549.95,
-                new GuitarSpec(Builder.FENDER, "Stratocastor",  Type.ELECTRIC,
-                        Wood.ALDER, Wood.ALDER, 6));
-        inventory.addInstrument("122784", 5495.95,
-                new GuitarSpec(Builder.MARTIN, "D-18",  Type.ACOUSTIC,
-                        Wood.MAHOGANY, Wood.ADIRONDACK, 6));
-        inventory.addInstrument("76531", 6295.95,
-                new GuitarSpec(Builder.MARTIN, "OM-28", Type.ACOUSTIC,
-                        Wood.BRAZILIAN_ROSEWOOD, Wood.ADIRONDACK, 6));
-        inventory.addInstrument("70108276", 2295.95,
-                new GuitarSpec(Builder.GIBSON, "Les Paul",  Type.ELECTRIC,
-                        Wood.MAHOGANY, Wood.MAHOGANY, 6));
-        inventory.addInstrument("82765501", 1890.95,
-                new GuitarSpec(Builder.GIBSON, "SG '61 Reissue", Type.ELECTRIC,
-                        Wood.MAHOGANY, Wood.MAHOGANY, 6));
-        inventory.addInstrument("77023", 6275.95,
-                new GuitarSpec(Builder.MARTIN, "D-28", Type.ACOUSTIC,
-                        Wood.BRAZILIAN_ROSEWOOD, Wood.ADIRONDACK, 6));
-        inventory.addInstrument("1092", 12995.95,
-                new GuitarSpec(Builder.OLSON, "SJ",  Type.ACOUSTIC,
-                        Wood.INDIAN_ROSEWOOD, Wood.CEDAR, 12));
-        inventory.addInstrument("566-62", 8999.95,
-                new GuitarSpec(Builder.RYAN, "Cathedral", Type.ACOUSTIC,
-                        Wood.COCOBOLO, Wood.CEDAR, 12));
-        inventory.addInstrument("6 29584", 2100.95,
-                new GuitarSpec(Builder.PRS, "Dave Navarro Signature", Type.ELECTRIC,
-                        Wood.MAHOGANY, Wood.MAPLE, 6));
-
-        // Ajout des mandolines à l'inventaire
-        inventory.addInstrument("8819920", 5495.99 ,
-                new MandolineSpec(Builder.PRS, "F-5G", Type.ACOUSTIC,
-                        Wood.MAPLE, Wood.MAPLE, Style.F));
-        inventory.addInstrument("9019920", 745.99 ,
-                new MandolineSpec (Builder.PRS, "F-5G", Type.ACOUSTIC,
-                        Wood.MAPLE, Wood.MAPLE, Style.A));
-    }
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/InstrumentFactory.java b/src/main/java/net/itsthesky/projetbut2/qualdev/InstrumentFactory.java
deleted file mode 100644
index 92b52b2..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/InstrumentFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.itsthesky.projetbut2.qualdev;
-
-import net.itsthesky.projetbut2.qualdev.model.Instrument;
-import net.itsthesky.projetbut2.qualdev.model.InstrumentSpec;
-import net.itsthesky.projetbut2.qualdev.model.guitar.Guitar;
-import net.itsthesky.projetbut2.qualdev.model.guitar.GuitarSpec;
-import net.itsthesky.projetbut2.qualdev.model.mandoline.Mandoline;
-import net.itsthesky.projetbut2.qualdev.model.mandoline.MandolineSpec;
-
-/**
- * Factory permettant de créer des instruments de musique en fonction de leurs spécifications.
- */
-public class InstrumentFactory {
-
-    /**
-     * Crée un instrument basé sur son numéro de série, son prix et ses spécifications.
-     * @param serialNumber le numéro de série de l'instrument
-     * @param price le prix de l'instrument
-     * @param instrumentSpec les spécifications de l'instrument
-     * @return l'instrument créé, ou <code>null</code> si le type de spécification n'est pas reconnu
-     */
-    public static Instrument createInstrument(String serialNumber, double price, InstrumentSpec instrumentSpec) {
-        if (instrumentSpec instanceof GuitarSpec guitarSpec)
-            return new Guitar(serialNumber, price, guitarSpec);
-        if (instrumentSpec instanceof MandolineSpec mandolineSpec)
-            return new Mandoline(serialNumber, price, mandolineSpec);
-
-        return null;
-    }
-
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/Inventory.java b/src/main/java/net/itsthesky/projetbut2/qualdev/Inventory.java
index 84d1a9d..125aff0 100644
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/Inventory.java
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/Inventory.java
@@ -16,16 +16,11 @@ public class Inventory {
     /**
      * Rajoute un instrument à cet inventaire, basé sur son serial number,
      * prix et spécifications.
-     * @param serialNumber le numéro de série de l'instrument
-     * @param price le prix de l'instrument
-     * @param instrumentSpec les spécifications de l'instrument
-     * @see InstrumentFactory
+     * @param instrument l'instrument à ajouter
      * @see InstrumentSpec
      */
-    public void addInstrument(String serialNumber, double price, InstrumentSpec instrumentSpec) {
-        final var instrument = InstrumentFactory.createInstrument(serialNumber, price, instrumentSpec);
-        if (instrument != null)
-            instruments.add(instrument);
+    public void addInstrument(Instrument instrument) {
+        instruments.add(instrument);
     }
 
     /**
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/Caracteristique.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/Caracteristique.java
deleted file mode 100644
index 633b345..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/Caracteristique.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.itsthesky.projetbut2.qualdev.model;
-
-import net.itsthesky.projetbut2.qualdev.model.common.Builder;
-import net.itsthesky.projetbut2.qualdev.model.common.Style;
-import net.itsthesky.projetbut2.qualdev.model.common.Type;
-import net.itsthesky.projetbut2.qualdev.model.common.Wood;
-
-public class Caracteristique<T> {
-
-    public static Caracteristique<Builder> BUILDER = new Caracteristique<>(Builder.class);
-    public static Caracteristique<String> MODEL = new Caracteristique<>(String.class);
-    public static Caracteristique<Integer> NUMBER_OF_STRINGS = new Caracteristique<>(Integer.class);
-    public static Caracteristique<Type> TYPE = new Caracteristique<>(Type.class);
-    public static Caracteristique<Wood> WOOD = new Caracteristique<>(Wood.class);
-    public static Caracteristique<Style> STYLE = new Caracteristique<>(Style.class);
-
-    private final Class<T> type;
-
-    public Caracteristique(Class<T> type) {
-        this.type = type;
-    }
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/Instrument.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/Instrument.java
index 11ae1be..b4effd1 100644
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/Instrument.java
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/Instrument.java
@@ -3,7 +3,7 @@ package net.itsthesky.projetbut2.qualdev.model;
 /**
  * Classe abstraite représentant un instrument de musique.
  */
-public abstract class Instrument {
+public class Instrument {
 
     private final String serialNumber;
     private final InstrumentSpec instrumentSpec;
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/InstrumentSpec.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/InstrumentSpec.java
index 088a4fe..1f60273 100644
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/InstrumentSpec.java
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/InstrumentSpec.java
@@ -1,23 +1,34 @@
 package net.itsthesky.projetbut2.qualdev.model;
 
-import net.itsthesky.projetbut2.qualdev.model.common.Wood;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Classe abstraite représentant les spécifications d'un instrument de musique.
  */
-public abstract class InstrumentSpec {
+public class InstrumentSpec {
 
-    private final Wood topWood;
-    private final Wood backWood;
+    private final Map<Specification<?>, Object> caracteristiques;
 
     /**
      * Constructeur des spécifications de l'instrument.
-     * @param topWood le type de bois de la face supérieure
-     * @param backWood le type de bois de la face arrière
      */
-    protected InstrumentSpec(Wood topWood, Wood backWood) {
-        this.topWood = topWood;
-        this.backWood = backWood;
+    public InstrumentSpec() {
+        this.caracteristiques = new HashMap<>();
+    }
+
+    public InstrumentSpec(List<Object> specs) {
+        this.caracteristiques = new HashMap<>();
+        for (int i = 0; i < specs.size(); i += 2) {
+            Specification<?> key = (Specification<?>) specs.get(i);
+            Object value = specs.get(i + 1);
+
+            if (value.getClass() != key.type())
+                throw new IllegalArgumentException("Type de valeur incorrect pour la caractéristique " + key.label());
+
+            this.caracteristiques.put(key, value);
+        }
     }
 
     /**
@@ -27,24 +38,32 @@ public abstract class InstrumentSpec {
      */
     public boolean matches(InstrumentSpec otherSpec) {
         if (otherSpec == null) return false;
-        if (topWood != otherSpec.topWood) return false;
-        if (backWood != otherSpec.backWood) return false;
+        for (var caracteristique : caracteristiques.entrySet()) {
+            var otherValue = otherSpec.caracteristiques.get(caracteristique.getKey());
+            if (otherValue == null || !caracteristique.getValue().equals(otherValue)) {
+                return false;
+            }
+        }
         return true;
     }
 
-    /**
-     * Récupère le type de bois de la face supérieure.
-     * @return le type de bois supérieur
-     */
-    public Wood getTopWood() {
-        return topWood;
+    public Map<Specification<?>, ?> getCaracteristiques() {
+        return caracteristiques;
     }
 
-    /**
-     * Récupère le type de bois de la face arrière.
-     * @return le type de bois arrière
-     */
-    public Wood getBackWood() {
-        return backWood;
+    public <T> T getCaracteristique(Specification<T> specification) {
+        return (T) caracteristiques.get(specification);
+    }
+
+    public <T> InstrumentSpec addCaracteristique(Specification<T> specification, T value) {
+        this.caracteristiques.put(specification, value);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "InstrumentSpec{" +
+                "caracteristiques=" + caracteristiques +
+                '}';
     }
 }
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/Specification.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/Specification.java
new file mode 100644
index 0000000..ecc662a
--- /dev/null
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/Specification.java
@@ -0,0 +1,19 @@
+package net.itsthesky.projetbut2.qualdev.model;
+
+import net.itsthesky.projetbut2.qualdev.model.specs.*;
+
+public record Specification<T>(Class<T> type, String label) {
+
+    public static Specification<Builder> BUILDER = new Specification<>(Builder.class, "Fabricantt");
+    public static Specification<String> MODEL = new Specification<>(String.class, "Modèle");
+    public static Specification<Integer> NUMBER_OF_STRINGS = new Specification<>(Integer.class, "Nombre de cordes");
+    public static Specification<Type> TYPE = new Specification<>(Type.class, "Type");
+    public static Specification<Style> STYLE = new Specification<>(Style.class, "Style");
+    public static Specification<Integer> YEAR_OF_MANUFACTURE = new Specification<>(Integer.class, "Année de fabrication");
+
+    public static Specification<Wood> TOPWOOD = new Specification<>(Wood.class, "Bois dessus");
+    public static Specification<Wood> BACKWOOD = new Specification<>(Wood.class, "Bois dessous");
+
+    public static Specification<InstrumentType> INSTRUMENT_TYPE = new Specification<>(InstrumentType.class, "Type d'instrument");
+
+}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/guitar/Guitar.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/guitar/Guitar.java
deleted file mode 100644
index ebddcb0..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/guitar/Guitar.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.itsthesky.projetbut2.qualdev.model.guitar;
-
-import net.itsthesky.projetbut2.qualdev.model.Instrument;
-
-/**
- * Représente une guitare, un type spécifique d'instrument de musique.
- */
-public class Guitar extends Instrument {
-
-    /**
-     * Constructeur d'une guitare.
-     * @param serialNumber le numéro de série de la guitare
-     * @param price le prix de la guitare
-     * @param instrumentSpec les spécifications de la guitare
-     */
-    public Guitar(String serialNumber, double price, GuitarSpec instrumentSpec) {
-        super(serialNumber, price, instrumentSpec);
-    }
-
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/guitar/GuitarSpec.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/guitar/GuitarSpec.java
deleted file mode 100644
index e320707..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/guitar/GuitarSpec.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package net.itsthesky.projetbut2.qualdev.model.guitar;
-
-import net.itsthesky.projetbut2.qualdev.model.InstrumentSpec;
-import net.itsthesky.projetbut2.qualdev.model.common.Builder;
-import net.itsthesky.projetbut2.qualdev.model.common.Type;
-import net.itsthesky.projetbut2.qualdev.model.common.Wood;
-
-/**
- * Représente les spécifications d'une guitare.
- */
-public class GuitarSpec extends InstrumentSpec {
-
-    private final Builder builder;
-    private final int numStrings;
-    private final String model;
-    private final Type type;
-
-    /**
-     * Constructeur des spécifications d'une guitare.
-     * @param builder le constructeur de la guitare
-     * @param model le modèle de la guitare
-     * @param type le type de guitare (acoustique ou électrique)
-     * @param topWood le type de bois de la face supérieure
-     * @param backWood le type de bois de la face arrière
-     * @param numStrings le nombre de cordes
-     */
-    public GuitarSpec(Builder builder, String model, Type type, Wood topWood, Wood backWood, int numStrings) {
-        super(topWood, backWood);
-        this.builder = builder;
-        this.numStrings = numStrings;
-        this.model = model;
-        this.type = type;
-    }
-
-    /**
-     * Récupère le constructeur de la guitare.
-     * @return le constructeur
-     */
-    public Builder getBuilder() {
-        return builder;
-    }
-
-    /**
-     * Récupère le nombre de cordes de la guitare.
-     * @return le nombre de cordes
-     */
-    public int getNumStrings() {
-        return numStrings;
-    }
-
-    /**
-     * Récupère le type de guitare.
-     * @return le type (acoustique ou électrique)
-     */
-    public Type getType() {
-        return type;
-    }
-
-
-    @Override
-    public boolean matches(InstrumentSpec otherSpec) {
-        if (!super.matches(otherSpec)) return false;
-        if (otherSpec instanceof GuitarSpec otherGuitarSpec) {
-            if (builder != otherGuitarSpec.builder) return false;
-            if (numStrings != otherGuitarSpec.numStrings) return false;
-            if (type != otherGuitarSpec.type) return false;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Récupère le modèle de la guitare.
-     * @return le modèle
-     */
-    public String getModel() {
-        return model;
-    }
-
-    @Override
-    public String toString() {
-        return "GuitarSpec{" +
-                "builder=" + builder +
-                ", numStrings=" + numStrings +
-                ", model='" + model + '\'' +
-                ", type=" + type +
-                '}';
-    }
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/mandoline/Mandoline.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/mandoline/Mandoline.java
deleted file mode 100644
index dc3b81c..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/mandoline/Mandoline.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package net.itsthesky.projetbut2.qualdev.model.mandoline;
-
-import net.itsthesky.projetbut2.qualdev.model.Instrument;
-import net.itsthesky.projetbut2.qualdev.model.InstrumentSpec;
-
-/**
- * Représente une mandoline, un type spécifique d'instrument de musique.
- */
-public class Mandoline extends Instrument {
-
-    /**
-     * Constructeur d'une mandoline.
-     * @param serialNumber le numéro de série de la mandoline
-     * @param price le prix de la mandoline
-     * @param instrumentSpec les spécifications de la mandoline
-     */
-    public Mandoline(String serialNumber, double price, MandolineSpec instrumentSpec) {
-        super(serialNumber, price, instrumentSpec);
-    }
-
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/mandoline/MandolineSpec.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/mandoline/MandolineSpec.java
deleted file mode 100644
index e1fa0c8..0000000
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/mandoline/MandolineSpec.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package net.itsthesky.projetbut2.qualdev.model.mandoline;
-
-import net.itsthesky.projetbut2.qualdev.model.InstrumentSpec;
-import net.itsthesky.projetbut2.qualdev.model.common.Builder;
-import net.itsthesky.projetbut2.qualdev.model.common.Style;
-import net.itsthesky.projetbut2.qualdev.model.common.Type;
-import net.itsthesky.projetbut2.qualdev.model.common.Wood;
-
-import java.util.Objects;
-
-/**
- * Représente les spécifications d'une mandoline.
- */
-public class MandolineSpec extends InstrumentSpec {
-
-    private final Style style;
-    private final Builder builder;
-    private final String model;
-    private final Type type;
-
-    /**
-     * Constructeur des spécifications d'une mandoline.
-     * @param builder le constructeur de la mandoline
-     * @param model le modèle de la mandoline
-     * @param type le type de mandoline (acoustique ou électrique)
-     * @param topWood le type de bois de la face supérieure
-     * @param backWood le type de bois de la face arrière
-     * @param style le style de la mandoline (A ou F)
-     */
-    public MandolineSpec(Builder builder, String model, Type type, Wood topWood, Wood backWood, Style style) {
-        super(topWood, backWood);
-        this.style = style;
-        this.builder = builder;
-        this.model = model;
-        this.type = type;
-    }
-
-    /**
-     * Récupère le style de la mandoline.
-     * @return le style (A ou F)
-     */
-    public Style getStyle() {
-        return style;
-    }
-
-    /**
-     * Récupère le constructeur de la mandoline.
-     * @return le constructeur
-     */
-    public Builder getBuilder() {
-        return builder;
-    }
-
-    /**
-     * Récupère le modèle de la mandoline.
-     * @return le modèle
-     */
-    public String getModel() {
-        return model;
-    }
-
-    /**
-     * Récupère le type de mandoline.
-     * @return le type (acoustique ou électrique)
-     */
-    public Type getType() {
-        return type;
-    }
-
-    @Override
-    public boolean matches(InstrumentSpec otherSpec) {
-        if (!super.matches(otherSpec)) return false;
-        if (otherSpec instanceof MandolineSpec otherMandolineSpec) {
-            if (style != otherMandolineSpec.style) return false;
-            if (builder != otherMandolineSpec.builder) return false;
-            if (!Objects.equals(model, otherMandolineSpec.model)) return false;
-            if (type != otherMandolineSpec.type) return false;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "MandolineSpec{" +
-                "style=" + style +
-                ", builder=" + builder +
-                ", model='" + model + '\'' +
-                ", type=" + type +
-                '}';
-    }
-}
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Builder.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Builder.java
similarity index 75%
rename from src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Builder.java
rename to src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Builder.java
index 5740d17..3439638 100644
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Builder.java
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Builder.java
@@ -1,4 +1,4 @@
-package net.itsthesky.projetbut2.qualdev.model.common;
+package net.itsthesky.projetbut2.qualdev.model.specs;
 
 /**
  * Représente un constructeur d'instrument de musique.
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/InstrumentType.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/InstrumentType.java
new file mode 100644
index 0000000..e14b597
--- /dev/null
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/InstrumentType.java
@@ -0,0 +1,11 @@
+package net.itsthesky.projetbut2.qualdev.model.specs;
+
+public enum InstrumentType {
+
+    GUITAR, MANDOLIN, CELLO, BANJO, VIOLIN, DOBRO, FIDDLE, BASS, ;
+
+    public String toString () {
+
+        return this.name().toLowerCase();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Style.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Style.java
similarity index 78%
rename from src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Style.java
rename to src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Style.java
index 538ed6e..835030f 100644
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Style.java
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Style.java
@@ -1,4 +1,4 @@
-package net.itsthesky.projetbut2.qualdev.model.common;
+package net.itsthesky.projetbut2.qualdev.model.specs;
 
 /**
  * Représente le style d'une {@link net.itsthesky.projetbut2.qualdev.model.mandoline.MandolineSpec mandoline}; A pour
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Type.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Type.java
similarity index 73%
rename from src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Type.java
rename to src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Type.java
index 9804ac4..df86be7 100644
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Type.java
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Type.java
@@ -1,4 +1,4 @@
-package net.itsthesky.projetbut2.qualdev.model.common;
+package net.itsthesky.projetbut2.qualdev.model.specs;
 
 /**
  * Représent le type d'une {@link net.itsthesky.projetbut2.qualdev.model.guitar.GuitarSpec guitar}.
diff --git a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Wood.java b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Wood.java
similarity index 84%
rename from src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Wood.java
rename to src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Wood.java
index 60a59db..a0ab762 100644
--- a/src/main/java/net/itsthesky/projetbut2/qualdev/model/common/Wood.java
+++ b/src/main/java/net/itsthesky/projetbut2/qualdev/model/specs/Wood.java
@@ -1,4 +1,4 @@
-package net.itsthesky.projetbut2.qualdev.model.common;
+package net.itsthesky.projetbut2.qualdev.model.specs;
 
 /**
  * Représente le type de bois utilisé dans la confection