Moved some more things around