Moved entity declaration to separate files.