Moved provider state files into their own module