Does it make sense to push these into separate files as well?