Major code reoganisation, splitting up the single big file. The two goals