Refactor ESRI graphics into own layer