Moved user bundle entities in to model and made customer entity optionally registered if CustomerBundle exists.