reorganize, remove common.h