Resource renamed to Entity
Fixed missing resources
Entity Module setup fix
Language Update
rebase