Reorganized some things