restructured some parts of the master file