Re-arrange concept classes.