updated import paths, removed Makefiles