Baisc moving and renaming. 

Basically mad it nicer for the ta's.  Nothing major at all.