Implemented new folder naming guidelines.