Hiding StringMap and introducing Maps instead
Relocating classes to 'lang" and "components"