restructured directory structure