Restructure folders and update pig script.