move devices in their own package