Housekeeping: Segregating functionality between files