renamed core->common, removed Database