Moved models/providers out of static. added crypto