Moving states to a state folder