Correct common.mk in accordance to new structure