Restructure now complete for imu target