Fix Makefile and rearrange some file location