Extracted entity model from demo

@mlaflamm @jnblanchet