mod: put each class in individual file