combining defs/calls (changing coffee_defs and coffee_calls to defs and calls), adding JS indexing