#27: File organization/SPResult cleanup