Move scripts to bin
Switch to two spaces in client-side code as well