File structure cleanup.

This also drops the use of bootstrap.water, as we would only
need it if base_grammar.water were to use an indented >: code block.