Remove bookmark require and refactor path builder.