Re-organized p1 files for easier access