Introducing more structure into the code. Bugfix: Moving an emote to list it already is in deletes the emote.