Move the devices code around