Migrate stuff to new Pi and new modules as well