Functor: Fmap changed for Map.
Modules reorganized.