Update to Database Structure

Fixed Foreign Keys. all FK's now point to where they're supposed to
point