Structure re-org and modifying data transform script