Moving some files so config routines can find them
Moving some files so config routines can find them
Get config nosetests working again after code reorganization