Removed common files and use osm/common package