First refactor for composer + psr-0