Rearranged classes.

Signed-off-by: Stephan Hoehne <S2H.Mobile@gmail.com>