Fix Makefile and rearrange some file location
Merge pull request #1 from fboris/master

Fix Makefile and rearrange some file location