Moved files to better location. Added pretty print to PHP
Merge branch 'develop'