More sane organization fixtures