Refactor|Map Renderer|Client: Relocated Decoration to new source files