move files to be PSR-0 compatible
Merge branch 'master' into develop