restructure core/common