Some parts moved from project to the core