setup new core projects
fixed merge conflicts