update links & restructure