Updated with directory structure