Got SRS and TP to compile correctly

The srs and tp both now compile correctly and were reorganized slightly to make more sense.