Clean up, rename files to '7', add snippets