A bit rearrangement, killing old path reservation concept (more clean URLs overall)