Moving drivers, models and helpers to more central 'includes' location