Changed some more organizing stuff.