Reorganize for sanity