Reorganized some stuff, nothing special