Restructured URLs and added smartpants