Restructured the folders.