update schema to match business domain

NOTE: THIS BREAKS BASICALLY EVERYTHING