Move duplicated code into new files