Added links, cleaning up structure.