reorganized some config