Fix links and restructure files