Restructure Model to Database