should not have broken from the standards before

moved everything back to the conf folder. I have employed some extra
stuff to make sure that backward compatability is maintained.