Move concerns into separate files