Reorganization and refactoring of links/content