Fixed the makefile and imports.