Updated and reorganized choices.py library