restructered snippets (better hotswapping)