Move 'btaudit' to 'bt_audit'.
Move 'davtest' to stage2.