More refactor of the Pyramid stuff…  Moving stuff around and into pyramid folder, etc...
refactor pyramid,,,