Group the files in CaptureTheFlag.Entities better