updated makefile
moved files to lib