Update maintenance scripts for new layout