fixed makefile and imports