Restructured the directory structure.