Move record class to separate file