Let's make it PSR compliant and working on nginx
And some more changes