moved common files to common folder