major refactoring of model. removed urlentity and moved the url field to Entity