When I decided to do a little refresh in the master for Spring, I decided to shake things up a bit. So, I moved some things, got rid of some...