removing utils.resolve and using file.expand