Reorganize source tree
Fix lib path
Fixed makefile