Adding options separation previous to the cluster subcommand

remember to add the new `cluster` directory to `setup.py`.