Moving classes that belong in separate files into separate files. Renaming safeNil to nilify and safeNull to nullify