Splitting up files

Tidying