refactored urls
added various models