Incorporated new directory structure.