Modified folder structure and updated parsing script with new values
Additional structure changes