Integrated 'common' directory and 'consensus' directory