* Add provider deprecation support; change directory structure * fix a couple dangling imports * move the meta_reference safety dir also