Revert "Updating device folder"

This reverts commit 32bfd13754bc942660370b46640946df150cc23f.