Refactored entity mappings and annotations

Removed unused schema files.
Moved entity dialogs.