added common.h, refactored structure fields