Split apart files for separation of roles a bit.