Reorganize because I'm very particular