Add snippets
Restructure