Refactoring the beeper schema. No semantic change.
Complected the refactoring of the beeper schema. No semantic change.