Moving the 'Local'/'Remote' controllers into their own packages