Restructured file names and folders for future consistency.