Added server-specific configuration
Moved entity.js