Start some schema overhaul