Core: Removed the 'drivers' dir and replaced with 'helpers' (2)