Organise common.mk