Update folder structure

Updated folder structure to include Original, working and master
folders. Extracted originals into working.