Modified makefile
Reimport library structure