Added Model classes, cleaned up URLs