Moved around stuff to better follow format that group consensus decided on