Convert the namespaced classes to PSR-4 structure
Introducing traits