Commit before big code restructuring.