reorder packages and add masala as dependency