Some tweaks after altering the directory structure.