Reorganize common files into 'universal' folder