NXDRIVE-159: Clean up FileEvent
NXDRIVE-159: Fix bad imports