Moved the now single saves.as file back to includes because it is an include and not a class definition.
>
> Also updated the include path to point to the saves.as file properly.  Saves seem to be working fine, now, so it seems the duplicate as file was at fault.