Moved EntityConverter and Entity in the examples