Put these in a more sensible location.
Adjust imports to reflect move.