fix some warnings
dir structure