Refactored previous entitites names and added Table entity.