Update and rename common.hh to common.hpp