adjusted links to new structure