FIX: Fixes and reorganization

This moves toward `vispy` style/compatibility, but tests still don't pass over here.