Fix core folder