Reorganize a few things