Merge fixes

-Removed duplicate scripts
-Removed folder
-Rebinded sounds
-Fixed merge conflicts
-