Move TimeStamp

Move the TimeStamp type here from **marquise**.