Changed some of the component footprints and re-organised the board