Moved all files over to model directory