move to one class per file