minor structure fix

adjust a few files' location