Allow animated gifs in Map command

Also, restructure map classes. Also, fix layering.