Revert "Revert "moved to root of device""

This reverts commit dceacc9f9861c12ac85d0ed3b5c559bf31e470ff.
fixes again