revactor background and common files