changed model directory structure