Moved classes from Model.cs to separate files