Move more parts of the setup related to ubismart