fixed master file and modules import