Reply to thread

more reorg on the way