added base entity
changed module name