restrured directory