Permalink fix round 2
Restructured