Rename to simpler names
Move scripts to their own directory