organize nimoy
fix up map/bundle