Work on bug #7720.  These files are moved for dev purposes.
More work on bug #7720.  Just moving some files around.
This fixes #7720.  Now if view is enabled, nothing else shows up.
A small tweak for bug #7720.  This is so the devices don't get loaded twice.