Revert "Trimmed the branch to only the easy_markers sub directory"

This reverts commit 2d5a09ae08413f163594d0d9022d92c8c5030dbb.
Rebase from 'upstream'
Trimmed the branch to only the easy_markers sub directory