Moved markers from plain object to classes

Refactor into separate files