Revert "moved to root of device"

This reverts commit b6b30e0bfe7812b0cebf917accd02284ef1b182b.