refactor safestrap files to keep eit cleaner

Change-Id: I19c9125f2d7a18936e4bd5c961986c2ab1855b82