re-arrangement

moved some stuff around and added some more links