Reorganization - make (almost all) snippets includable

I hope that we won't need any more large-scale reorganizations for a while :-)