add regex to bonus content and rename related code files