Moved defuncted script to proper place
Added new data formatting script