Folders renamed and P5 added