Updated topic directory structure