Restructuring Folder naming convention