[ar] moved classes around to clarify which flow they deal with