renamed common_* files to better names