Moved to Model/Table/ (and changed class names accordingly)
Moved here from /Model/ (class names changed accordingly)