Adjusted the directory structure.