Reorganize things a bit