Move things to folders
Fix yasnippet dir