Reorganized some stuff