Fix formatting and move Version.Schema to Version