Moved functional stuff to combinatorics where it belongs