Reorganisation. Please work
Merge branch 'master' of http://github.com/remynaps/p3p

please work