Reply to thread

Also restructuring