Moved some more stuff around