Reorganized, added links and cleaned up