Move model classes into model directory