fixed namespaces and psr-0