File cleanup: move some traits to their own files