Move device stuff to manifest