Moved Pi pins around a bit to make better use of pin space