Adjust code position
Fix Makefile