Better structure of classes