Add missing 'else'.
Add comments.
Move builtins out of computation/ into their own directory.
Split Makefile.am