Switching to use commons-cli

Arguments getting complicated