Fixed directory structure and file locations.