core revamp and modules links corrected