Mostly reorganized some components to make the schematics fit on an A4 sheet