some config and structure fix