New snippets, some snippets moved to subolders