Reorganized a few things