rearranged

arranged class fit with kind