Reorganize core files.