fixed lib structure
fixed Makefile