Organised files into folders and updated paths.