Revised base directory structure