Small re-organisation changes: ...ui.web.entity package was removed as unused