Make URL structure consistent
0.2.0