re-arrange past work, fix links