change the way import common class is done