restructuring the common folder