Refactor back into one file for each part. These are too small to worry about breaking up.