Updates to PSG - Moving files into folders