Moving device into its own folder