Move files into core folder