Move things around to be Arduino-library friendly