Restructuring, removed Cone Jet, added Jet for Low and High Energy, tightened eta cuts