Add necessary empty classes and move to core folder.