GitLab

This reverts commit d0fa1a25.

Fix some import structure; make some uPred notation local to avoid conflict; make iPsvs closer to old behavior.

Update for dependencies; fix ownership (except unresolved issue of ATimeless and some other modality interactions).