Removed and renamed few scripts