Restructured directory properly