Moved some config stuff around