slight refactoring for php 5.3 namespaces and composer