Massive re-organization (yasnippet not working).