Move custom code out into their own happy little files