Use PSR-4 dir structure

This isn't a module really, plus PSR-4 loading is awesome.
Save correct path in File object
Cleanup