start move Energy Frontier stuff into CpF-E2 sub-directory