I did some reorganizing