Reflection classes reorganized