Renamed old file, prepared TODO list of what to do for the new messages infrastructure