Update modules/choice
Move around modules into proper folders