Added proper common folder