Added command-line arguments, renamed files

Misc. changes.