Files put back where they belong. Not sure why they switched position
Merge branch 'master' of http://github.com/remynaps/p3p