More PSR-0 changes

Not sure why I have to redclare my folder structure again for PSR-0
changes but I'll assume somebody smarter than me already thought of
this and has a good reason for it.