varying orginazational changes

moved state specific things to a state specific directory