Refactor with common files.