Bug 1079220 - Modify file structure of Instantbird to match toolkit changes - fix Linux bustage, rs=bustage-fix.