Follow-up from "Move EE-specific files to a standalone directory"

The following discussions from !2483 (merged) should be addressed:

• @godfat started a discussion:

  Oops this would need to be back ported

• @godfat started a discussion:

  This file would need to be back ported

• @godfat started a discussion:

  Things like these should be backported

• @godfat started a discussion: (+1 comment)

  Now this is 100% lame...