Fixing broken links after folder re-structure