Clear traits and helpers
Drop sentences interfaces
Move ObjectManager::instance() to abstract Base class
Create a Gherkin specific helper
Refactor files strucutre/namespaces