Commit before refactoring entities.
Creation of "AbstractGenericEntity" which all entites should extend.
Refactoring of entities complete.