More runs, added channel number to TimingAlignment
Started re-organizing TimingAlignment