Reorganised the zmake directory to package format.