Reworked Choice classes and moved them to a sub folder.