Revert "He movido varias entidades"

This reverts commit c0a7a3d752d4c8f0a617a9865a050f184de56da7.
Revert "Revert "He movido varias entidades""

This reverts commit 670417328cf7d77bfc8580bbce5daaf5a6f855d6.
Revert "He movido varias entidades"

This reverts commit c0a7a3d752d4c8f0a617a9865a050f184de56da7.