updated master module, added new setup class