Rebase
    common/area.m -> common/src/area.m
    common/area_description.m common/src/area_description.m