move core/* into core/common/*