reorder folder structure
Merge branch 'master' of https://github.com/matt-komm/EDM2PXLIO

Conflicts:
	EDM2PXLIO/src/EDM2PXLIO.cc