Add argument parsing, removed bad files