Move interfaces over to model directory, too