Minor cleanups.
Empty classes to contain map and its layers later.