Merge "Restructure TSMS"