diff --git a/biblioteca.vpp b/biblioteca.vpp
index 6a28e4a..0954469 100644
Binary files a/biblioteca.vpp and b/biblioteca.vpp differ
diff --git a/create.sql b/create.sql
index 8f742ae..ddf6047 100644
--- a/create.sql
+++ b/create.sql
@@ -324,7 +324,6 @@ create table arriendo
   fecha_devolucion_estimada date         not null,
   fecha_devolucion_real     date,
   multa                     int,
-  costo_total               int,
   inserted_at               timestamp default CURRENT_TIMESTAMP,
   foreign key (trabajador_id) references trabajador (id) on delete restrict on update cascade,
   foreign key (cliente_id) references cliente (id) on delete restrict on update cascade
diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java
index 09590b0..286f8b5 100644
--- a/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java
+++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java
@@ -1,7 +1,6 @@
 package xyz.danielcortes.controllers.libro;
 
 import java.time.Year;
-import java.util.HashSet;
 import java.util.List;
 import javax.swing.DefaultListModel;
 import javax.swing.JComboBox;
@@ -54,10 +53,40 @@ public class LibroCreateController extends BaseController {
     this.setupListeners();
   }
 
-  @Override
-  public void show() {
-    this.reload();
-    this.view.getIsbnField().requestFocus();
+  private void loadIdiomasList() {
+    List<Idioma> idiomas = this.idiomaRepository.getAll();
+    DefaultListModel<Idioma> model = this.view.getIdiomasModel();
+    model.clear();
+    for (Idioma idioma : idiomas) {
+      model.addElement(idioma);
+    }
+  }
+
+  private void loadCategoriasList() {
+    List<Categoria> categorias = this.categoriaRepository.getAll();
+    DefaultListModel<Categoria> model = this.view.getCategoriasModel();
+    model.clear();
+    for (Categoria categoria : categorias) {
+      model.addElement(categoria);
+    }
+  }
+
+  private void loadAutorList() {
+    List<Autor> autores = this.autorRepository.getAll();
+    DefaultListModel<Autor> model = this.view.getAutoresModel();
+    model.clear();
+    for (Autor autor : autores) {
+      model.addElement(autor);
+    }
+  }
+
+  private void loadEditorialCombo() {
+    List<Editorial> editoriales = this.editorialRepository.getAll();
+    JComboBox<Editorial> combobox = this.view.getEditorialCombo();
+    combobox.removeAllItems();
+    for (Editorial editorial : editoriales) {
+      combobox.addItem(editorial);
+    }
   }
 
   private void setupListeners() {
@@ -138,9 +167,9 @@ public class LibroCreateController extends BaseController {
     libro.setNumeroPaginas(Integer.parseInt(numeroPaginas));
     libro.setAnoPublicacion(Year.of(Integer.parseInt(anoPublicacion)));
     libro.setPrecioReferencia(Integer.parseInt(precioReferencial));
-    libro.setIdiomas(new HashSet<>(idiomas));
-    libro.setAutores(new HashSet<>(autores));
-    libro.setCategorias(new HashSet<>(categorias));
+    libro.setIdiomas(idiomas);
+    libro.setAutores(autores);
+    libro.setCategorias(categorias);
     libro.setEditorial(editorial);
 
     this.libroRepository.save(libro);
@@ -148,6 +177,12 @@ public class LibroCreateController extends BaseController {
     this.getParentController().showCard(PanelName.LIBRO_SEARCH);
   }
 
+  @Override
+  public void show() {
+    this.reload();
+    this.view.getIsbnField().requestFocus();
+  }
+
   private void reload() {
     this.loadIdiomasList();
     this.loadCategoriasList();
@@ -155,42 +190,6 @@ public class LibroCreateController extends BaseController {
     this.loadEditorialCombo();
   }
 
-  private void loadIdiomasList() {
-    List<Idioma> idiomas = this.idiomaRepository.getAll();
-    DefaultListModel<Idioma> model = this.view.getIdiomasModel();
-    model.clear();
-    for (Idioma idioma : idiomas) {
-      model.addElement(idioma);
-    }
-  }
-
-  private void loadCategoriasList() {
-    List<Categoria> categorias = this.categoriaRepository.getAll();
-    DefaultListModel<Categoria> model = this.view.getCategoriasModel();
-    model.clear();
-    for (Categoria categoria : categorias) {
-      model.addElement(categoria);
-    }
-  }
-
-  private void loadAutorList() {
-    List<Autor> autores = this.autorRepository.getAll();
-    DefaultListModel<Autor> model = this.view.getAutoresModel();
-    model.clear();
-    for (Autor autor : autores) {
-      model.addElement(autor);
-    }
-  }
-
-  private void loadEditorialCombo() {
-    List<Editorial> editoriales = this.editorialRepository.getAll();
-    JComboBox<Editorial> combobox = this.view.getEditorialCombo();
-    combobox.removeAllItems();
-    for (Editorial editorial : editoriales) {
-      combobox.addItem(editorial);
-    }
-  }
-
   @Override
   public BasePanel getView() {
     return this.view;
diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java
index a3fcf46..e3207a3 100644
--- a/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java
+++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java
@@ -1,7 +1,6 @@
 package xyz.danielcortes.controllers.libro;
 
 import java.time.Year;
-import java.util.HashSet;
 import java.util.List;
 import javax.swing.DefaultListModel;
 import javax.swing.JComboBox;
@@ -49,43 +48,10 @@ public class LibroUpdateController extends BaseController {
     this.setupListeners();
   }
 
-  public void setLibro(Libro libro) {
-    this.libro = libro;
-  }
-
-  @Override
-  public void show() {
-    this.reload();
-  }
-
   private void setupListeners() {
     this.view.getActualizarButton().addActionListener(e -> this.update());
   }
 
-  private void fillLibro() {
-    if (this.libro == null)
-      return;
-
-    this.view.getIsbnField().setText(this.libro.getIsbn());
-    this.view.getTituloField().setText(this.libro.getTitulo());
-    this.view.getPaginasField().setText(String.valueOf(this.libro.getNumeroPaginas()));
-    this.view.getAnoPublicacionField().setText(String.valueOf(this.libro.getAnoPublicacion()));
-    this.view.getPrecioReferenciaField().setText(String.valueOf(this.libro.getPrecioReferencia()));
-    JListUtils.setSelectedValues(
-        this.view.getIdiomasList(),
-        this.libro.getIdiomas()
-    );
-    JListUtils.setSelectedValues(
-        this.view.getAutoresList(),
-        this.libro.getAutores()
-    );
-    JListUtils.setSelectedValues(
-        this.view.getCategoriasList(),
-        this.libro.getCategorias()
-    );
-    this.view.getEditorialCombo().setSelectedItem(this.libro.getEditorial());
-  }
-
   private void update() {
     ValidationResult libroValidation = this.validator.validateLibro(this.libro);
     if (libroValidation.hasError()) {
@@ -164,15 +130,24 @@ public class LibroUpdateController extends BaseController {
     this.libro.setNumeroPaginas(Integer.parseInt(numeroPaginas));
     this.libro.setAnoPublicacion(Year.of(Integer.parseInt(anoPublicacion)));
     this.libro.setPrecioReferencia(Integer.parseInt(precioReferencial));
-    this.libro.setIdiomas(new HashSet<>(idiomas));
-    this.libro.setAutores(new HashSet<>(autores));
-    this.libro.setCategorias(new HashSet<>(categorias));
+    this.libro.setIdiomas(idiomas);
+    this.libro.setAutores(autores);
+    this.libro.setCategorias(categorias);
     this.libro.setEditorial(editorial);
 
     this.libroRepository.update(this.libro);
     this.getParentController().showCard(PanelName.LIBRO_SEARCH);
   }
 
+  public void setLibro(Libro libro) {
+    this.libro = libro;
+  }
+
+  @Override
+  public void show() {
+    this.reload();
+  }
+
   private void reload() {
     this.loadAutorList();
     this.loadCategoriasList();
@@ -181,12 +156,12 @@ public class LibroUpdateController extends BaseController {
     this.fillLibro();
   }
 
-  private void loadIdiomasList() {
-    List<Idioma> idiomas = this.idiomaRepository.getAll();
-    DefaultListModel<Idioma> model = this.view.getIdiomasModel();
+  private void loadAutorList() {
+    List<Autor> autores = this.autorRepository.getAll();
+    DefaultListModel<Autor> model = this.view.getAutoresModel();
     model.clear();
-    for (Idioma idioma : idiomas) {
-      model.addElement(idioma);
+    for (Autor autor : autores) {
+      model.addElement(autor);
     }
   }
 
@@ -199,15 +174,6 @@ public class LibroUpdateController extends BaseController {
     }
   }
 
-  private void loadAutorList() {
-    List<Autor> autores = this.autorRepository.getAll();
-    DefaultListModel<Autor> model = this.view.getAutoresModel();
-    model.clear();
-    for (Autor autor : autores) {
-      model.addElement(autor);
-    }
-  }
-
   private void loadEditorialCombo() {
     List<Editorial> editoriales = this.editorialRepository.getAll();
     JComboBox<Editorial> combobox = this.view.getEditorialCombo();
@@ -217,6 +183,39 @@ public class LibroUpdateController extends BaseController {
     }
   }
 
+  private void loadIdiomasList() {
+    List<Idioma> idiomas = this.idiomaRepository.getAll();
+    DefaultListModel<Idioma> model = this.view.getIdiomasModel();
+    model.clear();
+    for (Idioma idioma : idiomas) {
+      model.addElement(idioma);
+    }
+  }
+
+  private void fillLibro() {
+    if (this.libro == null)
+      return;
+
+    this.view.getIsbnField().setText(this.libro.getIsbn());
+    this.view.getTituloField().setText(this.libro.getTitulo());
+    this.view.getPaginasField().setText(String.valueOf(this.libro.getNumeroPaginas()));
+    this.view.getAnoPublicacionField().setText(String.valueOf(this.libro.getAnoPublicacion()));
+    this.view.getPrecioReferenciaField().setText(String.valueOf(this.libro.getPrecioReferencia()));
+    JListUtils.setSelectedValues(
+        this.view.getIdiomasList(),
+        this.libro.getIdiomas()
+    );
+    JListUtils.setSelectedValues(
+        this.view.getAutoresList(),
+        this.libro.getAutores()
+    );
+    JListUtils.setSelectedValues(
+        this.view.getCategoriasList(),
+        this.libro.getCategorias()
+    );
+    this.view.getEditorialCombo().setSelectedItem(this.libro.getEditorial());
+  }
+
   @Override
   public BasePanel getView() {
     return this.view;
diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java
index f655ef2..d951cde 100644
--- a/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java
+++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java
@@ -1,16 +1,12 @@
 package xyz.danielcortes.controllers.libro;
 
-import java.util.List;
 import javax.swing.DefaultListModel;
-import javax.swing.JComboBox;
 import xyz.danielcortes.controllers.LaunchController;
 import xyz.danielcortes.framework.BaseController;
 import xyz.danielcortes.framework.BasePanel;
-import xyz.danielcortes.framework.JListUtils;
 import xyz.danielcortes.framework.PanelName;
 import xyz.danielcortes.models.Autor;
 import xyz.danielcortes.models.Categoria;
-import xyz.danielcortes.models.Editorial;
 import xyz.danielcortes.models.Idioma;
 import xyz.danielcortes.models.Libro;
 import xyz.danielcortes.repository.AutorRepository;
@@ -40,29 +36,48 @@ public class LibroViewController extends BaseController {
     this.setupListeners();
   }
 
-  @Override
-  public void show() {
-    this.reload();
-  }
-
-  public void setLibro(Libro libro) {
-    this.libro = libro;
-  }
-
   private void setupListeners() {
     this.view.getVolverButton().addActionListener(e -> {
       this.getParentController().showCard(PanelName.LIBRO_SEARCH);
     });
   }
 
+  @Override
+  public void show() {
+    this.reload();
+  }
+
   private void reload() {
     this.loadAutorList();
     this.loadCategoriasList();
-    this.loadEditorialCombo();
     this.loadIdiomasList();
     this.fillLibro();
   }
 
+  private void loadAutorList() {
+    DefaultListModel<Autor> model = this.view.getAutoresModel();
+    model.clear();
+    for (Autor autor : this.libro.getAutores()) {
+      model.addElement(autor);
+    }
+  }
+
+  private void loadCategoriasList() {
+    DefaultListModel<Categoria> model = this.view.getCategoriasModel();
+    model.clear();
+    for (Categoria categoria : this.libro.getCategorias()) {
+      model.addElement(categoria);
+    }
+  }
+
+  private void loadIdiomasList() {
+    DefaultListModel<Idioma> model = this.view.getIdiomasModel();
+    model.clear();
+    for (Idioma idioma : this.libro.getIdiomas()) {
+      model.addElement(idioma);
+    }
+  }
+
   private void fillLibro() {
     if (this.libro == null)
       return;
@@ -72,50 +87,15 @@ public class LibroViewController extends BaseController {
     this.view.getPaginasField().setText(String.valueOf(this.libro.getNumeroPaginas()));
     this.view.getAnoPublicacionField().setText(String.valueOf(this.libro.getAnoPublicacion()));
     this.view.getPrecioReferenciaField().setText(String.valueOf(this.libro.getPrecioReferencia()));
-    JListUtils.setSelectedValues(this.view.getIdiomasList(), this.libro.getIdiomas());
-    JListUtils.setSelectedValues(this.view.getAutoresList(), this.libro.getAutores());
-    JListUtils.setSelectedValues(this.view.getCategoriasList(), this.libro.getCategorias());
-    this.view.getEditorialCombo().setSelectedItem(this.libro.getEditorial());
-  }
-
-  private void loadIdiomasList() {
-    List<Idioma> idiomas = this.idiomaRepository.getAll();
-    DefaultListModel<Idioma> model = this.view.getIdiomasModel();
-    model.clear();
-    for (Idioma idioma : idiomas) {
-      model.addElement(idioma);
-    }
-  }
-
-  private void loadCategoriasList() {
-    List<Categoria> categorias = this.categoriaRepository.getAll();
-    DefaultListModel<Categoria> model = this.view.getCategoriasModel();
-    model.clear();
-    for (Categoria categoria : categorias) {
-      model.addElement(categoria);
-    }
-  }
-
-  private void loadAutorList() {
-    List<Autor> autores = this.autorRepository.getAll();
-    DefaultListModel<Autor> model = this.view.getAutoresModel();
-    model.clear();
-    for (Autor autor : autores) {
-      model.addElement(autor);
-    }
-  }
-
-  private void loadEditorialCombo() {
-    List<Editorial> editoriales = this.editorialRepository.getAll();
-    JComboBox<Editorial> combobox = this.view.getEditorialCombo();
-    combobox.removeAllItems();
-    for (Editorial editorial : editoriales) {
-      combobox.addItem(editorial);
-    }
+    this.view.getEditorialField().setText(this.libro.getEditorial().toString());
   }
 
   @Override
   public BasePanel getView() {
     return this.view;
   }
+
+  public void setLibro(Libro libro) {
+    this.libro = libro;
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/framework/BaseRepository.java b/src/main/java/xyz/danielcortes/framework/BaseRepository.java
index 7219add..7cdc2c1 100644
--- a/src/main/java/xyz/danielcortes/framework/BaseRepository.java
+++ b/src/main/java/xyz/danielcortes/framework/BaseRepository.java
@@ -1,6 +1,6 @@
 package xyz.danielcortes.framework;
 
-import java.util.List;
+import java.util.Collection;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
 
@@ -51,7 +51,7 @@ public abstract class BaseRepository<E> {
     this.em.getTransaction().commit();
   }
 
-  public void delete(List<E> entities) {
+  public void delete(Collection<E> entities) {
     this.em.getTransaction().begin();
 
     try {
diff --git a/src/main/java/xyz/danielcortes/framework/JListUtils.java b/src/main/java/xyz/danielcortes/framework/JListUtils.java
index 0445ada..2c56310 100644
--- a/src/main/java/xyz/danielcortes/framework/JListUtils.java
+++ b/src/main/java/xyz/danielcortes/framework/JListUtils.java
@@ -1,11 +1,12 @@
 package xyz.danielcortes.framework;
 
-import java.util.Set;
+import java.util.List;
 import javax.swing.JList;
 import javax.swing.ListModel;
 
 public class JListUtils {
-  public static void setSelectedValues(JList list, Set values) {
+
+  public static void setSelectedValues(JList list, List values) {
     list.clearSelection();
     for (Object value : values) {
       int index = getIndex(list.getModel(), value);
diff --git a/src/main/java/xyz/danielcortes/models/Arriendo.java b/src/main/java/xyz/danielcortes/models/Arriendo.java
new file mode 100644
index 0000000..c547e4f
--- /dev/null
+++ b/src/main/java/xyz/danielcortes/models/Arriendo.java
@@ -0,0 +1,154 @@
+package xyz.danielcortes.models;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "arriendo")
+public class Arriendo {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id", nullable = false)
+  private Integer id;
+
+  @Column(name = "costo_arriendo", nullable = false)
+  private Integer costoArriendo;
+
+  @Column(name = "fecha_arriendo", nullable = false)
+  private LocalDate fechaArriendo;
+
+  @Column(name = "fecha_devolucion_estimada", nullable = false)
+  private LocalDate fechaDevolucionEstimada;
+
+  @Column(name = "fecha_devolucion_real")
+  private LocalDate fechaDevolucionReal;
+
+  @Column(name = "multa")
+  private Integer multa;
+
+  @ManyToOne
+  @JoinColumn(name = "trabajador_id", nullable = false)
+  private Trabajador trabajador;
+
+  @ManyToOne
+  @JoinColumn(name = "cliente_id", nullable = false)
+  private Trabajador Cliente;
+
+  @ManyToMany
+  @JoinTable(
+      name = "ejemplar_arriendo",
+      joinColumns = @JoinColumn(name = "arriendo_id", referencedColumnName = "id"),
+      inverseJoinColumns = @JoinColumn(name = "ejemplar_id", referencedColumnName = "id"))
+  private List<Ejemplar> ejemplares;
+
+  public Integer getId() {
+    return this.id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Integer getCostoArriendo() {
+    return this.costoArriendo;
+  }
+
+  public void setCostoArriendo(Integer costoArriendo) {
+    this.costoArriendo = costoArriendo;
+  }
+
+  public LocalDate getFechaArriendo() {
+    return this.fechaArriendo;
+  }
+
+  public void setFechaArriendo(LocalDate fechaArriendo) {
+    this.fechaArriendo = fechaArriendo;
+  }
+
+  public LocalDate getFechaDevolucionEstimada() {
+    return this.fechaDevolucionEstimada;
+  }
+
+  public void setFechaDevolucionEstimada(LocalDate fechaDevolucionEstimada) {
+    this.fechaDevolucionEstimada = fechaDevolucionEstimada;
+  }
+
+  public LocalDate getFechaDevolucionReal() {
+    return this.fechaDevolucionReal;
+  }
+
+  public void setFechaDevolucionReal(LocalDate fechaDevolucionReal) {
+    this.fechaDevolucionReal = fechaDevolucionReal;
+  }
+
+  public Integer getMulta() {
+    return this.multa;
+  }
+
+  public void setMulta(Integer multa) {
+    this.multa = multa;
+  }
+
+  public Trabajador getTrabajador() {
+    return this.trabajador;
+  }
+
+  public void setTrabajador(Trabajador trabajador) {
+    this.trabajador = trabajador;
+  }
+
+  public Trabajador getCliente() {
+    return this.Cliente;
+  }
+
+  public void setCliente(Trabajador cliente) {
+    this.Cliente = cliente;
+  }
+
+  public List<Ejemplar> getEjemplares() {
+    if (this.ejemplares == null)
+      this.ejemplares = new ArrayList<>();
+    return this.ejemplares;
+  }
+
+  public void setEjemplares(List<Ejemplar> ejemplares) {
+    this.ejemplares = ejemplares;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.costoArriendo, this.fechaArriendo, this.fechaDevolucionEstimada, this.fechaDevolucionReal, this.multa,
+        this.trabajador, this.Cliente, this.ejemplares);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Arriendo))
+      return false;
+    Arriendo arriendo = (Arriendo) o;
+    return Objects.equals(this.id, arriendo.id) &&
+        Objects.equals(this.costoArriendo, arriendo.costoArriendo) &&
+        Objects.equals(this.fechaArriendo, arriendo.fechaArriendo) &&
+        Objects.equals(this.fechaDevolucionEstimada, arriendo.fechaDevolucionEstimada) &&
+        Objects.equals(this.fechaDevolucionReal, arriendo.fechaDevolucionReal) &&
+        Objects.equals(this.multa, arriendo.multa) &&
+        Objects.equals(this.trabajador, arriendo.trabajador) &&
+        Objects.equals(this.Cliente, arriendo.Cliente) &&
+        Objects.equals(this.ejemplares, arriendo.ejemplares);
+  }
+}
diff --git a/src/main/java/xyz/danielcortes/models/Autor.java b/src/main/java/xyz/danielcortes/models/Autor.java
index f0a8fa9..5f74192 100644
--- a/src/main/java/xyz/danielcortes/models/Autor.java
+++ b/src/main/java/xyz/danielcortes/models/Autor.java
@@ -1,7 +1,8 @@
 package xyz.danielcortes.models;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -29,7 +30,7 @@ public class Autor {
   private String apellidoMaterno;
 
   @ManyToMany(mappedBy = "autores")
-  private Set<Libro> libros;
+  private List<Libro> libros;
 
   public Integer getId() {
     return this.id;
@@ -63,17 +64,36 @@ public class Autor {
     this.apellidoMaterno = apellidoMaterno;
   }
 
-  public Set<Libro> getLibros() {
+  public List<Libro> getLibros() {
     if (this.libros == null) {
-      this.libros = new HashSet<>();
+      this.libros = new ArrayList<>();
     }
     return this.libros;
   }
 
-  public void setLibros(Set<Libro> libros) {
+  public void setLibros(List<Libro> libros) {
     this.libros = libros;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.nombre, this.apellidoPaterno, this.apellidoMaterno, this.libros);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Autor))
+      return false;
+    Autor autor = (Autor) o;
+    return Objects.equals(this.id, autor.id) &&
+        Objects.equals(this.nombre, autor.nombre) &&
+        Objects.equals(this.apellidoPaterno, autor.apellidoPaterno) &&
+        Objects.equals(this.apellidoMaterno, autor.apellidoMaterno) &&
+        Objects.equals(this.libros, autor.libros);
+  }
+
   @Override
   public String toString() {
     return this.nombre + " " + this.apellidoPaterno + " " + this.apellidoMaterno;
diff --git a/src/main/java/xyz/danielcortes/models/Boleta.java b/src/main/java/xyz/danielcortes/models/Boleta.java
new file mode 100644
index 0000000..8b5c8c3
--- /dev/null
+++ b/src/main/java/xyz/danielcortes/models/Boleta.java
@@ -0,0 +1,108 @@
+package xyz.danielcortes.models;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "boleta")
+public class Boleta {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  private Integer id;
+
+  @Column(name = "folio")
+  private String folio;
+
+  @Column(name = "precio_neto")
+  private Integer precioNeto;
+
+  @Column(name = "precio_iva")
+  private Integer precioIVA;
+
+  @Column(name = "fecha_venta")
+  private LocalDate fechaVenta;
+
+  @OneToMany(mappedBy = "boleta")
+  private List<Venta> ventas;
+
+  public Integer getId() {
+    return this.id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getFolio() {
+    return this.folio;
+  }
+
+  public void setFolio(String folio) {
+    this.folio = folio;
+  }
+
+  public Integer getPrecioNeto() {
+    return this.precioNeto;
+  }
+
+  public void setPrecioNeto(Integer precioNeto) {
+    this.precioNeto = precioNeto;
+  }
+
+  public Integer getPrecioIVA() {
+    return this.precioIVA;
+  }
+
+  public void setPrecioIVA(Integer precioIVA) {
+    this.precioIVA = precioIVA;
+  }
+
+  public LocalDate getFechaVenta() {
+    return this.fechaVenta;
+  }
+
+  public void setFechaVenta(LocalDate fechaVenta) {
+    this.fechaVenta = fechaVenta;
+  }
+
+  public List<Venta> getVentas() {
+    if (this.ventas == null)
+      this.ventas = new ArrayList<>();
+    return this.ventas;
+  }
+
+  public void setVentas(List<Venta> ventas) {
+    this.ventas = ventas;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.folio, this.precioNeto, this.precioIVA, this.fechaVenta, this.ventas);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Boleta))
+      return false;
+    Boleta boleta = (Boleta) o;
+    return Objects.equals(this.id, boleta.id) &&
+        Objects.equals(this.folio, boleta.folio) &&
+        Objects.equals(this.precioNeto, boleta.precioNeto) &&
+        Objects.equals(this.precioIVA, boleta.precioIVA) &&
+        Objects.equals(this.fechaVenta, boleta.fechaVenta) &&
+        Objects.equals(this.ventas, boleta.ventas);
+  }
+}
diff --git a/src/main/java/xyz/danielcortes/models/Categoria.java b/src/main/java/xyz/danielcortes/models/Categoria.java
index 2f2dca5..d40ec69 100644
--- a/src/main/java/xyz/danielcortes/models/Categoria.java
+++ b/src/main/java/xyz/danielcortes/models/Categoria.java
@@ -1,7 +1,8 @@
 package xyz.danielcortes.models;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -23,7 +24,7 @@ public class Categoria {
   private String nombre;
 
   @ManyToMany(mappedBy = "categorias")
-  private Set<Libro> libros;
+  private List<Libro> libros;
 
   public Integer getId() {
     return this.id;
@@ -41,17 +42,34 @@ public class Categoria {
     this.nombre = nombre;
   }
 
-  public Set<Libro> getLibros() {
+  public List<Libro> getLibros() {
     if (this.libros == null) {
-      this.libros = new HashSet<>();
+      this.libros = new ArrayList<>();
     }
     return this.libros;
   }
 
-  public void setLibros(Set<Libro> libros) {
+  public void setLibros(List<Libro> libros) {
     this.libros = libros;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.nombre, this.libros);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Categoria))
+      return false;
+    Categoria categoria = (Categoria) o;
+    return Objects.equals(this.id, categoria.id) &&
+        Objects.equals(this.nombre, categoria.nombre) &&
+        Objects.equals(this.libros, categoria.libros);
+  }
+
   @Override
   public String toString() {
     return this.nombre;
diff --git a/src/main/java/xyz/danielcortes/models/Cliente.java b/src/main/java/xyz/danielcortes/models/Cliente.java
index c5bdee5..3243a91 100644
--- a/src/main/java/xyz/danielcortes/models/Cliente.java
+++ b/src/main/java/xyz/danielcortes/models/Cliente.java
@@ -3,12 +3,14 @@ package xyz.danielcortes.models;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 @Entity
@@ -44,6 +46,9 @@ public class Cliente {
   @ManyToMany(mappedBy = "clientes")
   private List<Direccion> direcciones;
 
+  @OneToMany(mappedBy = "cliente")
+  private List<Venta> ventas;
+
   public Integer getId() {
     return this.id;
   }
@@ -121,4 +126,40 @@ public class Cliente {
   public void setDirecciones(List<Direccion> direcciones) {
     this.direcciones = direcciones;
   }
+
+  public List<Venta> getVentas() {
+    if (this.ventas == null)
+      this.ventas = new ArrayList<>();
+    return this.ventas;
+  }
+
+  public void setVentas(List<Venta> ventas) {
+    this.ventas = ventas;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.rut, this.nombre, this.apellidoPaterno, this.apellidoMaterno, this.fechaNacimiento, this.correos,
+        this.telefonos,
+        this.direcciones, this.ventas);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Cliente))
+      return false;
+    Cliente cliente = (Cliente) o;
+    return Objects.equals(this.id, cliente.id) &&
+        Objects.equals(this.rut, cliente.rut) &&
+        Objects.equals(this.nombre, cliente.nombre) &&
+        Objects.equals(this.apellidoPaterno, cliente.apellidoPaterno) &&
+        Objects.equals(this.apellidoMaterno, cliente.apellidoMaterno) &&
+        Objects.equals(this.fechaNacimiento, cliente.fechaNacimiento) &&
+        Objects.equals(this.correos, cliente.correos) &&
+        Objects.equals(this.telefonos, cliente.telefonos) &&
+        Objects.equals(this.direcciones, cliente.direcciones) &&
+        Objects.equals(this.ventas, cliente.ventas);
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/models/Compra.java b/src/main/java/xyz/danielcortes/models/Compra.java
new file mode 100644
index 0000000..9f07b78
--- /dev/null
+++ b/src/main/java/xyz/danielcortes/models/Compra.java
@@ -0,0 +1,92 @@
+package xyz.danielcortes.models;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "compra")
+public class Compra {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  private Integer id;
+
+  @ManyToOne
+  @JoinColumn(name = "factura_id")
+  private Factura factura;
+
+  @ManyToOne
+  @JoinColumn(name = "distribuidor_id")
+  private Distribuidor distribuidor;
+
+  @ManyToMany
+  @JoinTable(
+      name = "ejemplar_compra",
+      joinColumns = @JoinColumn(name = "compra_id", referencedColumnName = "id"),
+      inverseJoinColumns = @JoinColumn(name = "ejemplar_id", referencedColumnName = "id"))
+  private List<Ejemplar> ejemplares;
+
+  public Integer getId() {
+    return this.id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Factura getFactura() {
+    return this.factura;
+  }
+
+  public void setFactura(Factura factura) {
+    this.factura = factura;
+  }
+
+  public Distribuidor getDistribuidor() {
+    return this.distribuidor;
+  }
+
+  public void setDistribuidor(Distribuidor distribuidor) {
+    this.distribuidor = distribuidor;
+  }
+
+  public List<Ejemplar> getEjemplares() {
+    if (this.ejemplares == null)
+      this.ejemplares = new ArrayList<>();
+    return this.ejemplares;
+  }
+
+  public void setEjemplares(List<Ejemplar> ejemplares) {
+    this.ejemplares = ejemplares;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.factura, this.distribuidor, this.ejemplares);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Compra))
+      return false;
+    Compra compra = (Compra) o;
+    return Objects.equals(this.id, compra.id) &&
+        Objects.equals(this.factura, compra.factura) &&
+        Objects.equals(this.distribuidor, compra.distribuidor) &&
+        Objects.equals(this.ejemplares, compra.ejemplares);
+  }
+}
diff --git a/src/main/java/xyz/danielcortes/models/Correo.java b/src/main/java/xyz/danielcortes/models/Correo.java
index ded2be9..864c5a1 100644
--- a/src/main/java/xyz/danielcortes/models/Correo.java
+++ b/src/main/java/xyz/danielcortes/models/Correo.java
@@ -2,6 +2,7 @@ package xyz.danielcortes.models;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -94,4 +95,23 @@ public class Correo {
   public void setClientes(List<Cliente> clientes) {
     this.clientes = clientes;
   }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.correo, this.trabajadores, this.distribuidores, this.clientes);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Correo))
+      return false;
+    Correo correo1 = (Correo) o;
+    return Objects.equals(this.id, correo1.id) &&
+        Objects.equals(this.correo, correo1.correo) &&
+        Objects.equals(this.trabajadores, correo1.trabajadores) &&
+        Objects.equals(this.distribuidores, correo1.distribuidores) &&
+        Objects.equals(this.clientes, correo1.clientes);
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/models/Direccion.java b/src/main/java/xyz/danielcortes/models/Direccion.java
index c9c2303..71b8c54 100644
--- a/src/main/java/xyz/danielcortes/models/Direccion.java
+++ b/src/main/java/xyz/danielcortes/models/Direccion.java
@@ -2,6 +2,7 @@ package xyz.danielcortes.models;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -105,4 +106,24 @@ public class Direccion {
   public void setClientes(List<Cliente> clientes) {
     this.clientes = clientes;
   }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.calle, this.numero, this.trabajadores, this.distribuidores, this.clientes);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Direccion))
+      return false;
+    Direccion direccion = (Direccion) o;
+    return Objects.equals(this.id, direccion.id) &&
+        Objects.equals(this.calle, direccion.calle) &&
+        Objects.equals(this.numero, direccion.numero) &&
+        Objects.equals(this.trabajadores, direccion.trabajadores) &&
+        Objects.equals(this.distribuidores, direccion.distribuidores) &&
+        Objects.equals(this.clientes, direccion.clientes);
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/models/Distribuidor.java b/src/main/java/xyz/danielcortes/models/Distribuidor.java
index 3849825..ccb2a25 100644
--- a/src/main/java/xyz/danielcortes/models/Distribuidor.java
+++ b/src/main/java/xyz/danielcortes/models/Distribuidor.java
@@ -1,6 +1,8 @@
 package xyz.danielcortes.models;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -9,6 +11,7 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 @Entity
@@ -35,6 +38,9 @@ public class Distribuidor {
   @ManyToMany(mappedBy = "distribuidores")
   private List<Direccion> direcciones;
 
+  @OneToMany(mappedBy = "distribuidor")
+  private List<Compra> compras;
+
   public Integer getId() {
     return this.id;
   }
@@ -60,6 +66,8 @@ public class Distribuidor {
   }
 
   public List<Correo> getCorreos() {
+    if (this.correos == null)
+      this.correos = new ArrayList<>();
     return this.correos;
   }
 
@@ -68,6 +76,8 @@ public class Distribuidor {
   }
 
   public List<Telefono> getTelefonos() {
+    if (this.telefonos == null)
+      this.telefonos = new ArrayList<>();
     return this.telefonos;
   }
 
@@ -76,10 +86,44 @@ public class Distribuidor {
   }
 
   public List<Direccion> getDirecciones() {
+    if (this.direcciones == null)
+      this.direcciones = new ArrayList<>();
+
     return this.direcciones;
   }
 
   public void setDirecciones(List<Direccion> direcciones) {
     this.direcciones = direcciones;
   }
+
+  public List<Compra> getCompras() {
+    if (this.compras == null)
+      this.compras = new ArrayList<>();
+    return this.compras;
+  }
+
+  public void setCompras(List<Compra> compras) {
+    this.compras = compras;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.rut, this.empresa, this.correos, this.telefonos, this.direcciones, this.compras);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Distribuidor))
+      return false;
+    Distribuidor that = (Distribuidor) o;
+    return Objects.equals(this.id, that.id) &&
+        Objects.equals(this.rut, that.rut) &&
+        Objects.equals(this.empresa, that.empresa) &&
+        Objects.equals(this.correos, that.correos) &&
+        Objects.equals(this.telefonos, that.telefonos) &&
+        Objects.equals(this.direcciones, that.direcciones) &&
+        Objects.equals(this.compras, that.compras);
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/models/Editorial.java b/src/main/java/xyz/danielcortes/models/Editorial.java
index 28521c4..ce60c8e 100644
--- a/src/main/java/xyz/danielcortes/models/Editorial.java
+++ b/src/main/java/xyz/danielcortes/models/Editorial.java
@@ -1,6 +1,7 @@
 package xyz.danielcortes.models;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -52,6 +53,23 @@ public class Editorial {
     this.libros = libros;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.nombre, this.libros);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Editorial))
+      return false;
+    Editorial editorial = (Editorial) o;
+    return Objects.equals(this.id, editorial.id) &&
+        Objects.equals(this.nombre, editorial.nombre) &&
+        Objects.equals(this.libros, editorial.libros);
+  }
+
   @Override
   public String toString() {
     return this.nombre;
diff --git a/src/main/java/xyz/danielcortes/models/Ejemplar.java b/src/main/java/xyz/danielcortes/models/Ejemplar.java
index 8587717..fa4889d 100644
--- a/src/main/java/xyz/danielcortes/models/Ejemplar.java
+++ b/src/main/java/xyz/danielcortes/models/Ejemplar.java
@@ -1,11 +1,15 @@
 package xyz.danielcortes.models;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
@@ -29,6 +33,15 @@ public class Ejemplar {
   @JoinColumn(name = "estado_id")
   private Estado estado;
 
+  @ManyToMany(mappedBy = "ejemplares")
+  private List<Arriendo> arriendos;
+
+  @ManyToMany(mappedBy = "ejemplares")
+  private List<Compra> compras;
+
+  @ManyToMany(mappedBy = "ejemplares")
+  private List<Venta> ventas;
+
   public Integer getId() {
     return this.id;
   }
@@ -62,6 +75,57 @@ public class Ejemplar {
     this.estado = estado;
   }
 
+  public List<Arriendo> getArriendos() {
+    if (this.arriendos == null)
+      this.arriendos = new ArrayList<>();
+    return this.arriendos;
+  }
+
+  public void setArriendos(List<Arriendo> arriendos) {
+    this.arriendos = arriendos;
+  }
+
+  public List<Compra> getCompras() {
+    if (this.compras == null)
+      this.compras = new ArrayList<>();
+    return this.compras;
+  }
+
+  public void setCompras(List<Compra> compras) {
+    this.compras = compras;
+  }
+
+  public List<Venta> getVentas() {
+    if (this.ventas == null)
+      this.ventas = new ArrayList<>();
+    return this.ventas;
+  }
+
+  public void setVentas(List<Venta> ventas) {
+    this.ventas = ventas;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.serie, this.libro, this.estado, this.arriendos, this.compras, this.ventas);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Ejemplar))
+      return false;
+    Ejemplar ejemplar = (Ejemplar) o;
+    return Objects.equals(this.id, ejemplar.id) &&
+        Objects.equals(this.serie, ejemplar.serie) &&
+        Objects.equals(this.libro, ejemplar.libro) &&
+        Objects.equals(this.estado, ejemplar.estado) &&
+        Objects.equals(this.arriendos, ejemplar.arriendos) &&
+        Objects.equals(this.compras, ejemplar.compras) &&
+        Objects.equals(this.ventas, ejemplar.ventas);
+  }
+
   @Override
   public String toString() {
     return this.serie + " " + this.estado.getNombre();
diff --git a/src/main/java/xyz/danielcortes/models/Empresa.java b/src/main/java/xyz/danielcortes/models/Empresa.java
index ae9cd41..3b4c467 100644
--- a/src/main/java/xyz/danielcortes/models/Empresa.java
+++ b/src/main/java/xyz/danielcortes/models/Empresa.java
@@ -2,6 +2,7 @@ package xyz.danielcortes.models;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -52,6 +53,23 @@ public class Empresa {
     this.distribuidores = distribuidores;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.nombre, this.distribuidores);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Empresa))
+      return false;
+    Empresa empresa = (Empresa) o;
+    return Objects.equals(this.id, empresa.id) &&
+        Objects.equals(this.nombre, empresa.nombre) &&
+        Objects.equals(this.distribuidores, empresa.distribuidores);
+  }
+
   @Override
   public String toString() {
     return this.nombre;
diff --git a/src/main/java/xyz/danielcortes/models/Estado.java b/src/main/java/xyz/danielcortes/models/Estado.java
index 94262f9..38a8af0 100644
--- a/src/main/java/xyz/danielcortes/models/Estado.java
+++ b/src/main/java/xyz/danielcortes/models/Estado.java
@@ -1,6 +1,7 @@
 package xyz.danielcortes.models;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -52,6 +53,23 @@ public class Estado {
     this.ejemplares = ejemplares;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.nombre, this.ejemplares);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Estado))
+      return false;
+    Estado estado = (Estado) o;
+    return Objects.equals(this.id, estado.id) &&
+        Objects.equals(this.nombre, estado.nombre) &&
+        Objects.equals(this.ejemplares, estado.ejemplares);
+  }
+
   @Override
   public String toString() {
     return this.nombre;
diff --git a/src/main/java/xyz/danielcortes/models/Factura.java b/src/main/java/xyz/danielcortes/models/Factura.java
new file mode 100644
index 0000000..f15e57a
--- /dev/null
+++ b/src/main/java/xyz/danielcortes/models/Factura.java
@@ -0,0 +1,108 @@
+package xyz.danielcortes.models;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "factura")
+public class Factura {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  private Integer id;
+
+  @Column(name = "folio")
+  private String folio;
+
+  @Column(name = "precio_neto")
+  private Integer precioNeto;
+
+  @Column(name = "precio_iva")
+  private Integer precioIVA;
+
+  @Column(name = "fecha_compra")
+  private LocalDate fechaVenta;
+
+  @OneToMany(mappedBy = "factura")
+  private List<Compra> compras;
+
+  public Integer getId() {
+    return this.id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getFolio() {
+    return this.folio;
+  }
+
+  public void setFolio(String folio) {
+    this.folio = folio;
+  }
+
+  public Integer getPrecioNeto() {
+    return this.precioNeto;
+  }
+
+  public void setPrecioNeto(Integer precioNeto) {
+    this.precioNeto = precioNeto;
+  }
+
+  public Integer getPrecioIVA() {
+    return this.precioIVA;
+  }
+
+  public void setPrecioIVA(Integer precioIVA) {
+    this.precioIVA = precioIVA;
+  }
+
+  public LocalDate getFechaVenta() {
+    return this.fechaVenta;
+  }
+
+  public void setFechaVenta(LocalDate fechaVenta) {
+    this.fechaVenta = fechaVenta;
+  }
+
+  public List<Compra> getCompras() {
+    if (this.compras == null)
+      this.compras = new ArrayList<>();
+    return this.compras;
+  }
+
+  public void setCompras(List<Compra> compras) {
+    this.compras = compras;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.folio, this.precioNeto, this.precioIVA, this.fechaVenta, this.compras);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Factura))
+      return false;
+    Factura factura = (Factura) o;
+    return Objects.equals(this.id, factura.id) &&
+        Objects.equals(this.folio, factura.folio) &&
+        Objects.equals(this.precioNeto, factura.precioNeto) &&
+        Objects.equals(this.precioIVA, factura.precioIVA) &&
+        Objects.equals(this.fechaVenta, factura.fechaVenta) &&
+        Objects.equals(this.compras, factura.compras);
+  }
+}
diff --git a/src/main/java/xyz/danielcortes/models/Idioma.java b/src/main/java/xyz/danielcortes/models/Idioma.java
index fcbc889..0db8747 100644
--- a/src/main/java/xyz/danielcortes/models/Idioma.java
+++ b/src/main/java/xyz/danielcortes/models/Idioma.java
@@ -1,7 +1,8 @@
 package xyz.danielcortes.models;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -23,7 +24,7 @@ public class Idioma {
   private String nombre;
 
   @ManyToMany(mappedBy = "idiomas")
-  private Set<Libro> libros;
+  private List<Libro> libros;
 
   public Integer getId() {
     return this.id;
@@ -41,17 +42,34 @@ public class Idioma {
     this.nombre = nombre;
   }
 
-  public Set<Libro> getLibros() {
+  public List<Libro> getLibros() {
     if (this.libros == null) {
-      this.libros = new HashSet<>();
+      this.libros = new ArrayList<>();
     }
     return this.libros;
   }
 
-  public void setLibros(Set<Libro> libros) {
+  public void setLibros(List<Libro> libros) {
     this.libros = libros;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.nombre, this.libros);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Idioma))
+      return false;
+    Idioma idioma = (Idioma) o;
+    return Objects.equals(this.id, idioma.id) &&
+        Objects.equals(this.nombre, idioma.nombre) &&
+        Objects.equals(this.libros, idioma.libros);
+  }
+
   @Override
   public String toString() {
     return this.nombre;
diff --git a/src/main/java/xyz/danielcortes/models/Libro.java b/src/main/java/xyz/danielcortes/models/Libro.java
index 4408112..20ab69a 100644
--- a/src/main/java/xyz/danielcortes/models/Libro.java
+++ b/src/main/java/xyz/danielcortes/models/Libro.java
@@ -1,8 +1,9 @@
 package xyz.danielcortes.models;
 
 import java.time.Year;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -48,7 +49,7 @@ public class Libro {
       joinColumns = @JoinColumn(name = "libro_id", referencedColumnName = "id"),
       inverseJoinColumns = @JoinColumn(name = "idioma_id", referencedColumnName = "id")
   )
-  private Set<Idioma> idiomas;
+  private List<Idioma> idiomas;
 
   @ManyToMany
   @JoinTable(
@@ -56,7 +57,7 @@ public class Libro {
       joinColumns = @JoinColumn(name = "libro_id", referencedColumnName = "id"),
       inverseJoinColumns = @JoinColumn(name = "autor_id", referencedColumnName = "id")
   )
-  private Set<Autor> autores;
+  private List<Autor> autores;
 
   @ManyToMany
   @JoinTable(
@@ -64,14 +65,14 @@ public class Libro {
       joinColumns = @JoinColumn(name = "libro_id", referencedColumnName = "id"),
       inverseJoinColumns = @JoinColumn(name = "categoria_id", referencedColumnName = "id")
   )
-  private Set<Categoria> categorias;
+  private List<Categoria> categorias;
 
   @ManyToOne
   @JoinColumn(name = "editorial_id")
   private Editorial editorial;
 
   @OneToMany(mappedBy = "libro")
-  private Set<Ejemplar> ejemplares;
+  private List<Ejemplar> ejemplares;
 
   public Integer getId() {
     return this.id;
@@ -121,34 +122,34 @@ public class Libro {
     this.anoPublicacion = anoPublicacion;
   }
 
-  public Set<Idioma> getIdiomas() {
+  public List<Idioma> getIdiomas() {
     if (this.idiomas == null)
-      this.idiomas = new HashSet<>();
+      this.idiomas = new ArrayList<>();
     return this.idiomas;
   }
 
-  public void setIdiomas(Set<Idioma> idiomas) {
+  public void setIdiomas(List<Idioma> idiomas) {
     this.idiomas = idiomas;
   }
 
-  public Set<Autor> getAutores() {
+  public List<Autor> getAutores() {
     if (this.autores == null)
-      this.autores = new HashSet<>();
+      this.autores = new ArrayList<>();
     return this.autores;
   }
 
-  public void setAutores(Set<Autor> autores) {
+  public void setAutores(List<Autor> autores) {
     this.autores = autores;
   }
 
-  public Set<Categoria> getCategorias() {
+  public List<Categoria> getCategorias() {
     if (this.categorias == null)
-      this.categorias = new HashSet<>();
+      this.categorias = new ArrayList<>();
 
     return this.categorias;
   }
 
-  public void setCategorias(Set<Categoria> categorias) {
+  public void setCategorias(List<Categoria> categorias) {
     this.categorias = categorias;
   }
 
@@ -160,21 +161,40 @@ public class Libro {
     this.editorial = editorial;
   }
 
-  public Set<Ejemplar> getEjemplares() {
+  public List<Ejemplar> getEjemplares() {
     if (this.ejemplares == null)
-      this.ejemplares = new HashSet<>();
+      this.ejemplares = new ArrayList<>();
     return this.ejemplares;
   }
 
-  public void setEjemplares(Set<Ejemplar> ejemplar) {
+  public void setEjemplares(List<Ejemplar> ejemplar) {
     this.ejemplares = ejemplar;
   }
 
-  public void addEjemplar(Ejemplar ejemplar) {
-    this.ejemplares.add(ejemplar);
-    if (ejemplar.getLibro() != this) {
-      ejemplar.setLibro(this);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.isbn, this.titulo, this.numeroPaginas, this.precioReferencia, this.anoPublicacion, this.idiomas, this.autores,
+        this.categorias, this.editorial, this.ejemplares);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Libro))
+      return false;
+    Libro libro = (Libro) o;
+    return this.numeroPaginas == libro.numeroPaginas &&
+        this.precioReferencia == libro.precioReferencia &&
+        Objects.equals(this.id, libro.id) &&
+        Objects.equals(this.isbn, libro.isbn) &&
+        Objects.equals(this.titulo, libro.titulo) &&
+        Objects.equals(this.anoPublicacion, libro.anoPublicacion) &&
+        Objects.equals(this.idiomas, libro.idiomas) &&
+        Objects.equals(this.autores, libro.autores) &&
+        Objects.equals(this.categorias, libro.categorias) &&
+        Objects.equals(this.editorial, libro.editorial) &&
+        Objects.equals(this.ejemplares, libro.ejemplares);
   }
 
   @Override
diff --git a/src/main/java/xyz/danielcortes/models/Telefono.java b/src/main/java/xyz/danielcortes/models/Telefono.java
index a1fcd5a..91586e2 100644
--- a/src/main/java/xyz/danielcortes/models/Telefono.java
+++ b/src/main/java/xyz/danielcortes/models/Telefono.java
@@ -2,6 +2,7 @@ package xyz.danielcortes.models;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -94,4 +95,23 @@ public class Telefono {
   public void setClientes(List<Cliente> clientes) {
     this.clientes = clientes;
   }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.numero, this.trabajadores, this.distribuidores, this.clientes);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Telefono))
+      return false;
+    Telefono telefono = (Telefono) o;
+    return Objects.equals(this.id, telefono.id) &&
+        Objects.equals(this.numero, telefono.numero) &&
+        Objects.equals(this.trabajadores, telefono.trabajadores) &&
+        Objects.equals(this.distribuidores, telefono.distribuidores) &&
+        Objects.equals(this.clientes, telefono.clientes);
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/models/Trabajador.java b/src/main/java/xyz/danielcortes/models/Trabajador.java
index 5444ef7..4a9c4e3 100644
--- a/src/main/java/xyz/danielcortes/models/Trabajador.java
+++ b/src/main/java/xyz/danielcortes/models/Trabajador.java
@@ -10,6 +10,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
@@ -48,6 +49,12 @@ public class Trabajador {
   @ManyToMany(mappedBy = "trabajadores")
   private List<Direccion> direcciones;
 
+  @OneToMany(mappedBy = "trabajador")
+  private List<Venta> ventas;
+
+  @OneToMany(mappedBy = "trabajador")
+  private List<Arriendo> arriendos;
+
   public Integer getId() {
     return this.id;
   }
@@ -134,6 +141,33 @@ public class Trabajador {
     this.direcciones = direcciones;
   }
 
+  public List<Venta> getVentas() {
+    if (this.ventas == null)
+      this.ventas = new ArrayList<>();
+    return this.ventas;
+  }
+
+  public void setVentas(List<Venta> ventas) {
+    this.ventas = ventas;
+  }
+
+  public List<Arriendo> getArriendos() {
+    if (this.arriendos == null)
+      this.arriendos = new ArrayList<>();
+    return this.arriendos;
+  }
+
+  public void setArriendos(List<Arriendo> arriendos) {
+    this.arriendos = arriendos;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects
+        .hash(this.id, this.rut, this.nombre, this.apellidoPaterno, this.apellidoMaterno, this.fechaContrato, this.usuario, this.correos,
+            this.telefonos, this.direcciones, this.ventas, this.arriendos);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o)
@@ -149,13 +183,10 @@ public class Trabajador {
         Objects.equals(this.fechaContrato, that.fechaContrato) &&
         Objects.equals(this.usuario, that.usuario) &&
         Objects.equals(this.correos, that.correos) &&
-        Objects.equals(this.telefonos, that.telefonos);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(this.id, this.rut, this.nombre, this.apellidoPaterno, this.apellidoMaterno, this.fechaContrato, this.usuario, this.correos,
-        this.telefonos);
+        Objects.equals(this.telefonos, that.telefonos) &&
+        Objects.equals(this.direcciones, that.direcciones) &&
+        Objects.equals(this.ventas, that.ventas) &&
+        Objects.equals(this.arriendos, that.arriendos);
   }
 }
 
diff --git a/src/main/java/xyz/danielcortes/models/Usuario.java b/src/main/java/xyz/danielcortes/models/Usuario.java
index e873167..8c55fd8 100644
--- a/src/main/java/xyz/danielcortes/models/Usuario.java
+++ b/src/main/java/xyz/danielcortes/models/Usuario.java
@@ -1,5 +1,7 @@
 package xyz.danielcortes.models;
 
+import java.util.Arrays;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -69,4 +71,26 @@ public class Usuario {
   public void setTrabajador(Trabajador trabajador) {
     this.trabajador = trabajador;
   }
+
+  @Override
+  public int hashCode() {
+    int result = Objects.hash(this.id, this.nombre, this.trabajador);
+    result = 31 * result + Arrays.hashCode(this.password);
+    result = 31 * result + Arrays.hashCode(this.salt);
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Usuario))
+      return false;
+    Usuario usuario = (Usuario) o;
+    return Objects.equals(this.id, usuario.id) &&
+        Objects.equals(this.nombre, usuario.nombre) &&
+        Arrays.equals(this.password, usuario.password) &&
+        Arrays.equals(this.salt, usuario.salt) &&
+        Objects.equals(this.trabajador, usuario.trabajador);
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/models/Venta.java b/src/main/java/xyz/danielcortes/models/Venta.java
new file mode 100644
index 0000000..e23eb3a
--- /dev/null
+++ b/src/main/java/xyz/danielcortes/models/Venta.java
@@ -0,0 +1,105 @@
+package xyz.danielcortes.models;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "venta")
+public class Venta {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id", nullable = false)
+  private Integer id;
+
+  @ManyToOne
+  @JoinColumn(name = "cliente_id")
+  private Cliente cliente;
+
+  @ManyToOne
+  @JoinColumn(name = "trabajador_id")
+  private Trabajador trabajador;
+
+  @ManyToOne
+  @JoinColumn(name = "boleta_id")
+  private Boleta boleta;
+
+  @ManyToMany
+  @JoinTable(
+      name = "ejemplar_venta",
+      joinColumns = @JoinColumn(name = "venta_id", referencedColumnName = "id"),
+      inverseJoinColumns = @JoinColumn(name = "ejemplar_id", referencedColumnName = "id"))
+  private List<Ejemplar> ejemplares;
+
+  public Integer getId() {
+    return this.id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Cliente getCliente() {
+    return this.cliente;
+  }
+
+  public void setCliente(Cliente cliente) {
+    this.cliente = cliente;
+  }
+
+  public Trabajador getTrabajador() {
+    return this.trabajador;
+  }
+
+  public void setTrabajador(Trabajador trabajador) {
+    this.trabajador = trabajador;
+  }
+
+  public Boleta getBoleta() {
+    return this.boleta;
+  }
+
+  public void setBoleta(Boleta boleta) {
+    this.boleta = boleta;
+  }
+
+  public List<Ejemplar> getEjemplares() {
+    if (this.ejemplares == null)
+      this.ejemplares = new ArrayList<>();
+    return this.ejemplares;
+  }
+
+  public void setEjemplares(List<Ejemplar> ejemplares) {
+    this.ejemplares = ejemplares;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.id, this.cliente, this.trabajador, this.boleta, this.ejemplares);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (!(o instanceof Venta))
+      return false;
+    Venta venta = (Venta) o;
+    return Objects.equals(this.id, venta.id) &&
+        Objects.equals(this.cliente, venta.cliente) &&
+        Objects.equals(this.trabajador, venta.trabajador) &&
+        Objects.equals(this.boleta, venta.boleta) &&
+        Objects.equals(this.ejemplares, venta.ejemplares);
+  }
+}
diff --git a/src/main/java/xyz/danielcortes/views/autor/AutorCreatePanel.java b/src/main/java/xyz/danielcortes/views/autor/AutorCreatePanel.java
index 866f31c..c87791f 100644
--- a/src/main/java/xyz/danielcortes/views/autor/AutorCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/autor/AutorCreatePanel.java
@@ -21,6 +21,13 @@ public class AutorCreatePanel extends BasePanel {
   private JPanel contentPane;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTextField getNombreField() {
     return this.nombreField;
   }
@@ -46,13 +53,6 @@ public class AutorCreatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/autor/AutorSearchPanel.java b/src/main/java/xyz/danielcortes/views/autor/AutorSearchPanel.java
index b964d43..97f701f 100644
--- a/src/main/java/xyz/danielcortes/views/autor/AutorSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/autor/AutorSearchPanel.java
@@ -27,6 +27,13 @@ public class AutorSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Autor> autorModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -60,41 +67,10 @@ public class AutorSearchPanel extends BasePanel {
     return this.crearButton;
   }
 
-
   public BaseTableModel<Autor> getAutorModel() {
     return this.autorModel;
   }
 
-  private void createUIComponents() {
-    this.createAutorTable();
-  }
-
-  private void createAutorTable() {
-    // @formatter:off
-    this.autorModel = new BaseTableModel<>(
-        new String[]{"Nombre", "Apellido Paterno", "Apellido Materno", "Nº Libros"},
-        (row, rowIndex, colIndex) -> {
-          switch (colIndex) {
-            case 0: return row.get(rowIndex).getNombre();
-            case 1: return row.get(rowIndex).getApellidoPaterno();
-            case 2: return row.get(rowIndex).getApellidoMaterno();
-            case 3: return row.get(rowIndex).getLibros().size();
-            default: return null;
-          }
-        }
-    );
-    // @formatter:on
-    this.autorTable = new JTable(this.autorModel);
-    this.autorTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -145,6 +121,29 @@ public class AutorSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createAutorTable();
+  }
+
+  private void createAutorTable() {
+    // @formatter:off
+    this.autorModel = new BaseTableModel<>(
+        new String[]{"Nombre", "Apellido Paterno", "Apellido Materno", "Nº Libros"},
+        (row, rowIndex, colIndex) -> {
+          switch (colIndex) {
+            case 0: return row.get(rowIndex).getNombre();
+            case 1: return row.get(rowIndex).getApellidoPaterno();
+            case 2: return row.get(rowIndex).getApellidoMaterno();
+            case 3: return row.get(rowIndex).getLibros().size();
+            default: return null;
+          }
+        }
+    );
+    // @formatter:on
+    this.autorTable = new JTable(this.autorModel);
+    this.autorTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/autor/AutorUpdatePanel.java b/src/main/java/xyz/danielcortes/views/autor/AutorUpdatePanel.java
index c97c149..a2d6d38 100644
--- a/src/main/java/xyz/danielcortes/views/autor/AutorUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/autor/AutorUpdatePanel.java
@@ -21,6 +21,13 @@ public class AutorUpdatePanel extends BasePanel {
   private JPanel contentPane;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTextField getNombreField() {
     return this.nombreField;
   }
@@ -46,14 +53,6 @@ public class AutorUpdatePanel extends BasePanel {
     return this.contentPane;
   }
 
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java b/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java
index 0a64ea1..5616b62 100644
--- a/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java
@@ -20,6 +20,13 @@ public class AutorViewPanel extends BasePanel {
   private JButton volverButton;
   private JPanel contentPane;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -41,13 +48,6 @@ public class AutorViewPanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java
index 5c1aa73..96fd68e 100644
--- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java
@@ -19,6 +19,13 @@ public class CategoriaCreatePanel extends BasePanel {
   private JTextField nombreField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JButton getGuardarButton() {
     return this.guardarButton;
   }
@@ -36,13 +43,6 @@ public class CategoriaCreatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java
index fb1536c..b30343d 100644
--- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java
@@ -27,6 +27,13 @@ public class CategoriaSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Categoria> categoriaModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -64,34 +71,6 @@ public class CategoriaSearchPanel extends BasePanel {
     return this.crearButton;
   }
 
-  private void createUIComponents() {
-    this.createCategoriaTable();
-  }
-
-  private void createCategoriaTable() {
-    // @formatter:off
-    this.categoriaModel = new BaseTableModel<>(
-        new String[]{"Nombre", "Nº Libros"},
-        (row, rowIndex, colIndex) -> {
-          switch (colIndex) {
-            case 0: return row.get(rowIndex).getNombre();
-            case 1: return row.get(rowIndex).getLibros().size();
-            default: return null;
-          }
-        }
-    );
-    // @formatter:on
-    this.categoriaTable = new JTable(this.categoriaModel);
-    this.categoriaTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -147,6 +126,27 @@ public class CategoriaSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createCategoriaTable();
+  }
+
+  private void createCategoriaTable() {
+    // @formatter:off
+    this.categoriaModel = new BaseTableModel<>(
+        new String[]{"Nombre", "Nº Libros"},
+        (row, rowIndex, colIndex) -> {
+          switch (colIndex) {
+            case 0: return row.get(rowIndex).getNombre();
+            case 1: return row.get(rowIndex).getLibros().size();
+            default: return null;
+          }
+        }
+    );
+    // @formatter:on
+    this.categoriaTable = new JTable(this.categoriaModel);
+    this.categoriaTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java
index a38df2e..65e15cd 100644
--- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java
@@ -19,6 +19,13 @@ public class CategoriaUpdatePanel extends BasePanel {
   private JButton updateButton;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -36,14 +43,6 @@ public class CategoriaUpdatePanel extends BasePanel {
     return this.volverButton;
   }
 
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java
index fd770f7..87316b4 100644
--- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java
@@ -18,6 +18,13 @@ public class CategoriaViewPanel extends BasePanel {
   private JTextField nombreField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class CategoriaViewPanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/cliente/ClienteCreatePanel.java b/src/main/java/xyz/danielcortes/views/cliente/ClienteCreatePanel.java
index 5f992b0..bf9827f 100644
--- a/src/main/java/xyz/danielcortes/views/cliente/ClienteCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/cliente/ClienteCreatePanel.java
@@ -24,6 +24,13 @@ public class ClienteCreatePanel extends BasePanel {
   private JTextField rutField;
   private DatePicker fechaNacimientoPicker;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -57,13 +64,6 @@ public class ClienteCreatePanel extends BasePanel {
     return this.fechaNacimientoPicker;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/cliente/ClienteSearchPanel.java b/src/main/java/xyz/danielcortes/views/cliente/ClienteSearchPanel.java
index 3734f02..1bcc722 100644
--- a/src/main/java/xyz/danielcortes/views/cliente/ClienteSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/cliente/ClienteSearchPanel.java
@@ -27,6 +27,13 @@ public class ClienteSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Cliente> clienteModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -64,37 +71,6 @@ public class ClienteSearchPanel extends BasePanel {
     return this.clienteModel;
   }
 
-  private void createUIComponents() {
-    this.createClienteTable();
-  }
-
-  private void createClienteTable() {
-    // @formatter:off
-    this.clienteModel= new BaseTableModel<>(
-        new String[]{"Rut", "Nombre", "Apellido Paterno", "Apellido Materno", "Fecha Nacimiento"},
-        (row, rowIndex, colIndex) -> {
-          switch (colIndex) {
-            case 0: return row.get(rowIndex).getRut();
-            case 1: return row.get(rowIndex).getNombre();
-            case 2: return row.get(rowIndex).getApellidoPaterno();
-            case 3: return row.get(rowIndex).getApellidoMaterno();
-            case 4: return row.get(rowIndex).getFechaNacimiento();
-            default: return null;
-          }
-        }
-    );
-    // @formatter:on
-    this.clienteTable = new JTable(this.clienteModel);
-    this.clienteTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -145,6 +121,30 @@ public class ClienteSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createClienteTable();
+  }
+
+  private void createClienteTable() {
+    // @formatter:off
+    this.clienteModel= new BaseTableModel<>(
+        new String[]{"Rut", "Nombre", "Apellido Paterno", "Apellido Materno", "Fecha Nacimiento"},
+        (row, rowIndex, colIndex) -> {
+          switch (colIndex) {
+            case 0: return row.get(rowIndex).getRut();
+            case 1: return row.get(rowIndex).getNombre();
+            case 2: return row.get(rowIndex).getApellidoPaterno();
+            case 3: return row.get(rowIndex).getApellidoMaterno();
+            case 4: return row.get(rowIndex).getFechaNacimiento();
+            default: return null;
+          }
+        }
+    );
+    // @formatter:on
+    this.clienteTable = new JTable(this.clienteModel);
+    this.clienteTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/cliente/ClienteUpdatePanel.java b/src/main/java/xyz/danielcortes/views/cliente/ClienteUpdatePanel.java
index 3014f8e..68f0aed 100644
--- a/src/main/java/xyz/danielcortes/views/cliente/ClienteUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/cliente/ClienteUpdatePanel.java
@@ -24,6 +24,13 @@ public class ClienteUpdatePanel extends BasePanel {
   private JTextField rutField;
   private DatePicker fechaNacimientoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTextField getNombreField() {
     return this.nombreField;
   }
@@ -57,13 +64,6 @@ public class ClienteUpdatePanel extends BasePanel {
     return this.fechaNacimientoField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java b/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java
index 8e4b015..6ca344c 100644
--- a/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java
@@ -25,6 +25,13 @@ public class ClienteViewPanel extends BasePanel {
   private JButton telefonosButton;
   private JTextField fechaNacimientoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTextField getNombreField() {
     return this.nombreField;
   }
@@ -66,13 +73,6 @@ public class ClienteViewPanel extends BasePanel {
     return this.telefonosButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/correo/CorreoCreatePanel.java b/src/main/java/xyz/danielcortes/views/correo/CorreoCreatePanel.java
index 9fa70b3..ff2b78d 100644
--- a/src/main/java/xyz/danielcortes/views/correo/CorreoCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/correo/CorreoCreatePanel.java
@@ -19,6 +19,13 @@ public class CorreoCreatePanel extends BasePanel {
   private JButton volverButton;
   private JTextField correoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JButton getGuardarButton() {
     return this.guardarButton;
   }
@@ -36,13 +43,6 @@ public class CorreoCreatePanel extends BasePanel {
     return this.correoField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/correo/CorreoSearchPanel.java b/src/main/java/xyz/danielcortes/views/correo/CorreoSearchPanel.java
index b8cc0d7..c4020e1 100644
--- a/src/main/java/xyz/danielcortes/views/correo/CorreoSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/correo/CorreoSearchPanel.java
@@ -28,6 +28,13 @@ public class CorreoSearchPanel extends BasePanel {
   private JButton volverButton;
   private BaseTableModel<Correo> correoModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -69,33 +76,6 @@ public class CorreoSearchPanel extends BasePanel {
     return this.correoModel;
   }
 
-  private void createUIComponents() {
-    this.creatCorreoTable();
-  }
-
-  private void creatCorreoTable() {
-    // @formatter:off
-    this.correoModel = new BaseTableModel<>(
-        new String[]{"Correo"},
-        (row, rowIndex, colIndex) -> {
-          switch (colIndex) {
-            case 0: return row.get(rowIndex).getCorreo();
-            default: return null;
-          }
-        }
-    );
-    // @formatter:on
-    this.correosTable = new JTable(this.correoModel);
-    this.correosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -156,6 +136,26 @@ public class CorreoSearchPanel extends BasePanel {
             GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.creatCorreoTable();
+  }
+
+  private void creatCorreoTable() {
+    // @formatter:off
+    this.correoModel = new BaseTableModel<>(
+        new String[]{"Correo"},
+        (row, rowIndex, colIndex) -> {
+          switch (colIndex) {
+            case 0: return row.get(rowIndex).getCorreo();
+            default: return null;
+          }
+        }
+    );
+    // @formatter:on
+    this.correosTable = new JTable(this.correoModel);
+    this.correosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/correo/CorreoUpdatePanel.java b/src/main/java/xyz/danielcortes/views/correo/CorreoUpdatePanel.java
index 64e78e2..3a98082 100644
--- a/src/main/java/xyz/danielcortes/views/correo/CorreoUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/correo/CorreoUpdatePanel.java
@@ -19,6 +19,13 @@ public class CorreoUpdatePanel extends BasePanel {
   private JButton volverButton;
   private JTextField correoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JButton getActualizarButton() {
     return this.actualizarButton;
   }
@@ -36,13 +43,6 @@ public class CorreoUpdatePanel extends BasePanel {
     return this.correoField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -94,4 +94,5 @@ public class CorreoUpdatePanel extends BasePanel {
   public JComponent $$$getRootComponent$$$() {
     return contentPane;
   }
+
 }
diff --git a/src/main/java/xyz/danielcortes/views/correo/CorreoViewPanel.java b/src/main/java/xyz/danielcortes/views/correo/CorreoViewPanel.java
index f1f24ad..eaae55c 100644
--- a/src/main/java/xyz/danielcortes/views/correo/CorreoViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/correo/CorreoViewPanel.java
@@ -18,6 +18,13 @@ public class CorreoViewPanel extends BasePanel {
   private JButton volverButton;
   private JTextField correoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class CorreoViewPanel extends BasePanel {
     return this.correoField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -85,4 +85,5 @@ public class CorreoViewPanel extends BasePanel {
   public JComponent $$$getRootComponent$$$() {
     return contentPane;
   }
+
 }
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.form b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.form
index 05c55d4..288a474 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.form
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.DistribuidorCreatePanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.distribuidor.DistribuidorCreatePanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.java b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.java
index 2400679..af119bb 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorCreatePanel.java
@@ -24,6 +24,13 @@ public class DistribuidorCreatePanel extends BasePanel {
   private JComboBox<Empresa> empresaCombobox;
   private DefaultComboBoxModel<Empresa> empresaModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -49,13 +56,6 @@ public class DistribuidorCreatePanel extends BasePanel {
     return this.empresaModel;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -109,15 +109,15 @@ public class DistribuidorCreatePanel extends BasePanel {
         GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.empresaModel = new DefaultComboBoxModel<>();
+    this.empresaCombobox = new JComboBox<>(this.empresaModel);
+  }
+
   /**
    * @noinspection ALL
    */
   public JComponent $$$getRootComponent$$$() {
     return contentPane;
   }
-
-  private void createUIComponents() {
-    this.empresaModel = new DefaultComboBoxModel<>();
-    this.empresaCombobox = new JComboBox<>(this.empresaModel);
-  }
 }
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.form b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.form
index 160478e..fc14c56 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.form
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.DistribuidorSearchPanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.distribuidor.DistribuidorSearchPanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.java b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.java
index f0bc6db..bdf7bf8 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorSearchPanel.java
@@ -27,6 +27,13 @@ public class DistribuidorSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Distribuidor> distribuidorModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -64,34 +71,6 @@ public class DistribuidorSearchPanel extends BasePanel {
     return this.distribuidorModel;
   }
 
-  private void createUIComponents() {
-    this.createDistribuidorTable();
-  }
-
-  private void createDistribuidorTable() {
-    // @formatter:off
-    this.distribuidorModel= new BaseTableModel<>(
-        new String[]{"Rut", "Empresa"},
-        (row, rowIndex, colIndex) -> {
-          switch (colIndex) {
-            case 0: return row.get(rowIndex).getRut();
-            case 1: return row.get(rowIndex).getEmpresa().getNombre();
-            default: return null;
-          }
-        }
-    );
-    // @formatter:on
-    this.distribuidorTable = new JTable(this.distribuidorModel);
-    this.distribuidorTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -142,6 +121,27 @@ public class DistribuidorSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createDistribuidorTable();
+  }
+
+  private void createDistribuidorTable() {
+    // @formatter:off
+    this.distribuidorModel= new BaseTableModel<>(
+        new String[]{"Rut", "Empresa"},
+        (row, rowIndex, colIndex) -> {
+          switch (colIndex) {
+            case 0: return row.get(rowIndex).getRut();
+            case 1: return row.get(rowIndex).getEmpresa().getNombre();
+            default: return null;
+          }
+        }
+    );
+    // @formatter:on
+    this.distribuidorTable = new JTable(this.distribuidorModel);
+    this.distribuidorTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.form b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.form
index cb5c79a..758919b 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.form
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.DistribuidorUpdatePanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.distribuidor.DistribuidorUpdatePanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.java b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.java
index c16e180..5bd8920 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorUpdatePanel.java
@@ -24,6 +24,13 @@ public class DistribuidorUpdatePanel extends BasePanel {
   private JComboBox<Empresa> empresaCombobox;
   private DefaultComboBoxModel<Empresa> empresaModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -49,13 +56,6 @@ public class DistribuidorUpdatePanel extends BasePanel {
     return this.empresaModel;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -109,15 +109,15 @@ public class DistribuidorUpdatePanel extends BasePanel {
         GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.empresaModel = new DefaultComboBoxModel<>();
+    this.empresaCombobox = new JComboBox<>(this.empresaModel);
+  }
+
   /**
    * @noinspection ALL
    */
   public JComponent $$$getRootComponent$$$() {
     return contentPane;
   }
-
-  private void createUIComponents() {
-    this.empresaModel = new DefaultComboBoxModel<>();
-    this.empresaCombobox = new JComboBox<>(this.empresaModel);
-  }
 }
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.form b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.form
index df84963..60e9fd5 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.form
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.DistribuidorViewPanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.distribuidor.DistribuidorViewPanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="7" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
diff --git a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.java b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.java
index a6b2adf..f84f07f 100644
--- a/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/distribuidor/DistribuidorViewPanel.java
@@ -22,6 +22,13 @@ public class DistribuidorViewPanel extends BasePanel {
   private JButton correosButton;
   private JButton telefonosButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -51,13 +58,6 @@ public class DistribuidorViewPanel extends BasePanel {
     return this.telefonosButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/editorial/EditorialCreatePanel.java b/src/main/java/xyz/danielcortes/views/editorial/EditorialCreatePanel.java
index 079e066..f2b311f 100644
--- a/src/main/java/xyz/danielcortes/views/editorial/EditorialCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/editorial/EditorialCreatePanel.java
@@ -19,6 +19,13 @@ public class EditorialCreatePanel extends BasePanel {
   private JButton guardarButton;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -36,13 +43,6 @@ public class EditorialCreatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/editorial/EditorialSearchPanel.java b/src/main/java/xyz/danielcortes/views/editorial/EditorialSearchPanel.java
index cc7f768..281605c 100644
--- a/src/main/java/xyz/danielcortes/views/editorial/EditorialSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/editorial/EditorialSearchPanel.java
@@ -26,6 +26,13 @@ public class EditorialSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Editorial> editorialModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -63,33 +70,6 @@ public class EditorialSearchPanel extends BasePanel {
     return this.crearButton;
   }
 
-  private void createUIComponents() {
-    this.createEditorialTable();
-  }
-
-  private void createEditorialTable() {
-    // @formatter:off
-    this.editorialModel = new BaseTableModel<>(
-        new String[]{"Nombre", "Nº Libros"},
-        (row, rowIndex, colIndex) -> {
-          switch(colIndex) {
-            case 0: return row.get(rowIndex).getNombre();
-            case 1: return row.get(rowIndex).getLibros().size();
-            default: return null;
-          }
-        }
-    );
-    this.editorialTable = new JTable(this.editorialModel);
-    // @formatter:on
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -145,6 +125,26 @@ public class EditorialSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createEditorialTable();
+  }
+
+  private void createEditorialTable() {
+    // @formatter:off
+    this.editorialModel = new BaseTableModel<>(
+        new String[]{"Nombre", "Nº Libros"},
+        (row, rowIndex, colIndex) -> {
+          switch(colIndex) {
+            case 0: return row.get(rowIndex).getNombre();
+            case 1: return row.get(rowIndex).getLibros().size();
+            default: return null;
+          }
+        }
+    );
+    this.editorialTable = new JTable(this.editorialModel);
+    // @formatter:on
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java b/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java
index b2bf0ed..058efc9 100644
--- a/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java
@@ -18,6 +18,13 @@ public class EditorialUpdatePanel extends BasePanel {
   private JTextField nombreField;
   private JButton actualizarButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class EditorialUpdatePanel extends BasePanel {
     return this.actualizarButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/editorial/EditorialViewPanel.java b/src/main/java/xyz/danielcortes/views/editorial/EditorialViewPanel.java
index 2444e8c..f1dc026 100644
--- a/src/main/java/xyz/danielcortes/views/editorial/EditorialViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/editorial/EditorialViewPanel.java
@@ -18,6 +18,13 @@ public class EditorialViewPanel extends BasePanel {
   private JTextField nombreField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class EditorialViewPanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -80,4 +80,5 @@ public class EditorialViewPanel extends BasePanel {
   public JComponent $$$getRootComponent$$$() {
     return contentPane;
   }
+
 }
diff --git a/src/main/java/xyz/danielcortes/views/empresa/EmpresaCreatePanel.java b/src/main/java/xyz/danielcortes/views/empresa/EmpresaCreatePanel.java
index 4a9eb77..b3efe82 100644
--- a/src/main/java/xyz/danielcortes/views/empresa/EmpresaCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/empresa/EmpresaCreatePanel.java
@@ -19,6 +19,13 @@ public class EmpresaCreatePanel extends BasePanel {
   private JButton guardarButton;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -36,13 +43,6 @@ public class EmpresaCreatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/empresa/EmpresaSearchPanel.java b/src/main/java/xyz/danielcortes/views/empresa/EmpresaSearchPanel.java
index b95e657..f0d3f69 100644
--- a/src/main/java/xyz/danielcortes/views/empresa/EmpresaSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/empresa/EmpresaSearchPanel.java
@@ -26,6 +26,13 @@ public class EmpresaSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Empresa> empresaModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -63,33 +70,6 @@ public class EmpresaSearchPanel extends BasePanel {
     return this.crearButton;
   }
 
-  private void createUIComponents() {
-    this.createEmpresaTable();
-  }
-
-  private void createEmpresaTable() {
-    // @formatter:off
-    this.empresaModel = new BaseTableModel<>(
-        new String[]{"Nombre", "Nº Distribuidores"},
-        (row, rowIndex, colIndex) -> {
-          switch(colIndex) {
-            case 0: return row.get(rowIndex).getNombre();
-            case 1: return row.get(rowIndex).getDistribuidores().size();
-            default: return null;
-          }
-        }
-    );
-    this.empresaTable = new JTable(this.empresaModel);
-    // @formatter:on
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -145,6 +125,26 @@ public class EmpresaSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createEmpresaTable();
+  }
+
+  private void createEmpresaTable() {
+    // @formatter:off
+    this.empresaModel = new BaseTableModel<>(
+        new String[]{"Nombre", "Nº Distribuidores"},
+        (row, rowIndex, colIndex) -> {
+          switch(colIndex) {
+            case 0: return row.get(rowIndex).getNombre();
+            case 1: return row.get(rowIndex).getDistribuidores().size();
+            default: return null;
+          }
+        }
+    );
+    this.empresaTable = new JTable(this.empresaModel);
+    // @formatter:on
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java b/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java
index c7bd82e..fd96d93 100644
--- a/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java
@@ -18,6 +18,13 @@ public class EmpresaUpdatePanel extends BasePanel {
   private JTextField nombreField;
   private JButton actualizarButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class EmpresaUpdatePanel extends BasePanel {
     return this.actualizarButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/empresa/EmpresaViewPanel.java b/src/main/java/xyz/danielcortes/views/empresa/EmpresaViewPanel.java
index a3d7d40..7643090 100644
--- a/src/main/java/xyz/danielcortes/views/empresa/EmpresaViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/empresa/EmpresaViewPanel.java
@@ -18,6 +18,13 @@ public class EmpresaViewPanel extends BasePanel {
   private JTextField nombreField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class EmpresaViewPanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -80,4 +80,5 @@ public class EmpresaViewPanel extends BasePanel {
   public JComponent $$$getRootComponent$$$() {
     return contentPane;
   }
+
 }
diff --git a/src/main/java/xyz/danielcortes/views/idioma/IdiomaCreatePanel.java b/src/main/java/xyz/danielcortes/views/idioma/IdiomaCreatePanel.java
index aa35e46..b330559 100644
--- a/src/main/java/xyz/danielcortes/views/idioma/IdiomaCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/idioma/IdiomaCreatePanel.java
@@ -19,6 +19,13 @@ public class IdiomaCreatePanel extends BasePanel {
   private JButton guardarButton;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -36,13 +43,6 @@ public class IdiomaCreatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/idioma/IdiomaSearchPanel.java b/src/main/java/xyz/danielcortes/views/idioma/IdiomaSearchPanel.java
index eace982..e237600 100644
--- a/src/main/java/xyz/danielcortes/views/idioma/IdiomaSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/idioma/IdiomaSearchPanel.java
@@ -27,6 +27,13 @@ public class IdiomaSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Idioma> idiomaTableModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -64,13 +71,6 @@ public class IdiomaSearchPanel extends BasePanel {
     return this.crearButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -126,13 +126,6 @@ public class IdiomaSearchPanel extends BasePanel {
         null, 0, false));
   }
 
-  /**
-   * @noinspection ALL
-   */
-  public JComponent $$$getRootComponent$$$() {
-    return contentPane;
-  }
-
   private void createUIComponents() {
     this.createIdiomaTable();
   }
@@ -153,4 +146,11 @@ public class IdiomaSearchPanel extends BasePanel {
     this.idiomaTable = new JTable(this.idiomaTableModel);
     this.idiomaTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
   }
+
+  /**
+   * @noinspection ALL
+   */
+  public JComponent $$$getRootComponent$$$() {
+    return contentPane;
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/views/idioma/IdiomaUpdatePanel.java b/src/main/java/xyz/danielcortes/views/idioma/IdiomaUpdatePanel.java
index b55e3eb..d92ef73 100644
--- a/src/main/java/xyz/danielcortes/views/idioma/IdiomaUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/idioma/IdiomaUpdatePanel.java
@@ -18,6 +18,13 @@ public class IdiomaUpdatePanel extends BasePanel {
   private JTextField nombreField;
   private JButton actualizarButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class IdiomaUpdatePanel extends BasePanel {
     return this.actualizarButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/idioma/IdiomaViewPanel.java b/src/main/java/xyz/danielcortes/views/idioma/IdiomaViewPanel.java
index c5d1d98..3ffe09d 100644
--- a/src/main/java/xyz/danielcortes/views/idioma/IdiomaViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/idioma/IdiomaViewPanel.java
@@ -18,6 +18,13 @@ public class IdiomaViewPanel extends BasePanel {
   private JTextField nombreField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class IdiomaViewPanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java
index 846e9a6..d3266f6 100644
--- a/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java
@@ -41,6 +41,13 @@ public class LibroCreatePanel extends BasePanel {
   private JTextField precioReferenciaField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -106,13 +113,6 @@ public class LibroCreatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -226,13 +226,6 @@ public class LibroCreatePanel extends BasePanel {
         null, 0, false));
   }
 
-  /**
-   * @noinspection ALL
-   */
-  public JComponent $$$getRootComponent$$$() {
-    return contentPane;
-  }
-
   private void createUIComponents() {
     this.createIdiomasList();
     this.createAutoresList();
@@ -262,4 +255,11 @@ public class LibroCreatePanel extends BasePanel {
     this.editorialModel = new DefaultComboBoxModel<>();
     this.editorialCombo = new JComboBox<>(this.editorialModel);
   }
+
+  /**
+   * @noinspection ALL
+   */
+  public JComponent $$$getRootComponent$$$() {
+    return contentPane;
+  }
 }
diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java
index 4b7a622..c9a9aba 100644
--- a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java
@@ -27,6 +27,13 @@ public class LibroSearchPanel extends BasePanel {
   private JButton eliminarButton;
   private JButton crearButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTable getLibrosTable() {
     return this.librosTable;
   }
@@ -64,36 +71,6 @@ public class LibroSearchPanel extends BasePanel {
     return this.crearButton;
   }
 
-  private void createUIComponents() {
-    this.createLibrosTable();
-  }
-
-  private void createLibrosTable() {
-    //@formatter:off
-    this.librosModel = new BaseTableModel<>(
-        new String[]{"ISBN", "Titulo", "Precio Referencial", "Stock"},
-        (rows, rowIndex, colIndex) -> {
-          switch(colIndex) {
-            case 0: return rows.get(rowIndex).getIsbn();
-            case 1: return rows.get(rowIndex).getTitulo();
-            case 2: return rows.get(rowIndex).getPrecioReferencia();
-            case 3: return rows.get(rowIndex).getEjemplares().size();
-            default: return null;
-          }
-        }
-    );
-    //@formatter:on
-    this.librosTable = new JTable(this.librosModel);
-    this.librosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -149,6 +126,29 @@ public class LibroSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createLibrosTable();
+  }
+
+  private void createLibrosTable() {
+    //@formatter:off
+    this.librosModel = new BaseTableModel<>(
+        new String[]{"ISBN", "Titulo", "Precio Referencial", "Stock"},
+        (rows, rowIndex, colIndex) -> {
+          switch(colIndex) {
+            case 0: return rows.get(rowIndex).getIsbn();
+            case 1: return rows.get(rowIndex).getTitulo();
+            case 2: return rows.get(rowIndex).getPrecioReferencia();
+            case 3: return rows.get(rowIndex).getEjemplares().size();
+            default: return null;
+          }
+        }
+    );
+    //@formatter:on
+    this.librosTable = new JTable(this.librosModel);
+    this.librosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java
index b3e8596..7bccf3a 100644
--- a/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java
@@ -40,6 +40,13 @@ public class LibroUpdatePanel extends BasePanel {
   private DefaultComboBoxModel<Editorial> editorialModel;
   private JButton actualizarButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -101,43 +108,6 @@ public class LibroUpdatePanel extends BasePanel {
     return this.actualizarButton;
   }
 
-  private void createUIComponents() {
-    this.createAutoresList();
-    this.createCategoriaList();
-    this.createEditorialCombo();
-    this.createIdiomasList();
-  }
-
-  private void createIdiomasList() {
-    this.idiomasModel = new DefaultListModel<>();
-    this.idiomasList = new JList<>(this.idiomasModel);
-    this.idiomasList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-  }
-
-  private void createAutoresList() {
-    this.autoresModel = new DefaultListModel<>();
-    this.autoresList = new JList<>(this.autoresModel);
-    this.autoresList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-  }
-
-  private void createCategoriaList() {
-    this.categoriasModel = new DefaultListModel<>();
-    this.categoriasList = new JList<>(this.categoriasModel);
-    this.categoriasList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-  }
-
-  private void createEditorialCombo() {
-    this.editorialModel = new DefaultComboBoxModel<>();
-    this.editorialCombo = new JComboBox<>(this.editorialModel);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -240,6 +210,36 @@ public class LibroUpdatePanel extends BasePanel {
             null, null, null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createAutoresList();
+    this.createCategoriaList();
+    this.createEditorialCombo();
+    this.createIdiomasList();
+  }
+
+  private void createAutoresList() {
+    this.autoresModel = new DefaultListModel<>();
+    this.autoresList = new JList<>(this.autoresModel);
+    this.autoresList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+  }
+
+  private void createCategoriaList() {
+    this.categoriasModel = new DefaultListModel<>();
+    this.categoriasList = new JList<>(this.categoriasModel);
+    this.categoriasList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+  }
+
+  private void createEditorialCombo() {
+    this.editorialModel = new DefaultComboBoxModel<>();
+    this.editorialCombo = new JComboBox<>(this.editorialModel);
+  }
+
+  private void createIdiomasList() {
+    this.idiomasModel = new DefaultListModel<>();
+    this.idiomasList = new JList<>(this.idiomasModel);
+    this.idiomasList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.form b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.form
index 02e9a96..f181b5f 100644
--- a/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.form
+++ b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.form
@@ -49,14 +49,6 @@
           <editable value="false"/>
         </properties>
       </component>
-      <component id="f8b93" class="javax.swing.JComboBox" binding="editorialCombo" custom-create="true">
-        <constraints>
-          <grid row="17" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="400" height="-1"/>
-          </grid>
-        </constraints>
-        <properties/>
-      </component>
       <component id="b355b" class="javax.swing.JButton" binding="volverButton">
         <constraints>
           <grid row="18" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
@@ -209,6 +201,14 @@
           <grid row="19" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
+      <component id="4887a" class="javax.swing.JTextField" binding="editorialField">
+        <constraints>
+          <grid row="17" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="400" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java
index 34bbd64..3267c2d 100644
--- a/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java
@@ -5,10 +5,8 @@ import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
 import java.awt.Dimension;
 import java.awt.Insets;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
-import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -19,7 +17,6 @@ import javax.swing.ListSelectionModel;
 import xyz.danielcortes.framework.BasePanel;
 import xyz.danielcortes.models.Autor;
 import xyz.danielcortes.models.Categoria;
-import xyz.danielcortes.models.Editorial;
 import xyz.danielcortes.models.Idioma;
 
 public class LibroViewPanel extends BasePanel {
@@ -35,10 +32,16 @@ public class LibroViewPanel extends BasePanel {
   private DefaultListModel<Autor> autoresModel;
   private JList<Categoria> categoriasList;
   private DefaultListModel<Categoria> categoriasModel;
-  private JComboBox<Editorial> editorialCombo;
-  private DefaultComboBoxModel<Editorial> editorialModel;
   private JButton volverButton;
   private JTextField precioReferenciaField;
+  private JTextField editorialField;
+
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
 
   @Override
   public JPanel getContentPane() {
@@ -89,23 +92,12 @@ public class LibroViewPanel extends BasePanel {
     return this.categoriasModel;
   }
 
-  public JComboBox<Editorial> getEditorialCombo() {
-    return this.editorialCombo;
-  }
-
-  public DefaultComboBoxModel<Editorial> getEditorialModel() {
-    return this.editorialModel;
-  }
-
   public JButton getVolverButton() {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
+  public JTextField getEditorialField() {
+    return this.editorialField;
   }
 
   /**
@@ -138,9 +130,6 @@ public class LibroViewPanel extends BasePanel {
     contentPane.add(anoPublicacionField,
         new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW,
             GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false));
-    contentPane.add(editorialCombo,
-        new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW,
-            GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false));
     volverButton = new JButton();
     volverButton.setText("Volver");
     contentPane.add(volverButton, new GridConstraints(18, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE,
@@ -214,20 +203,16 @@ public class LibroViewPanel extends BasePanel {
     contentPane.add(spacer3,
         new GridConstraints(19, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1,
             null, null, null, 0, false));
-  }
-
-  /**
-   * @noinspection ALL
-   */
-  public JComponent $$$getRootComponent$$$() {
-    return contentPane;
+    editorialField = new JTextField();
+    contentPane.add(editorialField,
+        new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW,
+            GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false));
   }
 
   private void createUIComponents() {
     this.createIdiomasList();
     this.createAutoresList();
     this.createCategoriaList();
-    this.createEditorialCombo();
   }
 
   private void createIdiomasList() {
@@ -248,8 +233,11 @@ public class LibroViewPanel extends BasePanel {
     this.categoriasList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
   }
 
-  private void createEditorialCombo() {
-    this.editorialModel = new DefaultComboBoxModel<>();
-    this.editorialCombo = new JComboBox<>(this.editorialModel);
+  /**
+   * @noinspection ALL
+   */
+  public JComponent $$$getRootComponent$$$() {
+    return contentPane;
   }
+
 }
diff --git a/src/main/java/xyz/danielcortes/views/telefono/TelefonoCreatePanel.java b/src/main/java/xyz/danielcortes/views/telefono/TelefonoCreatePanel.java
index 124f20b..aeb707e 100644
--- a/src/main/java/xyz/danielcortes/views/telefono/TelefonoCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/telefono/TelefonoCreatePanel.java
@@ -19,6 +19,13 @@ public class TelefonoCreatePanel extends BasePanel {
   private JButton volverButton;
   private JTextField numeroField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JButton getGuardarButton() {
     return this.guardarButton;
   }
@@ -36,13 +43,6 @@ public class TelefonoCreatePanel extends BasePanel {
     return this.numeroField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/telefono/TelefonoSearchPanel.java b/src/main/java/xyz/danielcortes/views/telefono/TelefonoSearchPanel.java
index 4df656d..cb6d5d9 100644
--- a/src/main/java/xyz/danielcortes/views/telefono/TelefonoSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/telefono/TelefonoSearchPanel.java
@@ -28,6 +28,13 @@ public class TelefonoSearchPanel extends BasePanel {
   private JButton volverButton;
   private BaseTableModel<Telefono> telefonoModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -69,33 +76,6 @@ public class TelefonoSearchPanel extends BasePanel {
     return this.telefonoModel;
   }
 
-  private void createUIComponents() {
-    this.creatTelefonoTable();
-  }
-
-  private void creatTelefonoTable() {
-    // @formatter:off
-    this.telefonoModel = new BaseTableModel<>(
-        new String[]{"Numero"},
-        (row, rowIndex, colIndex) -> {
-          switch (colIndex) {
-            case 0: return row.get(rowIndex).getNumero();
-            default: return null;
-          }
-        }
-    );
-    // @formatter:on
-    this.telefonosTable = new JTable(this.telefonoModel);
-    this.telefonosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -156,6 +136,26 @@ public class TelefonoSearchPanel extends BasePanel {
             GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.creatTelefonoTable();
+  }
+
+  private void creatTelefonoTable() {
+    // @formatter:off
+    this.telefonoModel = new BaseTableModel<>(
+        new String[]{"Numero"},
+        (row, rowIndex, colIndex) -> {
+          switch (colIndex) {
+            case 0: return row.get(rowIndex).getNumero();
+            default: return null;
+          }
+        }
+    );
+    // @formatter:on
+    this.telefonosTable = new JTable(this.telefonoModel);
+    this.telefonosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/telefono/TelefonoUpdatePanel.java b/src/main/java/xyz/danielcortes/views/telefono/TelefonoUpdatePanel.java
index a9b70fa..537d1f9 100644
--- a/src/main/java/xyz/danielcortes/views/telefono/TelefonoUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/telefono/TelefonoUpdatePanel.java
@@ -19,6 +19,13 @@ public class TelefonoUpdatePanel extends BasePanel {
   private JButton volverButton;
   private JTextField telefonoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JButton getActualizarButton() {
     return this.actualizarButton;
   }
@@ -36,13 +43,6 @@ public class TelefonoUpdatePanel extends BasePanel {
     return this.telefonoField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/telefono/TelefonoViewPanel.java b/src/main/java/xyz/danielcortes/views/telefono/TelefonoViewPanel.java
index 0f51f38..5e36190 100644
--- a/src/main/java/xyz/danielcortes/views/telefono/TelefonoViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/telefono/TelefonoViewPanel.java
@@ -18,6 +18,13 @@ public class TelefonoViewPanel extends BasePanel {
   private JButton volverButton;
   private JTextField telefonoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -31,13 +38,6 @@ public class TelefonoViewPanel extends BasePanel {
     return this.telefonoField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form
index e2c9219..e19f4f4 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.TrabajadorCreatePanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.trabajador.TrabajadorCreatePanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="12" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java
index ff0b57a..09bb254 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java
@@ -24,6 +24,13 @@ public class TrabajadorCreatePanel extends BasePanel {
   private JTextField rutField;
   private DatePicker fechaContratoPicker;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTextField getNombreField() {
     return this.nombreField;
   }
@@ -57,13 +64,6 @@ public class TrabajadorCreatePanel extends BasePanel {
     return this.fechaContratoPicker;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.form b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.form
index 1c3ef1e..d20b423 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.form
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.TrabajadorSearchPanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.trabajador.TrabajadorSearchPanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.java
index e777676..231f8ad 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.java
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorSearchPanel.java
@@ -27,6 +27,13 @@ public class TrabajadorSearchPanel extends BasePanel {
   private JButton crearButton;
   private BaseTableModel<Trabajador> trabajadorModel;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -64,37 +71,6 @@ public class TrabajadorSearchPanel extends BasePanel {
     return this.trabajadorModel;
   }
 
-  private void createUIComponents() {
-    this.createTrabajadorTable();
-  }
-
-  private void createTrabajadorTable() {
-    // @formatter:off
-    this.trabajadorModel= new BaseTableModel<>(
-        new String[]{"Rut", "Nombre", "Apellido Paterno", "Apellido Materno", "Fecha Contrato"},
-        (row, rowIndex, colIndex) -> {
-          switch (colIndex) {
-            case 0: return row.get(rowIndex).getRut();
-            case 1: return row.get(rowIndex).getNombre();
-            case 2: return row.get(rowIndex).getApellidoPaterno();
-            case 3: return row.get(rowIndex).getApellidoMaterno();
-            case 4: return row.get(rowIndex).getFechaContrato();
-            default: return null;
-          }
-        }
-    );
-    // @formatter:on
-    this.trabajadorTable = new JTable(this.trabajadorModel);
-    this.trabajadorTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-  }
-
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
@@ -145,6 +121,30 @@ public class TrabajadorSearchPanel extends BasePanel {
         null, 0, false));
   }
 
+  private void createUIComponents() {
+    this.createTrabajadorTable();
+  }
+
+  private void createTrabajadorTable() {
+    // @formatter:off
+    this.trabajadorModel= new BaseTableModel<>(
+        new String[]{"Rut", "Nombre", "Apellido Paterno", "Apellido Materno", "Fecha Contrato"},
+        (row, rowIndex, colIndex) -> {
+          switch (colIndex) {
+            case 0: return row.get(rowIndex).getRut();
+            case 1: return row.get(rowIndex).getNombre();
+            case 2: return row.get(rowIndex).getApellidoPaterno();
+            case 3: return row.get(rowIndex).getApellidoMaterno();
+            case 4: return row.get(rowIndex).getFechaContrato();
+            default: return null;
+          }
+        }
+    );
+    // @formatter:on
+    this.trabajadorTable = new JTable(this.trabajadorModel);
+    this.trabajadorTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+  }
+
   /**
    * @noinspection ALL
    */
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.form b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.form
index 28c3ff8..79b1884 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.form
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.TrabajadorUpdatePanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.trabajador.TrabajadorUpdatePanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="12" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.java
index 351e912..9a4dce7 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorUpdatePanel.java
@@ -24,6 +24,13 @@ public class TrabajadorUpdatePanel extends BasePanel {
   private JTextField rutField;
   private DatePicker fechaContratoField;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTextField getNombreField() {
     return this.nombreField;
   }
@@ -57,13 +64,6 @@ public class TrabajadorUpdatePanel extends BasePanel {
     return this.fechaContratoField;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form
index 9f55db2..d6cab0a 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.cliente.TrabajadorViewPanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="xyz.danielcortes.views.trabajador.TrabajadorViewPanel">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="13" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="468"/>
+      <xy x="20" y="20" width="540" height="468"/>
     </constraints>
     <properties/>
     <border type="none"/>
diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java
index d56a9f8..700b042 100644
--- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java
@@ -27,6 +27,13 @@ public class TrabajadorViewPanel extends BasePanel {
   private JButton correosButton;
   private JButton telefonosButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   public JTextField getNombreField() {
     return this.nombreField;
   }
@@ -56,7 +63,6 @@ public class TrabajadorViewPanel extends BasePanel {
     return this.fechaContratoPicker;
   }
 
-
   public JButton getUsuarioButton() {
     return this.usuarioButton;
   }
@@ -73,13 +79,6 @@ public class TrabajadorViewPanel extends BasePanel {
     return this.telefonosButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/usuario/UsuarioCreatePanel.java b/src/main/java/xyz/danielcortes/views/usuario/UsuarioCreatePanel.java
index 2b1fee4..a2e9964 100644
--- a/src/main/java/xyz/danielcortes/views/usuario/UsuarioCreatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/usuario/UsuarioCreatePanel.java
@@ -21,6 +21,13 @@ public class UsuarioCreatePanel extends BasePanel {
   private JPasswordField passField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -42,13 +49,6 @@ public class UsuarioCreatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/usuario/UsuarioUpdatePanel.java b/src/main/java/xyz/danielcortes/views/usuario/UsuarioUpdatePanel.java
index e8a88d8..aecdef7 100644
--- a/src/main/java/xyz/danielcortes/views/usuario/UsuarioUpdatePanel.java
+++ b/src/main/java/xyz/danielcortes/views/usuario/UsuarioUpdatePanel.java
@@ -21,6 +21,13 @@ public class UsuarioUpdatePanel extends BasePanel {
   private JPasswordField passField;
   private JButton volverButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -42,13 +49,6 @@ public class UsuarioUpdatePanel extends BasePanel {
     return this.volverButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *
diff --git a/src/main/java/xyz/danielcortes/views/usuario/UsuarioViewPanel.java b/src/main/java/xyz/danielcortes/views/usuario/UsuarioViewPanel.java
index e3fce2c..0a06327 100644
--- a/src/main/java/xyz/danielcortes/views/usuario/UsuarioViewPanel.java
+++ b/src/main/java/xyz/danielcortes/views/usuario/UsuarioViewPanel.java
@@ -20,6 +20,13 @@ public class UsuarioViewPanel extends BasePanel {
   private JButton editarButton;
   private JButton eliminarButton;
 
+  {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+    this.$$$setupUI$$$();
+  }
+
   @Override
   public JPanel getContentPane() {
     return this.contentPane;
@@ -41,13 +48,6 @@ public class UsuarioViewPanel extends BasePanel {
     return this.eliminarButton;
   }
 
-  {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
-    this.$$$setupUI$$$();
-  }
-
   /**
    * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code!
    *