Reoganizationg a bunch of stuff.