re organized folder structure. added '_core' suffix to core files