reorganized as package, more complete menu