better organisation of classes