move types to core subdir