Refactored Model classes, added DAL classes